From 6d3778cafec965868193d4ccebf5cf599ae3d038 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 26 Apr 2021 09:50:34 -0400 Subject: [PATCH] Changing unwrap_default to unwrap_or(false) --- crates/api/src/community.rs | 2 +- crates/api/src/local_user.rs | 2 +- crates/api_crud/src/user/read.rs | 2 +- crates/db_queries/src/lib.rs | 8 +------- crates/db_views/src/comment_view.rs | 5 ++--- crates/db_views/src/post_view.rs | 7 +++---- crates/db_views/src/private_message_view.rs | 2 +- crates/db_views_actor/src/person_mention_view.rs | 2 +- 8 files changed, 11 insertions(+), 19 deletions(-) diff --git a/crates/api/src/community.rs b/crates/api/src/community.rs index 4d519832f..b00160538 100644 --- a/crates/api/src/community.rs +++ b/crates/api/src/community.rs @@ -171,7 +171,7 @@ impl Perform for BanFromCommunity { } // Remove/Restore their data if that's desired - if data.remove_data.unwrap_or_default() { + if data.remove_data.unwrap_or(false) { // Posts blocking(context.pool(), move |conn: &'_ _| { Post::update_removed_for_creator(conn, banned_person_id, Some(community_id), true) diff --git a/crates/api/src/local_user.rs b/crates/api/src/local_user.rs index 5cf4f0627..e36e86b4c 100644 --- a/crates/api/src/local_user.rs +++ b/crates/api/src/local_user.rs @@ -397,7 +397,7 @@ impl Perform for BanPerson { } // Remove their data if that's desired - if data.remove_data.unwrap_or_default() { + if data.remove_data.unwrap_or(false) { // Posts blocking(context.pool(), move |conn: &'_ _| { Post::update_removed_for_creator(conn, banned_person_id, None, true) diff --git a/crates/api_crud/src/user/read.rs b/crates/api_crud/src/user/read.rs index 81194d1e6..39431128a 100644 --- a/crates/api_crud/src/user/read.rs +++ b/crates/api_crud/src/user/read.rs @@ -88,7 +88,7 @@ impl PerformCrud for GetPersonDetails { // If its saved only, you don't care what creator it was // Or, if its not saved, then you only want it for that specific creator - if !saved_only.unwrap_or_default() { + if !saved_only.unwrap_or(false) { posts_query = posts_query.creator_id(person_details_id); comments_query = comments_query.creator_id(person_details_id); } diff --git a/crates/db_queries/src/lib.rs b/crates/db_queries/src/lib.rs index fd5abf504..0665ac95d 100644 --- a/crates/db_queries/src/lib.rs +++ b/crates/db_queries/src/lib.rs @@ -196,13 +196,7 @@ pub enum SearchType { } pub fn from_opt_str_to_opt_enum(opt: &Option) -> Option { - match opt { - Some(t) => match T::from_str(&t) { - Ok(r) => Some(r), - Err(_) => None, - }, - None => None, - } + opt.as_ref().map(|t| T::from_str(t).ok()).flatten() } pub fn fuzzy_search(q: &str) -> String { diff --git a/crates/db_views/src/comment_view.rs b/crates/db_views/src/comment_view.rs index 7424d9d62..fbb2b7f7d 100644 --- a/crates/db_views/src/comment_view.rs +++ b/crates/db_views/src/comment_view.rs @@ -350,7 +350,7 @@ impl<'a> CommentQueryBuilder<'a> { .filter(comment::removed.eq(false)); } - if self.unread_only.unwrap_or_default() { + if self.unread_only.unwrap_or(false) { query = query.filter(comment::read.eq(false)); } @@ -378,14 +378,13 @@ impl<'a> CommentQueryBuilder<'a> { if let Some(listing_type) = self.listing_type { query = match listing_type { - // ListingType::Subscribed => query.filter(community_follower::subscribed.eq(true)), ListingType::Subscribed => query.filter(community_follower::person_id.is_not_null()), // TODO could be this: and(community_follower::person_id.eq(person_id_join)), ListingType::Local => query.filter(community::local.eq(true)), _ => query, }; } - if self.saved_only.unwrap_or_default() { + if self.saved_only.unwrap_or(false) { query = query.filter(comment_saved::id.is_not_null()); } diff --git a/crates/db_views/src/post_view.rs b/crates/db_views/src/post_view.rs index 423935754..fb8f07336 100644 --- a/crates/db_views/src/post_view.rs +++ b/crates/db_views/src/post_view.rs @@ -317,7 +317,7 @@ impl<'a> PostQueryBuilder<'a> { if let Some(listing_type) = self.listing_type { query = match listing_type { - ListingType::Subscribed => query.filter(community_follower::person_id.is_not_null()), // TODO could be this: and(community_follower::person_id.eq(person_id_join)), + ListingType::Subscribed => query.filter(community_follower::person_id.is_not_null()), ListingType::Local => query.filter(community::local.eq(true)), _ => query, }; @@ -364,12 +364,11 @@ impl<'a> PostQueryBuilder<'a> { query = query.filter(person::bot_account.eq(false)); }; - // TODO These two might be wrong - if self.saved_only.unwrap_or_default() { + if self.saved_only.unwrap_or(false) { query = query.filter(post_saved::id.is_not_null()); }; - if self.unread_only.unwrap_or_default() { + if self.unread_only.unwrap_or(false) { query = query.filter(post_read::id.is_not_null()); }; diff --git a/crates/db_views/src/private_message_view.rs b/crates/db_views/src/private_message_view.rs index b99286687..8fee2fc9b 100644 --- a/crates/db_views/src/private_message_view.rs +++ b/crates/db_views/src/private_message_view.rs @@ -89,7 +89,7 @@ impl<'a> PrivateMessageQueryBuilder<'a> { .into_boxed(); // If its unread, I only want the ones to me - if self.unread_only.unwrap_or_default() { + if self.unread_only.unwrap_or(false) { query = query .filter(private_message::read.eq(false)) .filter(private_message::recipient_id.eq(self.recipient_id)); diff --git a/crates/db_views_actor/src/person_mention_view.rs b/crates/db_views_actor/src/person_mention_view.rs index 5c6cdddae..b391345ff 100644 --- a/crates/db_views_actor/src/person_mention_view.rs +++ b/crates/db_views_actor/src/person_mention_view.rs @@ -264,7 +264,7 @@ impl<'a> PersonMentionQueryBuilder<'a> { query = query.filter(person_mention::recipient_id.eq(recipient_id)); } - if self.unread_only.unwrap_or_default() { + if self.unread_only.unwrap_or(false) { query = query.filter(person_mention::read.eq(false)); }