Switching to shorthands for rust params.

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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