Removing PostLikeResponse in favor of PostResponse. Consolidating comment and post_sends.

This commit is contained in:
Dessalines 2020-02-02 12:45:41 -05:00
parent cda1e6e741
commit 96a7e99e57
8 changed files with 84 additions and 116 deletions

View file

@ -55,11 +55,6 @@ pub struct CreatePostLike {
auth: String, auth: String,
} }
#[derive(Serialize, Deserialize, Clone)]
pub struct CreatePostLikeResponse {
pub post: PostView,
}
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
pub struct EditPost { pub struct EditPost {
pub edit_id: i32, pub edit_id: i32,
@ -242,8 +237,8 @@ impl Perform<GetPostsResponse> for Oper<GetPosts> {
} }
} }
impl Perform<CreatePostLikeResponse> for Oper<CreatePostLike> { impl Perform<PostResponse> for Oper<CreatePostLike> {
fn perform(&self, conn: &PgConnection) -> Result<CreatePostLikeResponse, Error> { fn perform(&self, conn: &PgConnection) -> Result<PostResponse, Error> {
let data: &CreatePostLike = &self.data; let data: &CreatePostLike = &self.data;
let claims = match Claims::decode(&data.auth) { let claims = match Claims::decode(&data.auth) {
@ -296,7 +291,7 @@ impl Perform<CreatePostLikeResponse> for Oper<CreatePostLike> {
}; };
// just output the score // just output the score
Ok(CreatePostLikeResponse { post: post_view }) Ok(PostResponse { post: post_view })
} }
} }

View file

@ -31,7 +31,7 @@ pub fn config(cfg: &mut web::ServiceConfig) {
.route("/api/v1/post", web::put().to(route_post::<EditPost, PostResponse>)) .route("/api/v1/post", web::put().to(route_post::<EditPost, PostResponse>))
.route("/api/v1/post", web::get().to(route_get::<GetPost, GetPostResponse>)) .route("/api/v1/post", web::get().to(route_get::<GetPost, GetPostResponse>))
.route("/api/v1/post/list", web::get().to(route_get::<GetPosts, GetPostsResponse>)) .route("/api/v1/post/list", web::get().to(route_get::<GetPosts, GetPostsResponse>))
.route("/api/v1/post/like", web::post().to(route_post::<CreatePostLike, CreatePostLikeResponse>)) .route("/api/v1/post/like", web::post().to(route_post::<CreatePostLike, PostResponse>))
.route("/api/v1/post/save", web::put().to(route_post::<SavePost, PostResponse>)) .route("/api/v1/post/save", web::put().to(route_post::<SavePost, PostResponse>))
// Comment // Comment
.route("/api/v1/comment", web::post().to(route_post::<CreateComment, CommentResponse>)) .route("/api/v1/comment", web::post().to(route_post::<CreateComment, CommentResponse>))

View file

@ -204,6 +204,61 @@ impl ChatServer {
} }
} }
fn comment_sends(
&self,
user_operation: UserOperation,
comment: CommentResponse,
id: ConnectionId,
) -> Result<String, Error> {
let mut comment_reply_sent = comment.clone();
comment_reply_sent.comment.my_vote = None;
comment_reply_sent.comment.user_id = None;
// For the post room ones, and the directs back to the user
// strip out the recipient_ids, so that
// users don't get double notifs
let mut comment_user_sent = comment.clone();
comment_user_sent.recipient_ids = Vec::new();
let mut comment_post_sent = comment_reply_sent.clone();
comment_post_sent.recipient_ids = Vec::new();
let comment_reply_sent_str = to_json_string(&user_operation, &comment_reply_sent)?;
let comment_post_sent_str = to_json_string(&user_operation, &comment_post_sent)?;
let comment_user_sent_str = to_json_string(&user_operation, &comment_user_sent)?;
// Send it to the post room
self.send_post_room_message(comment.comment.post_id, &comment_post_sent_str, id);
// Send it to the recipient(s) including the mentioned users
for recipient_id in comment_reply_sent.recipient_ids {
self.send_user_room_message(recipient_id, &comment_reply_sent_str, id);
}
Ok(comment_user_sent_str)
}
fn post_sends(
&self,
user_operation: UserOperation,
post: PostResponse,
id: ConnectionId,
) -> Result<String, Error> {
let community_id = post.post.community_id;
// Don't send my data with it
let mut post_sent = post.clone();
post_sent.post.my_vote = None;
post_sent.post.user_id = None;
let post_sent_str = to_json_string(&user_operation, &post_sent)?;
// Send it to /c/all and that community
self.send_community_room_message(0, &post_sent_str, id);
self.send_community_room_message(community_id, &post_sent_str, id);
to_json_string(&user_operation, post)
}
fn check_rate_limit_register(&mut self, id: usize) -> Result<(), Error> { fn check_rate_limit_register(&mut self, id: usize) -> Result<(), Error> {
self.check_rate_limit_full( self.check_rate_limit_full(
id, id,
@ -487,25 +542,6 @@ fn parse_json_message(chat: &mut ChatServer, msg: StandardMessage) -> Result<Str
UserOperation::ListCategories => { UserOperation::ListCategories => {
do_user_operation::<ListCategories, ListCategoriesResponse>(user_operation, data, &conn) do_user_operation::<ListCategories, ListCategoriesResponse>(user_operation, data, &conn)
} }
UserOperation::CreatePost => {
chat.check_rate_limit_post(msg.id)?;
let create_post: CreatePost = serde_json::from_str(data)?;
let community_id = create_post.community_id;
let res = Oper::new(create_post).perform(&conn)?;
let res_str = to_json_string(&user_operation, &res)?;
// Don't send my data with it
let mut post_sent = res;
post_sent.post.my_vote = None;
post_sent.post.user_id = None;
let post_sent_str = to_json_string(&user_operation, &post_sent)?;
// Send it to /c/all and that community
chat.send_community_room_message(0, &post_sent_str, msg.id);
chat.send_community_room_message(community_id, &post_sent_str, msg.id);
Ok(res_str)
}
UserOperation::GetPost => { UserOperation::GetPost => {
let get_post: GetPost = serde_json::from_str(data)?; let get_post: GetPost = serde_json::from_str(data)?;
let post_id = get_post.id; let post_id = get_post.id;
@ -529,43 +565,25 @@ fn parse_json_message(chat: &mut ChatServer, msg: StandardMessage) -> Result<Str
let res = Oper::new(get_posts).perform(&conn)?; let res = Oper::new(get_posts).perform(&conn)?;
to_json_string(&user_operation, &res) to_json_string(&user_operation, &res)
} }
UserOperation::UserJoin => { UserOperation::CreatePost => {
let user_join: UserJoin = serde_json::from_str(data)?; chat.check_rate_limit_post(msg.id)?;
let res = Oper::new(user_join).perform(&conn)?; let create_post: CreatePost = serde_json::from_str(data)?;
chat.join_user_room(res.user_id, msg.id); let res = Oper::new(create_post).perform(&conn)?;
to_json_string(&user_operation, &res)
chat.post_sends(UserOperation::CreatePost, res, msg.id)
} }
UserOperation::CreatePostLike => { UserOperation::CreatePostLike => {
chat.check_rate_limit_message(msg.id)?; chat.check_rate_limit_message(msg.id)?;
let create_post_like: CreatePostLike = serde_json::from_str(data)?; let create_post_like: CreatePostLike = serde_json::from_str(data)?;
let res = Oper::new(create_post_like).perform(&conn)?; let res = Oper::new(create_post_like).perform(&conn)?;
let community_id = res.post.community_id;
let res_str = to_json_string(&user_operation, &res)?;
// Don't send my data with it chat.post_sends(UserOperation::CreatePostLike, res, msg.id)
let mut post_sent = res;
post_sent.post.my_vote = None;
post_sent.post.user_id = None;
let post_sent_str = to_json_string(&user_operation, &post_sent)?;
// Send it to /c/all and that community
chat.send_community_room_message(0, &post_sent_str, msg.id);
chat.send_community_room_message(community_id, &post_sent_str, msg.id);
Ok(res_str)
} }
UserOperation::EditPost => { UserOperation::EditPost => {
let edit_post: EditPost = serde_json::from_str(data)?; let edit_post: EditPost = serde_json::from_str(data)?;
let res = Oper::new(edit_post).perform(&conn)?; let res = Oper::new(edit_post).perform(&conn)?;
let mut post_sent = res.clone();
post_sent.post.my_vote = None;
post_sent.post.user_id = None;
let post_sent_str = to_json_string(&user_operation, &post_sent)?;
// Send it to /c/all and that community chat.post_sends(UserOperation::EditPost, res, msg.id)
chat.send_community_room_message(0, &post_sent_str, msg.id);
chat.send_community_room_message(post_sent.post.community_id, &post_sent_str, msg.id);
to_json_string(&user_operation, &res)
} }
UserOperation::SavePost => { UserOperation::SavePost => {
do_user_operation::<SavePost, PostResponse>(user_operation, data, &conn) do_user_operation::<SavePost, PostResponse>(user_operation, data, &conn)
@ -573,48 +591,15 @@ fn parse_json_message(chat: &mut ChatServer, msg: StandardMessage) -> Result<Str
UserOperation::CreateComment => { UserOperation::CreateComment => {
chat.check_rate_limit_message(msg.id)?; chat.check_rate_limit_message(msg.id)?;
let create_comment: CreateComment = serde_json::from_str(data)?; let create_comment: CreateComment = serde_json::from_str(data)?;
let post_id = create_comment.post_id;
let res = Oper::new(create_comment).perform(&conn)?; let res = Oper::new(create_comment).perform(&conn)?;
let mut comment_user_sent = res.clone(); chat.comment_sends(UserOperation::CreateComment, res, msg.id)
comment_user_sent.comment.my_vote = None;
comment_user_sent.comment.user_id = None;
// For the post room ones, strip out the recipient_ids, so that
// users don't get double notifs
let mut comment_post_sent = comment_user_sent.clone();
comment_post_sent.recipient_ids = Vec::new();
let comment_user_sent_str = to_json_string(&user_operation, &comment_user_sent)?;
let comment_post_sent_str = to_json_string(&user_operation, &comment_post_sent)?;
// Send it to the post room
chat.send_post_room_message(post_id, &comment_post_sent_str, msg.id);
// Send it to the recipient(s) including the mentioned users
for recipient_id in comment_user_sent.recipient_ids {
chat.send_user_room_message(recipient_id, &comment_user_sent_str, msg.id);
}
to_json_string(&user_operation, &res)
} }
UserOperation::EditComment => { UserOperation::EditComment => {
let edit_comment: EditComment = serde_json::from_str(data)?; let edit_comment: EditComment = serde_json::from_str(data)?;
let post_id = edit_comment.post_id;
let res = Oper::new(edit_comment).perform(&conn)?; let res = Oper::new(edit_comment).perform(&conn)?;
let mut comment_sent = res.clone();
comment_sent.comment.my_vote = None;
comment_sent.comment.user_id = None;
let comment_sent_str = to_json_string(&user_operation, &comment_sent)?;
chat.send_post_room_message(post_id, &comment_sent_str, msg.id); chat.comment_sends(UserOperation::EditComment, res, msg.id)
// Send it to the recipient(s) including the mentioned users
for recipient_id in comment_sent.recipient_ids {
chat.send_user_room_message(recipient_id, &comment_sent_str, msg.id);
}
to_json_string(&user_operation, &res)
} }
UserOperation::SaveComment => { UserOperation::SaveComment => {
do_user_operation::<SaveComment, CommentResponse>(user_operation, data, &conn) do_user_operation::<SaveComment, CommentResponse>(user_operation, data, &conn)
@ -622,20 +607,9 @@ fn parse_json_message(chat: &mut ChatServer, msg: StandardMessage) -> Result<Str
UserOperation::CreateCommentLike => { UserOperation::CreateCommentLike => {
chat.check_rate_limit_message(msg.id)?; chat.check_rate_limit_message(msg.id)?;
let create_comment_like: CreateCommentLike = serde_json::from_str(data)?; let create_comment_like: CreateCommentLike = serde_json::from_str(data)?;
let post_id = create_comment_like.post_id;
let res = Oper::new(create_comment_like).perform(&conn)?; let res = Oper::new(create_comment_like).perform(&conn)?;
let mut comment_sent = res.clone();
comment_sent.comment.my_vote = None;
comment_sent.comment.user_id = None;
let comment_sent_str = to_json_string(&user_operation, &comment_sent)?;
chat.send_post_room_message(post_id, &comment_sent_str, msg.id); chat.comment_sends(UserOperation::CreateCommentLike, res, msg.id)
// Send it to the recipient(s) including the mentioned users
for recipient_id in comment_sent.recipient_ids {
chat.send_user_room_message(recipient_id, &comment_sent_str, msg.id);
}
to_json_string(&user_operation, &res)
} }
UserOperation::GetModlog => { UserOperation::GetModlog => {
do_user_operation::<GetModlog, GetModlogResponse>(user_operation, data, &conn) do_user_operation::<GetModlog, GetModlogResponse>(user_operation, data, &conn)
@ -690,5 +664,11 @@ fn parse_json_message(chat: &mut ChatServer, msg: StandardMessage) -> Result<Str
UserOperation::GetPrivateMessages => { UserOperation::GetPrivateMessages => {
do_user_operation::<GetPrivateMessages, PrivateMessagesResponse>(user_operation, data, &conn) do_user_operation::<GetPrivateMessages, PrivateMessagesResponse>(user_operation, data, &conn)
} }
UserOperation::UserJoin => {
let user_join: UserJoin = serde_json::from_str(data)?;
let res = Oper::new(user_join).perform(&conn)?;
chat.join_user_room(res.user_id, msg.id);
to_json_string(&user_operation, &res)
}
} }
} }

View file

@ -15,7 +15,6 @@ import {
ListingType, ListingType,
GetPostsResponse, GetPostsResponse,
PostResponse, PostResponse,
CreatePostLikeResponse,
AddModToCommunityResponse, AddModToCommunityResponse,
BanFromCommunityResponse, BanFromCommunityResponse,
WebSocketJsonResponse, WebSocketJsonResponse,
@ -294,7 +293,7 @@ export class Community extends Component<any, State> {
this.state.posts.unshift(data.post); this.state.posts.unshift(data.post);
this.setState(this.state); this.setState(this.state);
} else if (res.op == UserOperation.CreatePostLike) { } else if (res.op == UserOperation.CreatePostLike) {
let data = res.data as CreatePostLikeResponse; let data = res.data as PostResponse;
let found = this.state.posts.find(c => c.id == data.post.id); let found = this.state.posts.find(c => c.id == data.post.id);
found.score = data.post.score; found.score = data.post.score;

View file

@ -14,7 +14,6 @@ import {
ListingType, ListingType,
SiteResponse, SiteResponse,
GetPostsResponse, GetPostsResponse,
CreatePostLikeResponse,
PostResponse, PostResponse,
Post, Post,
GetPostsForm, GetPostsForm,
@ -622,7 +621,7 @@ export class Main extends Component<any, MainState> {
this.setState(this.state); this.setState(this.state);
} else if (res.op == UserOperation.CreatePostLike) { } else if (res.op == UserOperation.CreatePostLike) {
let data = res.data as CreatePostLikeResponse; let data = res.data as PostResponse;
let found = this.state.posts.find(c => c.id == data.post.id); let found = this.state.posts.find(c => c.id == data.post.id);
found.score = data.post.score; found.score = data.post.score;

View file

@ -11,7 +11,6 @@ import {
CommentForm as CommentFormI, CommentForm as CommentFormI,
CommentResponse, CommentResponse,
CommentSortType, CommentSortType,
CreatePostLikeResponse,
CommunityUser, CommunityUser,
CommunityResponse, CommunityResponse,
CommentNode as CommentNodeI, CommentNode as CommentNodeI,
@ -401,8 +400,8 @@ export class Post extends Component<any, PostState> {
} else if (res.op == UserOperation.CreateComment) { } else if (res.op == UserOperation.CreateComment) {
let data = res.data as CommentResponse; let data = res.data as CommentResponse;
// Necessary since a user might receive a comment reply on another thread // Necessary since it might be a user reply
if (data.comment.post_id == this.state.post.id) { if (data.recipient_ids.length == 0) {
this.state.comments.unshift(data.comment); this.state.comments.unshift(data.comment);
this.setState(this.state); this.setState(this.state);
} }
@ -439,7 +438,7 @@ export class Post extends Component<any, PostState> {
} }
this.setState(this.state); this.setState(this.state);
} else if (res.op == UserOperation.CreatePostLike) { } else if (res.op == UserOperation.CreatePostLike) {
let data = res.data as CreatePostLikeResponse; let data = res.data as PostResponse;
this.state.post.score = data.post.score; this.state.post.score = data.post.score;
this.state.post.upvotes = data.post.upvotes; this.state.post.upvotes = data.post.upvotes;
this.state.post.downvotes = data.post.downvotes; this.state.post.downvotes = data.post.downvotes;

View file

@ -12,7 +12,7 @@ import {
SearchForm, SearchForm,
SearchResponse, SearchResponse,
SearchType, SearchType,
CreatePostLikeResponse, PostResponse,
CommentResponse, CommentResponse,
WebSocketJsonResponse, WebSocketJsonResponse,
} from '../interfaces'; } from '../interfaces';
@ -506,7 +506,7 @@ export class Search extends Component<any, SearchState> {
} }
this.setState(this.state); this.setState(this.state);
} else if (res.op == UserOperation.CreatePostLike) { } else if (res.op == UserOperation.CreatePostLike) {
let data = res.data as CreatePostLikeResponse; let data = res.data as PostResponse;
let found = this.state.searchResponse.posts.find( let found = this.state.searchResponse.posts.find(
c => c.id == data.post.id c => c.id == data.post.id
); );

View file

@ -664,10 +664,6 @@ export interface CreatePostLikeForm {
auth?: string; auth?: string;
} }
export interface CreatePostLikeResponse {
post: Post;
}
export interface SiteForm { export interface SiteForm {
name: string; name: string;
description?: string; description?: string;
@ -831,7 +827,7 @@ type ResponseType =
| GetFollowedCommunitiesResponse | GetFollowedCommunitiesResponse
| ListCommunitiesResponse | ListCommunitiesResponse
| GetPostsResponse | GetPostsResponse
| CreatePostLikeResponse | PostResponse
| GetRepliesResponse | GetRepliesResponse
| GetUserMentionsResponse | GetUserMentionsResponse
| ListCategoriesResponse | ListCategoriesResponse