diff options
author | Lyra <teromene@teromene.fr> | 2019-12-11 00:10:39 +0100 |
---|---|---|
committer | Lyra <teromene@teromene.fr> | 2019-12-11 00:10:39 +0100 |
commit | c19ace7e6a0350a1f257018166769957568fabe2 (patch) | |
tree | 1c435a65903be3be9962aa444cfbcaaab424cde2 /server/src/api/user.rs | |
parent | b7d05c18a1eb74539d05da4374ee29aecb10570f (diff) |
Introduce the "MaybeOptional" trait.
This trait is a generic type that allows us to get an Option from any type and from another option. It can be used to remove the ugly "do_something", "do_something_optional" that we previously had.
Diffstat (limited to 'server/src/api/user.rs')
-rw-r--r-- | server/src/api/user.rs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/server/src/api/user.rs b/server/src/api/user.rs index ebbe48a2..3047a0d3 100644 --- a/server/src/api/user.rs +++ b/server/src/api/user.rs @@ -373,17 +373,17 @@ impl Perform<GetUserDetailsResponse> for Oper<GetUserDetails> { .sort(&sort) .show_nsfw(show_nsfw) .saved_only(data.saved_only) - .for_community_id_optional(data.community_id) - .my_user_id_optional(user_id) - .page_optional(data.page) - .limit_optional(data.limit); + .for_community_id(data.community_id) + .my_user_id(user_id) + .page(data.page) + .limit(data.limit); let mut comments_query = CommentQueryBuilder::create(&conn) .sort(&sort) .saved_only(data.saved_only) - .my_user_id_optional(user_id) - .page_optional(data.page) - .limit_optional(data.limit); + .my_user_id(user_id) + .page(data.page) + .limit(data.limit); // 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 @@ -561,8 +561,8 @@ impl Perform<GetRepliesResponse> for Oper<GetReplies> { let replies = ReplyQueryBuilder::create(&conn, user_id) .sort(&sort) .unread_only(data.unread_only) - .page_optional(data.page) - .limit_optional(data.limit) + .page(data.page) + .limit(data.limit) .list()?; Ok(GetRepliesResponse { @@ -589,8 +589,8 @@ impl Perform<GetUserMentionsResponse> for Oper<GetUserMentions> { let mentions = UserMentionQueryBuilder::create(&conn, user_id) .sort(&sort) .unread_only(data.unread_only) - .page_optional(data.page) - .limit_optional(data.limit) + .page(data.page) + .limit(data.limit) .list()?; Ok(GetUserMentionsResponse { |