Merge branch 'master' into federation

diff --cc docker/dev/docker-compose.yml
Simple merge

diff --cc docker/federation/docker-compose.yml
index cbc648e65772bcc0616ddd78f9c83495b9636a81,d854e9d6297526356ee52664b8dbe1ddc94d4381..51a37b9193d8b786486e8e5c3042a2cfcfa19b03
--- 1/docker/federation/docker-compose.yml
--- 2/docker/federation/docker-compose.yml
+++ b/docker/federation/docker-compose.yml
@@@ -105,8 -110,13 +105,8 @@@ services
        - POSTGRES_DB=lemmy
      volumes:
        - ./volumes/postgres_gamma:/var/lib/postgresql/data
 -  pictrs_gamma:
 -    image: asonix/pictrs:v0.1.13-r0
 -    user: 991:991
 -    volumes:
 -      - ./volumes/pictrs_gamma:/mnt
  
    iframely:
-     image: dogbin/iframely:latest
+     image: jolt/iframely:v1.4.3
      volumes:
        - ../iframely.config.local.js:/iframely/config.local.js:ro

diff --cc server/src/api/user.rs
index e7c27def6ea91510c3573ea2eb08c5c7b890963a,8f09ea5fc07e249a4e94f2c63024e38cfacbe633..a4e47e41c9f5bebd24b2616e6af829f43aaba08a
--- 1/server/src/api/user.rs
--- 2/server/src/api/user.rs
+++ b/server/src/api/user.rs
@@@ -738,11 -710,10 +738,12 @@@ impl Perform for Oper<BanUser> 
        return Err(APIError::err("not_an_admin").into());
      }
  
 -    match User_::ban_user(&conn, data.user_id, data.ban) {
 -      Ok(user) => user,
 -      Err(_e) => return Err(APIError::err("couldnt_update_user").into()),
 -    };
 +    let ban = data.ban;
-     let ban_user = move |conn: &'_ _| User_::ban_user(conn, user_id, ban);
++    let banned_user_id = data.user_id;
++    let ban_user = move |conn: &'_ _| User_::ban_user(conn, banned_user_id, ban);
 +    if blocking(pool, ban_user).await?.is_err() {
 +      return Err(APIError::err("couldnt_update_user").into());
 +    }
  
      // Mod tables
      let expires = match data.expires {

diff --cc server/src/lib.rs
Simple merge