fix fmt and clippy warnings

src/client_server/media.rs

@@ -36,7 +36,9 @@ pub async fn create_content_route(
         db.globals.server_name(),
         utils::random_string(MXC_LENGTH)
     );
-    db.media.create(
+
+    db.media
+        .create(
             mxc.clone(),
             &db.globals,
             &body
@@ -46,7 +48,8 @@ pub async fn create_content_route(
                 .as_deref(),
             &body.content_type.as_deref(),
             &body.file,
-    ).await?;
+        )
+        .await?;
 
     db.flush().await?;
 
@@ -94,13 +97,15 @@ pub async fn get_content_route(
             )
             .await?;
 
-        db.media.create(
+        db.media
+            .create(
                 mxc,
                 &db.globals,
                 &get_content_response.content_disposition.as_deref(),
                 &get_content_response.content_type.as_deref(),
                 &get_content_response.file,
-        ).await?;
+            )
+            .await?;
 
         Ok(get_content_response.into())
     } else {
@@ -121,7 +126,9 @@ pub async fn get_content_thumbnail_route(
 
     if let Some(FileMeta {
         content_type, file, ..
-    }) = db.media.get_thumbnail(
+    }) = db
+        .media
+        .get_thumbnail(
             mxc.clone(),
             &db.globals,
             body.width
@@ -130,7 +137,9 @@ pub async fn get_content_thumbnail_route(
             body.height
                 .try_into()
                 .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Width is invalid."))?,
-    ).await? {
+        )
+        .await?
+    {
         Ok(get_content_thumbnail::Response { file, content_type }.into())
     } else if &*body.server_name != db.globals.server_name() && body.allow_remote {
         let get_thumbnail_response = db
@@ -149,7 +158,8 @@ pub async fn get_content_thumbnail_route(
             )
             .await?;
 
-        db.media.upload_thumbnail(
+        db.media
+            .upload_thumbnail(
                 mxc,
                 &db.globals,
                 &None,
@@ -157,7 +167,8 @@ pub async fn get_content_thumbnail_route(
                 body.width.try_into().expect("all UInts are valid u32s"),
                 body.height.try_into().expect("all UInts are valid u32s"),
                 &get_thumbnail_response.file,
-        ).await?;
+            )
+            .await?;
 
         Ok(get_thumbnail_response.into())
     } else {

src/database/globals.rs

@@ -5,7 +5,12 @@ use ruma::{
     EventId, MilliSecondsSinceUnixEpoch, ServerName, ServerSigningKeyId,
 };
 use rustls::{ServerCertVerifier, WebPKIVerifier};
-use std::{collections::{BTreeMap, HashMap}, path::{PathBuf}, sync::{Arc, RwLock}, time::{Duration, Instant}};
+use std::{
+    collections::{BTreeMap, HashMap},
+    path::PathBuf,
+    sync::{Arc, RwLock},
+    time::{Duration, Instant},
+};
 use tokio::sync::Semaphore;
 use trust_dns_resolver::TokioAsyncResolver;
 
@@ -279,7 +284,7 @@ impl Globals {
         r
     }
 
-    pub fn get_media_file(&self, key: &Vec<u8>) -> PathBuf {
+    pub fn get_media_file(&self, key: &[u8]) -> PathBuf {
         let mut r = PathBuf::new();
         r.push(self.config.database_path.clone());
         r.push("media");

src/database/media.rs

@@ -1,10 +1,14 @@
-use image::{imageops::FilterType, GenericImageView};
 use crate::database::globals::Globals;
+use image::{imageops::FilterType, GenericImageView};
 
+use super::abstraction::Tree;
 use crate::{utils, Error, Result};
 use std::{mem, sync::Arc};
-use super::abstraction::Tree;
+use tokio::{
-use tokio::{fs::{self, File}, io::AsyncWriteExt, io::AsyncReadExt};
+    fs::{self, File},
+    io::AsyncReadExt,
+    io::AsyncWriteExt,
+};
 
 pub struct FileMeta {
     pub content_disposition: Option<String>,
@@ -167,7 +171,13 @@ impl Media {
     /// - Server creates the thumbnail and sends it to the user
     ///
     /// For width,height <= 96 the server uses another thumbnailing algorithm which crops the image afterwards.
-    pub async fn get_thumbnail(&self, mxc: String, globals: &Globals, width: u32, height: u32) -> Result<Option<FileMeta>> {
+    pub async fn get_thumbnail(
+        &self,
+        mxc: String,
+        globals: &Globals,
+        width: u32,
+        height: u32,
+    ) -> Result<Option<FileMeta>> {
         let (width, height, crop) = self
             .thumbnail_properties(width, height)
             .unwrap_or((0, 0, false)); // 0, 0 because that's the original file
@@ -332,14 +342,14 @@ impl Media {
                 Ok(Some(FileMeta {
                     content_disposition,
                     content_type,
-                    file: thumbnail_bytes.to_vec()
+                    file: thumbnail_bytes.to_vec(),
                 }))
             } else {
                 // Couldn't parse file to generate thumbnail, send original
                 Ok(Some(FileMeta {
                     content_disposition,
                     content_type,
-                    file: file.to_vec()
+                    file: file.to_vec(),
                 }))
             }
         } else {