grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Switching to shorthands for rust params.

Browse source
This commit is contained in:
Dessalines 2019-12-09 11:08:19 -08:00
parent dbc62a1b32
commit faef62e073
7 changed files with 52 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server/src/api/comment.rs
View file

@ -118,7 +118,7 @@ impl Perform<CommentResponse> for Oper<CreateComment> {
let like_form = CommentLikeForm { let like_form = CommentLikeForm {
comment_id: inserted_comment.id, comment_id: inserted_comment.id,
post_id: data.post_id, post_id: data.post_id,
user_id: user_id, user_id,
score: 1, score: 1,
}; };
@ -262,7 +262,7 @@ impl Perform<CommentResponse> for Oper<SaveComment> {
let comment_saved_form = CommentSavedForm { let comment_saved_form = CommentSavedForm {
comment_id: data.comment_id, comment_id: data.comment_id,
user_id: user_id, user_id,
}; };
if data.save { if data.save {
@ -312,7 +312,7 @@ impl Perform<CommentResponse> for Oper<CreateCommentLike> {
let like_form = CommentLikeForm { let like_form = CommentLikeForm {
comment_id: data.comment_id, comment_id: data.comment_id,
post_id: data.post_id, post_id: data.post_id,
user_id: user_id, user_id,
score: data.score, score: data.score,
}; };

24
server/src/api/community.rs
View file

@ -163,8 +163,8 @@ impl Perform<GetCommunityResponse> for Oper<GetCommunity> {
Ok(GetCommunityResponse { Ok(GetCommunityResponse {
op: self.op.to_string(), op: self.op.to_string(),
community: community_view, community: community_view,
moderators: moderators, moderators,
admins: admins, admins,
}) })
} }
} }
@ -213,7 +213,7 @@ impl Perform<CommunityResponse> for Oper<CreateCommunity> {
let community_moderator_form = CommunityModeratorForm { let community_moderator_form = CommunityModeratorForm {
community_id: inserted_community.id, community_id: inserted_community.id,
user_id: user_id, user_id,
}; };
let _inserted_community_moderator = let _inserted_community_moderator =
@ -229,7 +229,7 @@ impl Perform<CommunityResponse> for Oper<CreateCommunity> {
let community_follower_form = CommunityFollowerForm { let community_follower_form = CommunityFollowerForm {
community_id: inserted_community.id, community_id: inserted_community.id,
user_id: user_id, user_id,
}; };
let _inserted_community_follower = let _inserted_community_follower =
@ -310,7 +310,7 @@ impl Perform<CommunityResponse> for Oper<EditCommunity> {
community_id: data.edit_id, community_id: data.edit_id,
removed: Some(removed), removed: Some(removed),
reason: data.reason.to_owned(), reason: data.reason.to_owned(),
expires: expires, expires,
}; };
ModRemoveCommunity::create(&conn, &form)?; ModRemoveCommunity::create(&conn, &form)?;
} }
@ -360,7 +360,7 @@ impl Perform<ListCommunitiesResponse> for Oper<ListCommunities> {
// Return the jwt // Return the jwt
Ok(ListCommunitiesResponse { Ok(ListCommunitiesResponse {
op: self.op.to_string(), op: self.op.to_string(),
communities: communities, communities,
}) })
} }
} }
@ -379,7 +379,7 @@ impl Perform<CommunityResponse> for Oper<FollowCommunity> {
let community_follower_form = CommunityFollowerForm { let community_follower_form = CommunityFollowerForm {
community_id: data.community_id, community_id: data.community_id,
user_id: user_id, user_id,
}; };
if data.follow { if data.follow {
@ -424,7 +424,7 @@ impl Perform<GetFollowedCommunitiesResponse> for Oper<GetFollowedCommunities> {
// Return the jwt // Return the jwt
Ok(GetFollowedCommunitiesResponse { Ok(GetFollowedCommunitiesResponse {
op: self.op.to_string(), op: self.op.to_string(),
communities: communities, communities,
}) })
} }
} }
@ -470,7 +470,7 @@ impl Perform<BanFromCommunityResponse> for Oper<BanFromCommunity> {
community_id: data.community_id, community_id: data.community_id,
reason: data.reason.to_owned(), reason: data.reason.to_owned(),
banned: Some(data.ban), banned: Some(data.ban),
expires: expires, expires,
}; };
ModBanFromCommunity::create(&conn, &form)?; ModBanFromCommunity::create(&conn, &form)?;
@ -536,7 +536,7 @@ impl Perform<AddModToCommunityResponse> for Oper<AddModToCommunity> {
Ok(AddModToCommunityResponse { Ok(AddModToCommunityResponse {
op: self.op.to_string(), op: self.op.to_string(),
moderators: moderators, moderators,
}) })
} }
} }
@ -641,8 +641,8 @@ impl Perform<GetCommunityResponse> for Oper<TransferCommunity> {
Ok(GetCommunityResponse { Ok(GetCommunityResponse {
op: self.op.to_string(), op: self.op.to_string(),
community: community_view, community: community_view,
moderators: moderators, moderators,
admins: admins, admins,
}) })
} }
} }

2
server/src/api/mod.rs
View file

@ -89,7 +89,7 @@ pub struct Oper<T> {
impl<T> Oper<T> { impl<T> Oper<T> {
pub fn new(op: UserOperation, data: T) -> Oper<T> { pub fn new(op: UserOperation, data: T) -> Oper<T> {
Oper { op: op, data: data } Oper { op, data }
} }
} }

16
server/src/api/post.rs
View file

@ -134,7 +134,7 @@ impl Perform<PostResponse> for Oper<CreatePost> {
// They like their own post by default // They like their own post by default
let like_form = PostLikeForm { let like_form = PostLikeForm {
post_id: inserted_post.id, post_id: inserted_post.id,
user_id: user_id, user_id,
score: 1, score: 1,
}; };
@ -198,10 +198,10 @@ impl Perform<GetPostResponse> for Oper<GetPost> {
Ok(GetPostResponse { Ok(GetPostResponse {
op: self.op.to_string(), op: self.op.to_string(),
post: post_view, post: post_view,
comments: comments, comments,
community: community, community,
moderators: moderators, moderators,
admins: admins, admins,
}) })
} }
} }
@ -248,7 +248,7 @@ impl Perform<GetPostsResponse> for Oper<GetPosts> {
Ok(GetPostsResponse { Ok(GetPostsResponse {
op: self.op.to_string(), op: self.op.to_string(),
posts: posts, posts,
}) })
} }
} }
@ -278,7 +278,7 @@ impl Perform<CreatePostLikeResponse> for Oper<CreatePostLike> {
let like_form = PostLikeForm { let like_form = PostLikeForm {
post_id: data.post_id, post_id: data.post_id,
user_id: user_id, user_id,
score: data.score, score: data.score,
}; };
@ -417,7 +417,7 @@ impl Perform<PostResponse> for Oper<SavePost> {
let post_saved_form = PostSavedForm { let post_saved_form = PostSavedForm {
post_id: data.post_id, post_id: data.post_id,
user_id: user_id, user_id,
}; };
if data.save { if data.save {

36
server/src/api/site.rs
View file

@ -100,7 +100,7 @@ impl Perform<ListCategoriesResponse> for Oper<ListCategories> {
// Return the jwt // Return the jwt
Ok(ListCategoriesResponse { Ok(ListCategoriesResponse {
op: self.op.to_string(), op: self.op.to_string(),
categories: categories, categories,
}) })
} }
} }
@ -168,15 +168,15 @@ impl Perform<GetModlogResponse> for Oper<GetModlog> {
// Return the jwt // Return the jwt
Ok(GetModlogResponse { Ok(GetModlogResponse {
op: self.op.to_string(), op: self.op.to_string(),
removed_posts: removed_posts, removed_posts,
locked_posts: locked_posts, locked_posts,
stickied_posts: stickied_posts, stickied_posts,
removed_comments: removed_comments, removed_comments,
removed_communities: removed_communities, removed_communities,
banned_from_community: banned_from_community, banned_from_community,
banned: banned, banned,
added_to_community: added_to_community, added_to_community,
added: added, added,
}) })
} }
} }
@ -295,8 +295,8 @@ impl Perform<GetSiteResponse> for Oper<GetSite> {
Ok(GetSiteResponse { Ok(GetSiteResponse {
op: self.op.to_string(), op: self.op.to_string(),
site: site_view, site: site_view,
admins: admins, admins,
banned: banned, banned,
online: 0, online: 0,
}) })
} }
@ -399,10 +399,10 @@ impl Perform<SearchResponse> for Oper<Search> {
Ok(SearchResponse { Ok(SearchResponse {
op: self.op.to_string(), op: self.op.to_string(),
type_: data.type_.to_owned(), type_: data.type_.to_owned(),
comments: comments, comments,
posts: posts, posts,
communities: communities, communities,
users: users, users,
}) })
} }
} }
@ -462,8 +462,8 @@ impl Perform<GetSiteResponse> for Oper<TransferSite> {
Ok(GetSiteResponse { Ok(GetSiteResponse {
op: self.op.to_string(), op: self.op.to_string(),
site: Some(site_view), site: Some(site_view),
admins: admins, admins,
banned: banned, banned,
online: 0, online: 0,
}) })
} }

18
server/src/api/user.rs
View file

@ -407,11 +407,11 @@ impl Perform<GetUserDetailsResponse> for Oper<GetUserDetails> {
Ok(GetUserDetailsResponse { Ok(GetUserDetailsResponse {
op: self.op.to_string(), op: self.op.to_string(),
user: user_view, user: user_view,
follows: follows, follows,
moderates: moderates, moderates,
comments: comments, comments,
posts: posts, posts,
admins: admins, admins,
}) })
} }
} }
@ -473,7 +473,7 @@ impl Perform<AddAdminResponse> for Oper<AddAdmin> {
Ok(AddAdminResponse { Ok(AddAdminResponse {
op: self.op.to_string(), op: self.op.to_string(),
admins: admins, admins,
}) })
} }
} }
@ -529,7 +529,7 @@ impl Perform<BanUserResponse> for Oper<BanUser> {
other_user_id: data.user_id, other_user_id: data.user_id,
reason: data.reason.to_owned(), reason: data.reason.to_owned(),
banned: Some(data.ban), banned: Some(data.ban),
expires: expires, expires,
}; };
ModBan::create(&conn, &form)?; ModBan::create(&conn, &form)?;
@ -567,7 +567,7 @@ impl Perform<GetRepliesResponse> for Oper<GetReplies> {
Ok(GetRepliesResponse { Ok(GetRepliesResponse {
op: self.op.to_string(), op: self.op.to_string(),
replies: replies, replies,
}) })
} }
} }
@ -595,7 +595,7 @@ impl Perform<GetUserMentionsResponse> for Oper<GetUserMentions> {
Ok(GetUserMentionsResponse { Ok(GetUserMentionsResponse {
op: self.op.to_string(), op: self.op.to_string(),
mentions: mentions, mentions,
}) })
} }
} }

2
server/src/db/comment_view.rs
View file

@ -313,7 +313,7 @@ impl<'a> ReplyQueryBuilder<'a> {
ReplyQueryBuilder { ReplyQueryBuilder {
conn, conn,
query, query,
for_user_id: for_user_id, for_user_id,
sort: &SortType::New, sort: &SortType::New,
unread_only: false, unread_only: false,
page: None, page: None,