upgrade deps + clippy

7 files changed, 19 insertions, 21 deletions

diff --git a/logic/src/account.rs b/logic/src/account.rs
index a352437..5f95d15 100644
--- a/logic/src/account.rs
+++ b/logic/src/account.rs
@@ -48,12 +48,12 @@ pub fn update_user_player_preference(
 }
 pub fn register_user(invitation: &str, username: &str, password: &str) -> Result<()> {
     DATABASE.register_user(
-        &invitation,
-        &username,
+        invitation,
+        username,
         User {
             display_name: username.to_owned(),
             name: username.to_owned(),
-            password: hash_password(&username, &password),
+            password: hash_password(username, password),
             ..Default::default()
         },
     )
diff --git a/logic/src/admin/user.rs b/logic/src/admin/user.rs
index 15356a8..68072de 100644
--- a/logic/src/admin/user.rs
+++ b/logic/src/admin/user.rs
@@ -26,7 +26,7 @@ pub fn get_user(session: &Session, username: &str) -> Result<User> {
 }
 pub fn delete_user(session: &Session, username: &str) -> Result<()> {
     session.assert_admin()?;
-    if !DATABASE.delete_user(&username)? {
+    if !DATABASE.delete_user(username)? {
         Err(anyhow!("user did not exist"))?;
     }
     Ok(())
diff --git a/logic/src/assets.rs b/logic/src/assets.rs
index 7be3845..c6d6a11 100644
--- a/logic/src/assets.rs
+++ b/logic/src/assets.rs
@@ -16,14 +16,13 @@ pub fn get_node_backdrop(_session: &Session, id: NodeID) -> Result<Asset> {
         .ok_or(anyhow!("node does not exist"))?;
 
     let mut asset = node.backdrop.clone();
-    if asset.is_none() {
-        if let Some(parent) = node.parents.last().copied() {
+    if asset.is_none()
+        && let Some(parent) = node.parents.last().copied() {
             let parent = DATABASE
                 .get_node(parent)?
                 .ok_or(anyhow!("node does not exist"))?;
             asset = parent.backdrop.clone();
-        }
-    };
+        };
     Ok(asset.unwrap_or_else(|| {
         AssetInner::Assets(format!("fallback-{:?}.avif", node.kind).into()).ser()
     }))
@@ -35,14 +34,13 @@ pub fn get_node_poster(_session: &Session, id: NodeID) -> Result<Asset> {
         .ok_or(anyhow!("node does not exist"))?;
 
     let mut asset = node.poster.clone();
-    if asset.is_none() {
-        if let Some(parent) = node.parents.last().copied() {
+    if asset.is_none()
+        && let Some(parent) = node.parents.last().copied() {
             let parent = DATABASE
                 .get_node(parent)?
                 .ok_or(anyhow!("node does not exist"))?;
             asset = parent.poster.clone();
-        }
-    };
+        };
     Ok(asset.unwrap_or_else(|| {
         AssetInner::Assets(format!("fallback-{:?}.avif", node.kind).into()).ser()
     }))
@@ -103,7 +101,7 @@ pub async fn get_node_thumbnail(_session: &Session, id: NodeID, t: f64) -> Resul
     let asset = match thumb_track_source {
         TrackSource::Local(a) => {
             let AssetInner::LocalTrack(LocalTrack { path, .. }) = AssetInner::deser(&a.0)? else {
-                return Err(anyhow!("track set to wrong asset type").into());
+                return Err(anyhow!("track set to wrong asset type"));
             };
             // the track selected might be different from thumb_track
             jellytranscoder::thumbnail::create_thumbnail(&path, t).await?
diff --git a/logic/src/home.rs b/logic/src/home.rs
index 1957a94..ff85ba1 100644
--- a/logic/src/home.rs
+++ b/logic/src/home.rs
@@ -20,7 +20,7 @@ pub fn home(session: &Session) -> Result<ApiHomeResponse> {
         .get_node_children(NodeID::from_slug("library"))
         .context("root node missing")?
         .into_iter()
-        .map(|n| DATABASE.get_node_with_userdata(n, &session))
+        .map(|n| DATABASE.get_node_with_userdata(n, session))
         .collect::<anyhow::Result<Vec<_>>>()?;
     toplevel.sort_by_key(|(n, _)| n.index.unwrap_or(usize::MAX));
 
diff --git a/logic/src/node.rs b/logic/src/node.rs
index 820116f..3e527c8 100644
--- a/logic/src/node.rs
+++ b/logic/src/node.rs
@@ -20,13 +20,13 @@ pub fn get_node(
     parents: bool,
     filter: NodeFilterSort,
 ) -> Result<ApiNodeResponse> {
-    let (node, udata) = DATABASE.get_node_with_userdata(id, &session)?;
+    let (node, udata) = DATABASE.get_node_with_userdata(id, session)?;
 
     let mut children = if children {
         DATABASE
             .get_node_children(id)?
             .into_iter()
-            .map(|c| DATABASE.get_node_with_userdata(c, &session))
+            .map(|c| DATABASE.get_node_with_userdata(c, session))
             .collect::<anyhow::Result<Vec<_>>>()?
     } else {
         Vec::new()
@@ -35,13 +35,13 @@ pub fn get_node(
     let mut parents = if parents {
         node.parents
             .iter()
-            .map(|pid| DATABASE.get_node_with_userdata(*pid, &session))
+            .map(|pid| DATABASE.get_node_with_userdata(*pid, session))
             .collect::<anyhow::Result<Vec<_>>>()?
     } else {
         Vec::new()
     };
 
-    let mut similar = get_similar_media(&session, &node)?;
+    let mut similar = get_similar_media(session, &node)?;
 
     similar.retain(|(n, _)| n.visibility >= Visibility::Reduced);
     children.retain(|(n, _)| n.visibility >= Visibility::Reduced);
diff --git a/logic/src/search.rs b/logic/src/search.rs
index 304676b..e2fdcce 100644
--- a/logic/src/search.rs
+++ b/logic/src/search.rs
@@ -13,7 +13,7 @@ pub fn search(session: &Session, query: &str, page: Option<usize>) -> Result<Api
     let (count, ids) = DATABASE.search(query, 32, page.unwrap_or_default() * 32)?;
     let mut results = ids
         .into_iter()
-        .map(|id| DATABASE.get_node_with_userdata(id, &session))
+        .map(|id| DATABASE.get_node_with_userdata(id, session))
         .collect::<Result<Vec<_>, anyhow::Error>>()?;
     results.retain(|(n, _)| n.visibility >= Visibility::Reduced);
     let duration = timing.elapsed();
diff --git a/logic/src/session.rs b/logic/src/session.rs
index 6f168e3..52573cc 100644
--- a/logic/src/session.rs
+++ b/logic/src/session.rs
@@ -51,7 +51,7 @@ pub fn create(username: String, permissions: PermissionSet, expire: Duration) ->
     let mut plaintext =
         bincode::serde::encode_to_vec(&session_data, bincode::config::standard()).unwrap();
 
-    while plaintext.len() % 16 == 0 {
+    while plaintext.len().is_multiple_of(16) {
         plaintext.push(0);
     }
 
@@ -92,7 +92,7 @@ pub fn token_to_session(token: &str) -> anyhow::Result<Session> {
 }
 pub fn bypass_auth_session() -> anyhow::Result<Session> {
     let user = DATABASE
-        .get_user(&CONF.admin_username.as_ref().unwrap())?
+        .get_user(CONF.admin_username.as_ref().unwrap())?
         .ok_or(anyhow!("user does not exist"))?;
     Ok(Session { user })
 }