From 31e95dc158f0a665f9ec1b354c99e4863bc94f69 Mon Sep 17 00:00:00 2001
From: Cameron Cordes <cameronc.dev@gmail.com>
Date: Thu, 25 Mar 2021 13:17:58 -0400
Subject: [PATCH 1/3] Fix some lint warning and simplify some code

---
 src/database/mod.rs |  8 ++------
 src/main.rs         | 14 ++++++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/database/mod.rs b/src/database/mod.rs
index ff4c679..432b17b 100644
--- a/src/database/mod.rs
+++ b/src/database/mod.rs
@@ -144,9 +144,7 @@ pub mod testhelpers {
                 .user_map
                 .borrow()
                 .iter()
-                .filter(|u| u.username == user && u.password == pass)
-                .collect::<Vec<&User>>()
-                .first()
+                .find(|&u| u.username == user && u.password == pass)
             {
                 Some(u) => {
                     let copy = (*u).clone();
@@ -160,9 +158,7 @@ pub mod testhelpers {
             self.user_map
                 .borrow()
                 .iter()
-                .filter(|u| u.username == user)
-                .collect::<Vec<&User>>()
-                .first()
+                .find(|&u| u.username == user)
                 .is_some()
         }
     }
diff --git a/src/main.rs b/src/main.rs
index fc2b790..c4050ce 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -234,9 +234,12 @@ async fn favorites(claims: Claims) -> impl Responder {
 async fn post_add_favorite(claims: Claims, body: web::Json<AddFavoriteRequest>) -> impl Responder {
     if let Ok(user_id) = claims.sub.parse::<i32>() {
         let path = body.path.clone();
-        web::block::<_, _, String>(move || Ok(add_favorite(user_id, path)))
-            .await
-            .unwrap();
+        web::block::<_, _, String>(move || {
+            add_favorite(user_id, path);
+            Ok(())
+        })
+        .await
+        .unwrap();
         debug!("Adding favorite \"{}\" for userid: {}", user_id, body.path);
         HttpResponse::Ok()
     } else {
@@ -330,9 +333,8 @@ fn main() -> std::io::Result<()> {
                     DebouncedEvent::Rename(orig, _) | DebouncedEvent::Write(orig) => {
                         let image_base_path = PathBuf::from(env::var("BASE_PATH").unwrap());
                         let image_relative = orig.strip_prefix(&image_base_path).unwrap();
-                        if let Ok(old_thumbnail) = env::var("THUMBNAILS")
-                            .map(|base| PathBuf::from(base))
-                            .map(|mut base| {
+                        if let Ok(old_thumbnail) =
+                            env::var("THUMBNAILS").map(PathBuf::from).map(|mut base| {
                                 base.push(image_relative);
                                 base
                             })

From 7f534a18bf5ef61bff32d72eb6183a728e2d03e2 Mon Sep 17 00:00:00 2001
From: Cameron Cordes <cameronc.dev@gmail.com>
Date: Thu, 25 Mar 2021 13:18:16 -0400
Subject: [PATCH 2/3] Bump Jenkins build image to 1.51

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 9bbecdb..14395c2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,7 @@
 pipeline {
   agent {
     docker {
-      image 'rust:1.48'
+      image 'rust:1.51'
       args '-v "$PWD":/usr/src/image-api'
     }
   }

From 53cdbabae150bb2ecea8e1e0602b828dc633499f Mon Sep 17 00:00:00 2001
From: Cameron Cordes <cameronc.dev@gmail.com>
Date: Thu, 25 Mar 2021 13:39:16 -0400
Subject: [PATCH 3/3] Fix favorites logging parameter order

---
 src/main.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.rs b/src/main.rs
index c4050ce..1b160d8 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -240,7 +240,7 @@ async fn post_add_favorite(claims: Claims, body: web::Json<AddFavoriteRequest>)
         })
         .await
         .unwrap();
-        debug!("Adding favorite \"{}\" for userid: {}", user_id, body.path);
+        debug!("Adding favorite \"{}\" for userid: {}", body.path, user_id);
         HttpResponse::Ok()
     } else {
         error!("Unable to parse sub as i32: {}", claims.sub);