Fix clippy errors

modrinth · Mar 30, 2024 · 21e4355 · 21e4355
1 parent f4c48a1
commit 21e4355
Show file tree

Hide file tree

Showing 30 changed files with 211 additions and 376 deletions.
diff --git a/.sqlx/query-32f4aa1ab67fbdcd7187fbae475876bf3d3225ca7b4994440a67cbd6a7b610f6.json b/.sqlx/query-32f4aa1ab67fbdcd7187fbae475876bf3d3225ca7b4994440a67cbd6a7b610f6.json
diff --git a/.sqlx/query-ae95eabd762a497932e5e66d37e743ee22f0d4665ced3aa66122a4f6623b4769.json b/.sqlx/query-ae95eabd762a497932e5e66d37e743ee22f0d4665ced3aa66122a4f6623b4769.json
diff --git a/src/auth/checks.rs b/src/auth/checks.rs
@@ -141,14 +141,12 @@ pub async fn filter_enlisted_projects_ids(
                 .collect::<Vec<_>>(),
             user_id as database::models::ids::UserId,
         )
-        .fetch_many(pool)
-        .try_for_each(|e| {
-            if let Some(row) = e.right() {
-                for x in projects.iter() {
-                    let bool = Some(x.id.0) == row.id && Some(x.team_id.0) == row.team_id;
-                    if bool {
-                        return_projects.push(x.id);
-                    }
+        .fetch(pool)
+        .try_for_each(|row| {
+            for x in projects.iter() {
+                let bool = Some(x.id.0) == row.id && Some(x.team_id.0) == row.team_id;
+                if bool {
+                    return_projects.push(x.id);
                 }
             }
 

diff --git a/src/database/models/categories.rs b/src/database/models/categories.rs
@@ -108,9 +108,9 @@ impl Category {
             ORDER BY c.ordering, c.category
             "
         )
-        .fetch_many(exec)
-        .try_filter_map(|e| async {
-            Ok(e.right().map(|c| Category {
+        .fetch(exec)
+        .try_filter_map(|c| async {
+            Ok(Some(Category {
                 id: CategoryId(c.id),
                 category: c.category,
                 project_type: c.project_type,
@@ -166,9 +166,9 @@ impl LinkPlatform {
             SELECT id, name, donation FROM link_platforms
             "
         )
-        .fetch_many(exec)
-        .try_filter_map(|e| async {
-            Ok(e.right().map(|c| LinkPlatform {
+        .fetch(exec)
+        .try_filter_map(|c| async {
+            Ok(Some(LinkPlatform {
                 id: LinkPlatformId(c.id),
                 name: c.name,
                 donation: c.donation,
@@ -222,8 +222,8 @@ impl ReportType {
             SELECT name FROM report_types
             "
         )
-        .fetch_many(exec)
-        .try_filter_map(|e| async { Ok(e.right().map(|c| c.name)) })
+        .fetch(exec)
+        .try_filter_map(|e| async { Ok(Some(e.name)) })
         .try_collect::<Vec<String>>()
         .await?;
 
@@ -272,8 +272,8 @@ impl ProjectType {
             SELECT name FROM project_types
             "
         )
-        .fetch_many(exec)
-        .try_filter_map(|e| async { Ok(e.right().map(|c| c.name)) })
+        .fetch(exec)
+        .try_filter_map(|c| async { Ok(Some(c.name)) })
         .try_collect::<Vec<String>>()
         .await?;
 

diff --git a/src/database/models/image_item.rs b/src/database/models/image_item.rs
@@ -135,11 +135,11 @@ impl Image {
             report_id.map(|x| x.0),
 
         )
-        .fetch_many(&mut **transaction)
-        .try_filter_map(|e| async {
-            Ok(e.right().map(|row| {
-                let id = ImageId(row.id);
+        .fetch(&mut **transaction)
+        .try_filter_map(|row| async {
+            let id = ImageId(row.id);
 
+            Ok(Some(
                 Image {
                     id,
                     url: row.url,
@@ -152,7 +152,7 @@ impl Image {
                     thread_message_id: row.thread_message_id.map(ThreadMessageId),
                     report_id: row.report_id.map(ReportId),
                 }
-            }))
+            ))
         })
         .try_collect::<Vec<Image>>()
         .await

diff --git a/src/database/models/loader_fields.rs b/src/database/models/loader_fields.rs
@@ -60,9 +60,9 @@ impl Game {
             SELECT id, slug, name, icon_url, banner_url FROM games
             ",
         )
-        .fetch_many(exec)
-        .try_filter_map(|e| async {
-            Ok(e.right().map(|x| Game {
+        .fetch(exec)
+        .try_filter_map(|x| async {
+            Ok(Some(Game {
                 id: GameId(x.id),
                 slug: x.slug,
                 name: x.name,
@@ -151,9 +151,9 @@ impl Loader {
             GROUP BY l.id;
             ",
         )
-        .fetch_many(exec)
-        .try_filter_map(|e| async {
-            Ok(e.right().map(|x| Loader {
+        .fetch(exec)
+        .try_filter_map(|x| async {
+            Ok(Some(Loader {
                 id: LoaderId(x.id),
                 loader: x.loader,
                 icon: x.icon,
@@ -451,18 +451,20 @@ impl LoaderField {
             FROM loader_fields lf
             ",
         )
-        .fetch_many(exec)
-        .try_filter_map(|e| async {
-            Ok(e.right().and_then(|r| {
-                Some(LoaderField {
+        .fetch(exec)
+        .try_filter_map(|r| async {
+            if let Some(field_type) = LoaderFieldType::build(&r.field_type, r.enum_type) {
+                Ok(Some(LoaderField {
                     id: LoaderFieldId(r.id),
-                    field_type: LoaderFieldType::build(&r.field_type, r.enum_type)?,
+                    field_type,
                     field: r.field,
                     optional: r.optional,
                     min_val: r.min_val,
                     max_val: r.max_val,
-                })
-            }))
+                }))
+            } else {
+                Ok(None)
+            }
         })
         .try_collect::<Vec<LoaderField>>()
         .await?;