import autosize from "autosize";
-import { Component, linkEvent } from "inferno";
+import { Component, createRef, linkEvent, RefObject } from "inferno";
import {
AddAdminResponse,
AddModToCommunityResponse,
BanFromCommunityResponse,
BanPersonResponse,
+ BlockPersonResponse,
+ CommentReportResponse,
CommentResponse,
+ CommentSortType,
CommunityResponse,
+ GetComments,
+ GetCommentsResponse,
GetCommunityResponse,
GetPost,
GetPostResponse,
GetSiteResponse,
- ListingType,
- MarkCommentAsRead,
+ PostReportResponse,
PostResponse,
PostView,
+ PurgeItemResponse,
Search,
SearchResponse,
- SearchType,
- SortType,
UserOperation,
+ wsJsonToRes,
+ wsUserOp,
} from "lemmy-js-client";
import { Subscription } from "rxjs";
import { i18n } from "../../i18next";
import {
- CommentNode as CommentNodeI,
- CommentSortType,
+ CommentNodeI,
CommentViewType,
InitialFetchRequest,
} from "../../interfaces";
import { UserService, WebSocketService } from "../../services";
import {
- authField,
buildCommentsTree,
commentsToFlatNodes,
+ commentTreeMaxDepth,
createCommentLikeRes,
createPostLikeRes,
+ debounce,
editCommentRes,
+ enableDownvotes,
+ enableNsfw,
getCommentIdFromProps,
+ getCommentParentId,
+ getDepthFromComment,
getIdFromProps,
insertCommentIntoTree,
isBrowser,
isImage,
- previewLines,
+ myAuth,
restoreScrollPosition,
saveCommentRes,
saveScrollPosition,
setIsoData,
- setOptionalAuth,
setupTippy,
toast,
+ trendingFetchLimit,
+ updatePersonBlock,
wsClient,
- wsJsonToRes,
wsSubscribe,
- wsUserOp,
} from "../../utils";
import { CommentForm } from "../comment/comment-form";
import { CommentNodes } from "../comment/comment-nodes";
import { Sidebar } from "../community/sidebar";
import { PostListing } from "./post-listing";
+const commentsShownInterval = 15;
+
interface PostState {
- postRes: GetPostResponse;
- postId: number;
- commentTree: CommentNodeI[];
+ postId?: number;
commentId?: number;
+ postRes?: GetPostResponse;
+ commentsRes?: GetCommentsResponse;
+ commentTree: CommentNodeI[];
commentSort: CommentSortType;
commentViewType: CommentViewType;
scrolled?: boolean;
loading: boolean;
- crossPosts: PostView[];
+ crossPosts?: PostView[];
siteRes: GetSiteResponse;
+ commentSectionRef?: RefObject<HTMLDivElement>;
showSidebarMobile: boolean;
+ maxCommentsShown: number;
}
export class Post extends Component<any, PostState> {
- private subscription: Subscription;
+ private subscription?: Subscription;
private isoData = setIsoData(this.context);
- private emptyState: PostState = {
- postRes: null,
+ private commentScrollDebounced: () => void;
+ state: PostState = {
postId: getIdFromProps(this.props),
- commentTree: [],
commentId: getCommentIdFromProps(this.props),
- commentSort: CommentSortType.Hot,
+ commentTree: [],
+ commentSort: "Hot",
commentViewType: CommentViewType.Tree,
scrolled: false,
loading: true,
- crossPosts: [],
siteRes: this.isoData.site_res,
showSidebarMobile: false,
+ maxCommentsShown: commentsShownInterval,
};
constructor(props: any, context: any) {
super(props, context);
- this.state = this.emptyState;
-
this.parseMessage = this.parseMessage.bind(this);
this.subscription = wsSubscribe(this.parseMessage);
+ this.state = { ...this.state, commentSectionRef: createRef() };
+
// Only fetch the data if coming from another route
if (this.isoData.path == this.context.router.route.match.url) {
- this.state.postRes = this.isoData.routeData[0];
- this.state.commentTree = buildCommentsTree(
- this.state.postRes.comments,
- this.state.commentSort
- );
- this.state.loading = false;
+ this.state = {
+ ...this.state,
+ postRes: this.isoData.routeData[0] as GetPostResponse,
+ commentsRes: this.isoData.routeData[1] as GetCommentsResponse,
+ };
+
+ if (this.state.commentsRes) {
+ this.state = {
+ ...this.state,
+ commentTree: buildCommentsTree(
+ this.state.commentsRes.comments,
+ !!this.state.commentId
+ ),
+ };
+ }
+
+ this.state = { ...this.state, loading: false };
if (isBrowser()) {
+ if (this.state.postRes) {
+ WebSocketService.Instance.send(
+ wsClient.communityJoin({
+ community_id: this.state.postRes.community_view.community.id,
+ })
+ );
+ }
+
+ if (this.state.postId) {
+ WebSocketService.Instance.send(
+ wsClient.postJoin({ post_id: this.state.postId })
+ );
+ }
+
this.fetchCrossPosts();
- if (this.state.commentId) {
- this.scrollCommentIntoView();
+
+ if (this.checkScrollIntoCommentsParam) {
+ this.scrollIntoCommentSection();
}
}
} else {
}
fetchPost() {
- let form: GetPost = {
+ let auth = myAuth(false);
+ let postForm: GetPost = {
id: this.state.postId,
- auth: authField(false),
+ comment_id: this.state.commentId,
+ auth,
};
- WebSocketService.Instance.send(wsClient.getPost(form));
+ WebSocketService.Instance.send(wsClient.getPost(postForm));
+
+ let commentsForm: GetComments = {
+ post_id: this.state.postId,
+ parent_id: this.state.commentId,
+ max_depth: commentTreeMaxDepth,
+ sort: this.state.commentSort,
+ type_: "All",
+ saved_only: false,
+ auth,
+ };
+ WebSocketService.Instance.send(wsClient.getComments(commentsForm));
}
fetchCrossPosts() {
- if (this.state.postRes.post_view.post.url) {
+ let q = this.state.postRes?.post_view.post.url;
+ if (q) {
let form: Search = {
- q: this.state.postRes.post_view.post.url,
- type_: SearchType.Url,
- sort: SortType.TopAll,
- listing_type: ListingType.All,
+ q,
+ type_: "Url",
+ sort: "TopAll",
+ listing_type: "All",
page: 1,
- limit: 6,
- auth: authField(false),
+ limit: trendingFetchLimit,
+ auth: myAuth(false),
};
WebSocketService.Instance.send(wsClient.search(form));
}
let pathSplit = req.path.split("/");
let promises: Promise<any>[] = [];
- let id = Number(pathSplit[2]);
+ let pathType = pathSplit.at(1);
+ let id = pathSplit.at(2) ? Number(pathSplit.at(2)) : undefined;
+ let auth = req.auth;
let postForm: GetPost = {
- id,
+ auth,
+ };
+
+ let commentsForm: GetComments = {
+ max_depth: commentTreeMaxDepth,
+ sort: "Hot",
+ type_: "All",
+ saved_only: false,
+ auth,
};
- setOptionalAuth(postForm, req.auth);
+
+ // Set the correct id based on the path type
+ if (pathType == "post") {
+ postForm.id = id;
+ commentsForm.post_id = id;
+ } else {
+ postForm.comment_id = id;
+ commentsForm.parent_id = id;
+ }
promises.push(req.client.getPost(postForm));
+ promises.push(req.client.getComments(commentsForm));
return promises;
}
componentWillUnmount() {
- this.subscription.unsubscribe();
- window.isoData.path = undefined;
+ this.subscription?.unsubscribe();
+ document.removeEventListener("scroll", this.commentScrollDebounced);
+
saveScrollPosition(this.context);
}
componentDidMount() {
- WebSocketService.Instance.send(
- wsClient.postJoin({ post_id: this.state.postId })
- );
autosize(document.querySelectorAll("textarea"));
- }
- componentDidUpdate(_lastProps: any, lastState: PostState) {
- if (
- this.state.commentId &&
- !this.state.scrolled &&
- lastState.postRes &&
- lastState.postRes.comments.length > 0
- ) {
- this.scrollCommentIntoView();
- }
+ this.commentScrollDebounced = debounce(this.trackCommentsBoxScrolling, 100);
+ document.addEventListener("scroll", this.commentScrollDebounced);
+ }
+ componentDidUpdate(_lastProps: any) {
// Necessary if you are on a post and you click another post (same route)
if (_lastProps.location.pathname !== _lastProps.history.location.pathname) {
// TODO Couldnt get a refresh working. This does for now.
}
}
- scrollCommentIntoView() {
- var elmnt = document.getElementById(`comment-${this.state.commentId}`);
- elmnt.scrollIntoView();
- elmnt.classList.add("mark");
- this.state.scrolled = true;
- this.markScrolledAsRead(this.state.commentId);
- }
-
- // TODO this needs some re-work
- markScrolledAsRead(commentId: number) {
- let found = this.state.postRes.comments.find(
- c => c.comment.id == commentId
+ get checkScrollIntoCommentsParam() {
+ return Boolean(
+ new URLSearchParams(this.props.location.search).get("scrollToComments")
);
- let parent = this.state.postRes.comments.find(
- c => found.comment.parent_id == c.comment.id
- );
- let parent_person_id = parent
- ? parent.creator.id
- : this.state.postRes.post_view.creator.id;
+ }
- if (
- UserService.Instance.localUserView &&
- UserService.Instance.localUserView.person.id == parent_person_id
- ) {
- let form: MarkCommentAsRead = {
- comment_id: found.comment.id,
- read: true,
- auth: authField(),
- };
- WebSocketService.Instance.send(wsClient.markCommentAsRead(form));
- UserService.Instance.unreadCountSub.next(
- UserService.Instance.unreadCountSub.value - 1
- );
- }
+ scrollIntoCommentSection() {
+ this.state.commentSectionRef?.current?.scrollIntoView();
}
- get documentTitle(): string {
- return `${this.state.postRes.post_view.post.name} - ${this.state.siteRes.site_view.site.name}`;
+ isBottom(el: Element): boolean {
+ return el?.getBoundingClientRect().bottom <= window.innerHeight;
}
- get imageTag(): string {
- let post = this.state.postRes.post_view.post;
- return (
- post.thumbnail_url ||
- (post.url ? (isImage(post.url) ? post.url : undefined) : undefined)
- );
+ /**
+ * Shows new comments when scrolling to the bottom of the comments div
+ */
+ trackCommentsBoxScrolling = () => {
+ const wrappedElement = document.getElementsByClassName("comments")[0];
+ if (wrappedElement && this.isBottom(wrappedElement)) {
+ this.setState({
+ maxCommentsShown: this.state.maxCommentsShown + commentsShownInterval,
+ });
+ }
+ };
+
+ get documentTitle(): string {
+ let name_ = this.state.postRes?.post_view.post.name;
+ let siteName = this.state.siteRes.site_view.site.name;
+ return name_ ? `${name_} - ${siteName}` : "";
}
- get descriptionTag(): string {
- let body = this.state.postRes.post_view.post.body;
- return body ? previewLines(body) : undefined;
+ get imageTag(): string | undefined {
+ let post = this.state.postRes?.post_view.post;
+ let thumbnail = post?.thumbnail_url;
+ let url = post?.url;
+ return thumbnail || (url && isImage(url) ? url : undefined);
}
render() {
- let pv = this.state.postRes?.post_view;
+ let res = this.state.postRes;
+ let description = res?.post_view.post.body;
return (
- <div class="container">
+ <div className="container-lg">
{this.state.loading ? (
<h5>
<Spinner large />
</h5>
) : (
- <div class="row">
- <div class="col-12 col-md-8 mb-3">
- <HtmlTags
- title={this.documentTitle}
- path={this.context.router.route.match.url}
- image={this.imageTag}
- description={this.descriptionTag}
- />
- <PostListing
- post_view={pv}
- duplicates={this.state.crossPosts}
- showBody
- showCommunity
- moderators={this.state.postRes.moderators}
- admins={this.state.siteRes.admins}
- enableDownvotes={
- this.state.siteRes.site_view.site.enable_downvotes
- }
- enableNsfw={this.state.siteRes.site_view.site.enable_nsfw}
- />
- <div className="mb-2" />
- <CommentForm
- postId={this.state.postId}
- disabled={pv.post.locked}
- />
- <div class="d-block d-md-none">
- <button
- class="btn btn-secondary d-inline-block mb-2 mr-3"
- onClick={linkEvent(this, this.handleShowSidebarMobile)}
- >
- {i18n.t("sidebar")}{" "}
- <Icon
- icon={
- this.state.showSidebarMobile
- ? `minus-square`
- : `plus-square`
- }
- classes="icon-inline"
- />
- </button>
- {this.state.showSidebarMobile && this.sidebar()}
+ res && (
+ <div className="row">
+ <div className="col-12 col-md-8 mb-3">
+ <HtmlTags
+ title={this.documentTitle}
+ path={this.context.router.route.match.url}
+ image={this.imageTag}
+ description={description}
+ />
+ <PostListing
+ post_view={res.post_view}
+ duplicates={this.state.crossPosts}
+ showBody
+ showCommunity
+ moderators={res.moderators}
+ admins={this.state.siteRes.admins}
+ enableDownvotes={enableDownvotes(this.state.siteRes)}
+ enableNsfw={enableNsfw(this.state.siteRes)}
+ allLanguages={this.state.siteRes.all_languages}
+ siteLanguages={this.state.siteRes.discussion_languages}
+ />
+ <div ref={this.state.commentSectionRef} className="mb-2" />
+ <CommentForm
+ node={res.post_view.post.id}
+ disabled={res.post_view.post.locked}
+ allLanguages={this.state.siteRes.all_languages}
+ siteLanguages={this.state.siteRes.discussion_languages}
+ />
+ <div className="d-block d-md-none">
+ <button
+ className="btn btn-secondary d-inline-block mb-2 mr-3"
+ onClick={linkEvent(this, this.handleShowSidebarMobile)}
+ >
+ {i18n.t("sidebar")}{" "}
+ <Icon
+ icon={
+ this.state.showSidebarMobile
+ ? `minus-square`
+ : `plus-square`
+ }
+ classes="icon-inline"
+ />
+ </button>
+ {this.state.showSidebarMobile && this.sidebar()}
+ </div>
+ {this.sortRadios()}
+ {this.state.commentViewType == CommentViewType.Tree &&
+ this.commentsTree()}
+ {this.state.commentViewType == CommentViewType.Flat &&
+ this.commentsFlat()}
</div>
- {this.state.postRes.comments.length > 0 && this.sortRadios()}
- {this.state.commentViewType == CommentViewType.Tree &&
- this.commentsTree()}
- {this.state.commentViewType == CommentViewType.Chat &&
- this.commentsFlat()}
+ <div className="d-none d-md-block col-md-4">{this.sidebar()}</div>
</div>
- <div class="d-none d-md-block col-md-4">{this.sidebar()}</div>
- </div>
+ )
)}
</div>
);
sortRadios() {
return (
<>
- <div class="btn-group btn-group-toggle flex-wrap mr-3 mb-2">
+ <div className="btn-group btn-group-toggle flex-wrap mr-3 mb-2">
<label
className={`btn btn-outline-secondary pointer ${
- this.state.commentSort === CommentSortType.Hot && "active"
+ this.state.commentSort === "Hot" && "active"
}`}
>
{i18n.t("hot")}
<input
type="radio"
- value={CommentSortType.Hot}
- checked={this.state.commentSort === CommentSortType.Hot}
+ value={"Hot"}
+ checked={this.state.commentSort === "Hot"}
onChange={linkEvent(this, this.handleCommentSortChange)}
/>
</label>
<label
className={`btn btn-outline-secondary pointer ${
- this.state.commentSort === CommentSortType.Top && "active"
+ this.state.commentSort === "Top" && "active"
}`}
>
{i18n.t("top")}
<input
type="radio"
- value={CommentSortType.Top}
- checked={this.state.commentSort === CommentSortType.Top}
+ value={"Top"}
+ checked={this.state.commentSort === "Top"}
onChange={linkEvent(this, this.handleCommentSortChange)}
/>
</label>
<label
className={`btn btn-outline-secondary pointer ${
- this.state.commentSort === CommentSortType.New && "active"
+ this.state.commentSort === "New" && "active"
}`}
>
{i18n.t("new")}
<input
type="radio"
- value={CommentSortType.New}
- checked={this.state.commentSort === CommentSortType.New}
+ value={"New"}
+ checked={this.state.commentSort === "New"}
onChange={linkEvent(this, this.handleCommentSortChange)}
/>
</label>
<label
className={`btn btn-outline-secondary pointer ${
- this.state.commentSort === CommentSortType.Old && "active"
+ this.state.commentSort === "Old" && "active"
}`}
>
{i18n.t("old")}
<input
type="radio"
- value={CommentSortType.Old}
- checked={this.state.commentSort === CommentSortType.Old}
+ value={"Old"}
+ checked={this.state.commentSort === "Old"}
onChange={linkEvent(this, this.handleCommentSortChange)}
/>
</label>
</div>
- <div class="btn-group btn-group-toggle flex-wrap mb-2">
+ <div className="btn-group btn-group-toggle flex-wrap mb-2">
<label
className={`btn btn-outline-secondary pointer ${
- this.state.commentViewType === CommentViewType.Chat && "active"
+ this.state.commentViewType === CommentViewType.Flat && "active"
}`}
>
{i18n.t("chat")}
<input
type="radio"
- value={CommentViewType.Chat}
- checked={this.state.commentViewType === CommentViewType.Chat}
+ value={CommentViewType.Flat}
+ checked={this.state.commentViewType === CommentViewType.Flat}
onChange={linkEvent(this, this.handleCommentViewTypeChange)}
/>
</label>
commentsFlat() {
// These are already sorted by new
+ let commentsRes = this.state.commentsRes;
+ let postRes = this.state.postRes;
return (
- <div>
- <CommentNodes
- nodes={commentsToFlatNodes(this.state.postRes.comments)}
- noIndent
- locked={this.state.postRes.post_view.post.locked}
- moderators={this.state.postRes.moderators}
- admins={this.state.siteRes.admins}
- postCreatorId={this.state.postRes.post_view.creator.id}
- showContext
- enableDownvotes={this.state.siteRes.site_view.site.enable_downvotes}
- />
- </div>
+ commentsRes &&
+ postRes && (
+ <div>
+ <CommentNodes
+ nodes={commentsToFlatNodes(commentsRes.comments)}
+ viewType={this.state.commentViewType}
+ maxCommentsShown={this.state.maxCommentsShown}
+ noIndent
+ locked={postRes.post_view.post.locked}
+ moderators={postRes.moderators}
+ admins={this.state.siteRes.admins}
+ enableDownvotes={enableDownvotes(this.state.siteRes)}
+ showContext
+ allLanguages={this.state.siteRes.all_languages}
+ siteLanguages={this.state.siteRes.discussion_languages}
+ />
+ </div>
+ )
);
}
sidebar() {
+ let res = this.state.postRes;
return (
- <div class="mb-3">
- <Sidebar
- community_view={this.state.postRes.community_view}
- moderators={this.state.postRes.moderators}
- admins={this.state.siteRes.admins}
- online={this.state.postRes.online}
- enableNsfw={this.state.siteRes.site_view.site.enable_nsfw}
- showIcon
- />
- </div>
+ res && (
+ <div className="mb-3">
+ <Sidebar
+ community_view={res.community_view}
+ moderators={res.moderators}
+ admins={this.state.siteRes.admins}
+ online={res.online}
+ enableNsfw={enableNsfw(this.state.siteRes)}
+ showIcon
+ allLanguages={this.state.siteRes.all_languages}
+ siteLanguages={this.state.siteRes.discussion_languages}
+ />
+ </div>
+ )
);
}
handleCommentSortChange(i: Post, event: any) {
- i.state.commentSort = Number(event.target.value);
- i.state.commentViewType = CommentViewType.Tree;
- i.state.commentTree = buildCommentsTree(
- i.state.postRes.comments,
- i.state.commentSort
- );
- i.setState(i.state);
+ i.setState({
+ commentSort: event.target.value as CommentSortType,
+ commentViewType: CommentViewType.Tree,
+ commentsRes: undefined,
+ postRes: undefined,
+ });
+ i.fetchPost();
}
handleCommentViewTypeChange(i: Post, event: any) {
- i.state.commentViewType = Number(event.target.value);
- i.state.commentSort = CommentSortType.New;
- i.state.commentTree = buildCommentsTree(
- i.state.postRes.comments,
- i.state.commentSort
- );
- i.setState(i.state);
+ let comments = i.state.commentsRes?.comments;
+ if (comments) {
+ i.setState({
+ commentViewType: Number(event.target.value),
+ commentSort: "New",
+ commentTree: buildCommentsTree(comments, !!i.state.commentId),
+ });
+ }
}
handleShowSidebarMobile(i: Post) {
- i.state.showSidebarMobile = !i.state.showSidebarMobile;
- i.setState(i.state);
+ i.setState({ showSidebarMobile: !i.state.showSidebarMobile });
+ }
+
+ handleViewPost(i: Post) {
+ let id = i.state.postRes?.post_view.post.id;
+ if (id) {
+ i.context.router.history.push(`/post/${id}`);
+ }
+ }
+
+ handleViewContext(i: Post) {
+ let parentId = getCommentParentId(
+ i.state.commentsRes?.comments?.at(0)?.comment
+ );
+ if (parentId) {
+ i.context.router.history.push(`/comment/${parentId}`);
+ }
}
commentsTree() {
+ let res = this.state.postRes;
+ let firstComment = this.state.commentTree.at(0)?.comment_view.comment;
+ let depth = getDepthFromComment(firstComment);
+ let showContextButton = depth ? depth > 0 : false;
+
return (
- <div>
- <CommentNodes
- nodes={this.state.commentTree}
- locked={this.state.postRes.post_view.post.locked}
- moderators={this.state.postRes.moderators}
- admins={this.state.siteRes.admins}
- postCreatorId={this.state.postRes.post_view.creator.id}
- enableDownvotes={this.state.siteRes.site_view.site.enable_downvotes}
- />
- </div>
+ res && (
+ <div>
+ {!!this.state.commentId && (
+ <>
+ <button
+ className="pl-0 d-block btn btn-link text-muted"
+ onClick={linkEvent(this, this.handleViewPost)}
+ >
+ {i18n.t("view_all_comments")} ➔
+ </button>
+ {showContextButton && (
+ <button
+ className="pl-0 d-block btn btn-link text-muted"
+ onClick={linkEvent(this, this.handleViewContext)}
+ >
+ {i18n.t("show_context")} ➔
+ </button>
+ )}
+ </>
+ )}
+ <CommentNodes
+ nodes={this.state.commentTree}
+ viewType={this.state.commentViewType}
+ maxCommentsShown={this.state.maxCommentsShown}
+ locked={res.post_view.post.locked}
+ moderators={res.moderators}
+ admins={this.state.siteRes.admins}
+ enableDownvotes={enableDownvotes(this.state.siteRes)}
+ allLanguages={this.state.siteRes.all_languages}
+ siteLanguages={this.state.siteRes.discussion_languages}
+ />
+ </div>
+ )
);
}
toast(i18n.t(msg.error), "danger");
return;
} else if (msg.reconnect) {
- let postId = Number(this.props.match.params.id);
- WebSocketService.Instance.send(wsClient.postJoin({ post_id: postId }));
+ let post_id = this.state.postRes?.post_view.post.id;
+ if (post_id) {
+ WebSocketService.Instance.send(wsClient.postJoin({ post_id }));
+ WebSocketService.Instance.send(
+ wsClient.getPost({
+ id: post_id,
+ auth: myAuth(false),
+ })
+ );
+ }
+ } else if (op == UserOperation.GetPost) {
+ let data = wsJsonToRes<GetPostResponse>(msg);
+ this.setState({ postRes: data });
+
+ // join the rooms
WebSocketService.Instance.send(
- wsClient.getPost({
- id: postId,
- auth: authField(false),
- })
+ wsClient.postJoin({ post_id: data.post_view.post.id })
);
- } else if (op == UserOperation.GetPost) {
- let data = wsJsonToRes<GetPostResponse>(msg).data;
- this.state.postRes = data;
- this.state.commentTree = buildCommentsTree(
- this.state.postRes.comments,
- this.state.commentSort
+ WebSocketService.Instance.send(
+ wsClient.communityJoin({
+ community_id: data.community_view.community.id,
+ })
);
- this.state.loading = false;
// Get cross-posts
+ // TODO move this into initial fetch and refetch
this.fetchCrossPosts();
- this.setState(this.state);
setupTippy();
if (!this.state.commentId) restoreScrollPosition(this.context);
+
+ if (this.checkScrollIntoCommentsParam) {
+ this.scrollIntoCommentSection();
+ }
+ } else if (op == UserOperation.GetComments) {
+ let data = wsJsonToRes<GetCommentsResponse>(msg);
+ // This section sets the comments res
+ let comments = this.state.commentsRes?.comments;
+ if (comments) {
+ // You might need to append here, since this could be building more comments from a tree fetch
+ // Remove the first comment, since it is the parent
+ let newComments = data.comments;
+ newComments.shift();
+ comments.push(...newComments);
+ } else {
+ this.setState({ commentsRes: data });
+ }
+
+ let cComments = this.state.commentsRes?.comments ?? [];
+ this.setState({
+ commentTree: buildCommentsTree(cComments, !!this.state.commentId),
+ loading: false,
+ });
} else if (op == UserOperation.CreateComment) {
- let data = wsJsonToRes<CommentResponse>(msg).data;
+ let data = wsJsonToRes<CommentResponse>(msg);
+
+ // Don't get comments from the post room, if the creator is blocked
+ let creatorBlocked = UserService.Instance.myUserInfo?.person_blocks
+ .map(pb => pb.target.id)
+ .includes(data.comment_view.creator.id);
// Necessary since it might be a user reply, which has the recipients, to avoid double
- if (data.recipient_ids.length == 0) {
- this.state.postRes.comments.unshift(data.comment_view);
- insertCommentIntoTree(this.state.commentTree, data.comment_view);
- this.state.postRes.post_view.counts.comments++;
+ let postRes = this.state.postRes;
+ let commentsRes = this.state.commentsRes;
+ if (
+ data.recipient_ids.length == 0 &&
+ !creatorBlocked &&
+ postRes &&
+ data.comment_view.post.id == postRes.post_view.post.id &&
+ commentsRes
+ ) {
+ commentsRes.comments.unshift(data.comment_view);
+ insertCommentIntoTree(
+ this.state.commentTree,
+ data.comment_view,
+ !!this.state.commentId
+ );
+ postRes.post_view.counts.comments++;
+
this.setState(this.state);
setupTippy();
}
op == UserOperation.DeleteComment ||
op == UserOperation.RemoveComment
) {
- let data = wsJsonToRes<CommentResponse>(msg).data;
- editCommentRes(data.comment_view, this.state.postRes.comments);
+ let data = wsJsonToRes<CommentResponse>(msg);
+ editCommentRes(data.comment_view, this.state.commentsRes?.comments);
this.setState(this.state);
+ setupTippy();
} else if (op == UserOperation.SaveComment) {
- let data = wsJsonToRes<CommentResponse>(msg).data;
- saveCommentRes(data.comment_view, this.state.postRes.comments);
+ let data = wsJsonToRes<CommentResponse>(msg);
+ saveCommentRes(data.comment_view, this.state.commentsRes?.comments);
this.setState(this.state);
setupTippy();
} else if (op == UserOperation.CreateCommentLike) {
- let data = wsJsonToRes<CommentResponse>(msg).data;
- createCommentLikeRes(data.comment_view, this.state.postRes.comments);
+ let data = wsJsonToRes<CommentResponse>(msg);
+ createCommentLikeRes(data.comment_view, this.state.commentsRes?.comments);
this.setState(this.state);
} else if (op == UserOperation.CreatePostLike) {
- let data = wsJsonToRes<PostResponse>(msg).data;
- createPostLikeRes(data.post_view, this.state.postRes.post_view);
+ let data = wsJsonToRes<PostResponse>(msg);
+ createPostLikeRes(data.post_view, this.state.postRes?.post_view);
this.setState(this.state);
} else if (
op == UserOperation.EditPost ||
op == UserOperation.DeletePost ||
op == UserOperation.RemovePost ||
op == UserOperation.LockPost ||
- op == UserOperation.StickyPost ||
+ op == UserOperation.FeaturePost ||
op == UserOperation.SavePost
) {
- let data = wsJsonToRes<PostResponse>(msg).data;
- this.state.postRes.post_view = data.post_view;
- this.setState(this.state);
- setupTippy();
+ let data = wsJsonToRes<PostResponse>(msg);
+ let res = this.state.postRes;
+ if (res) {
+ res.post_view = data.post_view;
+ this.setState(this.state);
+ setupTippy();
+ }
} else if (
op == UserOperation.EditCommunity ||
op == UserOperation.DeleteCommunity ||
op == UserOperation.RemoveCommunity ||
op == UserOperation.FollowCommunity
) {
- let data = wsJsonToRes<CommunityResponse>(msg).data;
- this.state.postRes.community_view = data.community_view;
- this.state.postRes.post_view.community = data.community_view.community;
- this.setState(this.state);
- this.setState(this.state);
+ let data = wsJsonToRes<CommunityResponse>(msg);
+ let res = this.state.postRes;
+ if (res) {
+ res.community_view = data.community_view;
+ res.post_view.community = data.community_view.community;
+ this.setState(this.state);
+ }
} else if (op == UserOperation.BanFromCommunity) {
- let data = wsJsonToRes<BanFromCommunityResponse>(msg).data;
- this.state.postRes.comments
+ let data = wsJsonToRes<BanFromCommunityResponse>(msg);
+
+ let res = this.state.postRes;
+ if (res) {
+ if (res.post_view.creator.id == data.person_view.person.id) {
+ res.post_view.creator_banned_from_community = data.banned;
+ }
+ }
+
+ this.state.commentsRes?.comments
.filter(c => c.creator.id == data.person_view.person.id)
.forEach(c => (c.creator_banned_from_community = data.banned));
- if (
- this.state.postRes.post_view.creator.id == data.person_view.person.id
- ) {
- this.state.postRes.post_view.creator_banned_from_community =
- data.banned;
- }
this.setState(this.state);
} else if (op == UserOperation.AddModToCommunity) {
- let data = wsJsonToRes<AddModToCommunityResponse>(msg).data;
- this.state.postRes.moderators = data.moderators;
- this.setState(this.state);
+ let data = wsJsonToRes<AddModToCommunityResponse>(msg);
+ let res = this.state.postRes;
+ if (res) {
+ res.moderators = data.moderators;
+ this.setState(this.state);
+ }
} else if (op == UserOperation.BanPerson) {
- let data = wsJsonToRes<BanPersonResponse>(msg).data;
- this.state.postRes.comments
+ let data = wsJsonToRes<BanPersonResponse>(msg);
+ this.state.commentsRes?.comments
.filter(c => c.creator.id == data.person_view.person.id)
.forEach(c => (c.creator.banned = data.banned));
- if (
- this.state.postRes.post_view.creator.id == data.person_view.person.id
- ) {
- this.state.postRes.post_view.creator.banned = data.banned;
+
+ let res = this.state.postRes;
+ if (res) {
+ if (res.post_view.creator.id == data.person_view.person.id) {
+ res.post_view.creator.banned = data.banned;
+ }
}
this.setState(this.state);
} else if (op == UserOperation.AddAdmin) {
- let data = wsJsonToRes<AddAdminResponse>(msg).data;
- this.state.siteRes.admins = data.admins;
- this.setState(this.state);
+ let data = wsJsonToRes<AddAdminResponse>(msg);
+ this.setState(s => ((s.siteRes.admins = data.admins), s));
} else if (op == UserOperation.Search) {
- let data = wsJsonToRes<SearchResponse>(msg).data;
- this.state.crossPosts = data.posts.filter(
- p => p.post.id != Number(this.props.match.params.id)
+ let data = wsJsonToRes<SearchResponse>(msg);
+ let xPosts = data.posts.filter(
+ p => p.post.ap_id != this.state.postRes?.post_view.post.ap_id
);
- this.setState(this.state);
- } else if (op == UserOperation.TransferSite) {
- let data = wsJsonToRes<GetSiteResponse>(msg).data;
- this.state.siteRes = data;
- this.setState(this.state);
+ this.setState({ crossPosts: xPosts.length > 0 ? xPosts : undefined });
+ } else if (op == UserOperation.LeaveAdmin) {
+ let data = wsJsonToRes<GetSiteResponse>(msg);
+ this.setState({ siteRes: data });
} else if (op == UserOperation.TransferCommunity) {
- let data = wsJsonToRes<GetCommunityResponse>(msg).data;
- this.state.postRes.community_view = data.community_view;
- this.state.postRes.post_view.community = data.community_view.community;
- this.state.postRes.moderators = data.moderators;
- this.setState(this.state);
+ let data = wsJsonToRes<GetCommunityResponse>(msg);
+ let res = this.state.postRes;
+ if (res) {
+ res.community_view = data.community_view;
+ res.post_view.community = data.community_view.community;
+ res.moderators = data.moderators;
+ this.setState(this.state);
+ }
+ } else if (op == UserOperation.BlockPerson) {
+ let data = wsJsonToRes<BlockPersonResponse>(msg);
+ updatePersonBlock(data);
+ } else if (op == UserOperation.CreatePostReport) {
+ let data = wsJsonToRes<PostReportResponse>(msg);
+ if (data) {
+ toast(i18n.t("report_created"));
+ }
+ } else if (op == UserOperation.CreateCommentReport) {
+ let data = wsJsonToRes<CommentReportResponse>(msg);
+ if (data) {
+ toast(i18n.t("report_created"));
+ }
+ } else if (
+ op == UserOperation.PurgePerson ||
+ op == UserOperation.PurgePost ||
+ op == UserOperation.PurgeComment ||
+ op == UserOperation.PurgeCommunity
+ ) {
+ let data = wsJsonToRes<PurgeItemResponse>(msg);
+ if (data.success) {
+ toast(i18n.t("purge_success"));
+ this.context.router.history.push(`/`);
+ }
}
}
}
projects / lemmy-ui.git / blobdiff