Bugfix/user reports

src/api/mutations/create-reply.ts

@@ -4,17 +4,15 @@ import { EcencyEntriesCacheManagement } from "@/core/caches";
 import { comment, formatError } from "../operations";
 import { tempEntry } from "@/utils";
 import { QueryIdentifiers } from "@/core/react-query";
-import { error } from "@/features/shared";
+import { error, success } from "@/features/shared";
 import * as ss from "@/utils/session-storage";
 import { useGlobalStore } from "@/core/global-store";
+import i18next from "i18next";
 
 export function useCreateReply(entry?: Entry | null, parent?: Entry, onSuccess?: () => void) {
   const activeUser = useGlobalStore((state) => state.activeUser);
 
   const { addReply } = EcencyEntriesCacheManagement.useAddReply(entry ?? undefined);
-  const { updateRepliesCount } = EcencyEntriesCacheManagement.useUpdateRepliesCount(
-    entry ?? undefined
-  );
   const { updateEntryQueryData } = EcencyEntriesCacheManagement.useUpdateEntry();
 
   const queryClient = useQueryClient();
@@ -61,36 +59,24 @@ export function useCreateReply(entry?: Entry | null, parent?: Entry, onSuccess?:
       });
     },
     onSuccess: (data) => {
-      if (!entry) {
-        return;
-      }
-
       addReply(data);
       updateEntryQueryData([data]);
 
       // remove reply draft
-      ss.remove(`reply_draft_${entry.author}_${entry.permlink}`);
+      ss.remove(`reply_draft_${entry!.author}_${entry!.permlink}`);
 
-      if (entry.children === 0) {
-        // Update parent comment.
-        updateRepliesCount(1);
-      }
-      const previousReplies =
-        queryClient.getQueryData<Entry[]>([
-          QueryIdentifiers.FETCH_DISCUSSIONS,
-          parent?.author ?? entry.author,
-          parent?.permlink ?? entry.permlink
-        ]) ?? [];
-      queryClient.setQueryData(
+      queryClient.setQueryData<Entry[]>(
         [
           QueryIdentifiers.FETCH_DISCUSSIONS,
-          parent?.author ?? entry.author,
-          parent?.permlink ?? entry.permlink
+          parent?.author ?? entry!.author,
+          parent?.permlink ?? entry!.permlink
         ],
-        [data, ...previousReplies]
+        (previousReplies) => [data, ...(previousReplies ?? [])]
       );
 
       onSuccess?.();
+
+      success(i18next.t("comment.success"));
     },
     onError: (e) => error(...formatError(e))
   });

src/app/[...slugs]/_entry-components/entry-page-content.tsx

@@ -1,6 +1,3 @@
-"use client";
-
-import { EntryPageNsfwWarning } from "@/app/[...slugs]/_entry-components/entry-page-nsfw-warning";
 import { EntryPageCrossPostBody } from "@/app/[...slugs]/_entry-components/entry-page-cross-post-body";
 import { EntryPageWarnings } from "@/app/[...slugs]/_entry-components/entry-page-warnings";
 import { EntryPageIsCommentHeader } from "@/app/[...slugs]/_entry-components/entry-page-is-comment-header";
@@ -14,9 +11,7 @@ import { EntryPageShowOriginal } from "@/app/[...slugs]/_entry-components/entry-
 import { EntryPageSimilarEntries } from "@/app/[...slugs]/_entry-components/entry-page-similar-entries";
 import { EntryPageDiscussions } from "@/app/[...slugs]/_entry-components/entry-page-discussions";
 import { Entry } from "@/entities";
-import { useGlobalStore } from "@/core/global-store";
-import { EcencyClientServerBridge } from "@/core/client-server-bridge";
-import { EntryPageContext } from "@/app/[...slugs]/_entry-components/context";
+import { EntryPageNsfwRevealing } from "@/app/[...slugs]/_entry-components/entry-page-nsfw-revealing";
 
 interface Props {
   entry: Entry;
@@ -26,37 +21,25 @@ interface Props {
 }
 
 export function EntryPageContent({ entry, rawParam, isEdit, category }: Props) {
-  const globalNsfw = useGlobalStore((s) => s.nsfw);
-
-  const { showIfNsfw } = EcencyClientServerBridge.useSafeContext(EntryPageContext);
-
-  const showNsfwWarning =
-    (entry.json_metadata.tags?.includes("nsfw") ?? false) && !showIfNsfw && !globalNsfw;
-
   return (
-    <>
-      {showNsfwWarning && <EntryPageNsfwWarning />}
-      {!showNsfwWarning && (
-        <>
-          <EntryPageCrossPostBody entry={entry} />
-          <EntryPageProfileBox entry={entry} />
-          <div className="entry-header">
-            <EntryPageWarnings entry={entry} />
-            <EntryPageIsCommentHeader entry={entry} />
-            <h1 className="entry-title">{entry.title}</h1>
-            <EntryPageMainInfo entry={entry} />
-          </div>
-          <EntryPageBodyViewer entry={entry} rawParam={rawParam} isEdit={isEdit} />
-          <div className="entry-footer flex-wrap mb-4 lg:mb-8 border border-[--border-color] p-2 md:p-4 rounded-2xl">
-            <EntryTags entry={entry} />
-            <EntryFooterInfo entry={entry} />
-            <EntryFooterControls entry={entry} />
-          </div>
-          <EntryPageShowOriginal entry={entry} />
-          <EntryPageSimilarEntries entry={entry} />
-          <EntryPageDiscussions category={category} entry={entry} />
-        </>
-      )}
-    </>
+    <EntryPageNsfwRevealing entry={entry}>
+      <EntryPageCrossPostBody entry={entry} />
+      <EntryPageProfileBox entry={entry} />
+      <div className="entry-header">
+        <EntryPageWarnings entry={entry} />
+        <EntryPageIsCommentHeader entry={entry} />
+        <h1 className="entry-title">{entry.title}</h1>
+        <EntryPageMainInfo entry={entry} />
+      </div>
+      <EntryPageBodyViewer entry={entry} rawParam={rawParam} isEdit={isEdit} />
+      <div className="entry-footer flex-wrap mb-4 lg:mb-8 border border-[--border-color] p-2 md:p-4 rounded-2xl">
+        <EntryTags entry={entry} />
+        <EntryFooterInfo entry={entry} />
+        <EntryFooterControls entry={entry} />
+      </div>
+      <EntryPageShowOriginal entry={entry} />
+      <EntryPageSimilarEntries entry={entry} />
+      <EntryPageDiscussions category={category} entry={entry} />
+    </EntryPageNsfwRevealing>
   );
 }

src/app/[...slugs]/_entry-components/entry-page-discussions.tsx

@@ -12,23 +12,25 @@ import { EntryPageContext } from "@/app/[...slugs]/_entry-components/context";
 import { createReplyPermlink, makeJsonMetaDataReply } from "@/utils";
 import appPackage from "../../../../package.json";
 import { useCreateReply } from "@/api/mutations";
-import { getCommunityCache } from "@/core/caches";
+import { EcencyEntriesCacheManagement, getCommunityCache } from "@/core/caches";
 import { EcencyConfigManager } from "@/config";
 
 interface Props {
   entry: Entry;
   category: string;
 }
 
-export function EntryPageDiscussions({ entry, category }: Props) {
+export function EntryPageDiscussions({ entry: initialEntry, category }: Props) {
   const params = useSearchParams();
 
-  const { commentsInputRef, selection } = EcencyClientServerBridge.useSafeContext(EntryPageContext);
+  const { commentsInputRef, selection, setSelection } =
+    EcencyClientServerBridge.useSafeContext(EntryPageContext);
 
   const activeUser = useGlobalStore((s) => s.activeUser);
 
   const [isCommented, setIsCommented] = useState(false);
 
+  const { data: entry } = EcencyEntriesCacheManagement.getEntryQuery(initialEntry).useClientQuery();
   const { data: community } = getCommunityCache(category).useClientQuery();
   const isRawContent = useMemo(
     () =>
@@ -48,30 +50,33 @@ export function EntryPageDiscussions({ entry, category }: Props) {
     const permlink = createReplyPermlink(entry!.author);
     const tags = entry!.json_metadata.tags || ["ecency"];
 
-    return createReply({
+    const response = await createReply({
       jsonMeta: makeJsonMetaDataReply(tags, appPackage.version),
       text,
       permlink,
       point: true
     });
+
+    setSelection("");
+    return response;
   };
 
   return (
     <>
       <Comment
         defText={selection}
         submitText={i18next.t("g.reply")}
-        entry={entry}
+        entry={entry!}
         onSubmit={replySubmitted}
         isCommented={isCommented}
         inProgress={isCreateReplyLoading}
         inputRef={commentsInputRef}
       />
 
-      {activeUser && entry.children === 0 && <CommentEngagement />}
+      {activeUser && entry!.children === 0 && <CommentEngagement />}
 
       <Discussion
-        parent={entry}
+        parent={entry!}
         community={community!!}
         hideControls={false}
         isRawContent={isRawContent}

src/app/[...slugs]/_entry-components/entry-page-nsfw-revealing.tsx

@@ -0,0 +1,23 @@
+"use client";
+
+import { useGlobalStore } from "@/core/global-store";
+import { EcencyClientServerBridge } from "@/core/client-server-bridge";
+import { EntryPageContext } from "@/app/[...slugs]/_entry-components/context";
+import { Entry } from "@/entities";
+import { EntryPageNsfwWarning } from "@/app/[...slugs]/_entry-components/entry-page-nsfw-warning";
+import { PropsWithChildren } from "react";
+
+interface Props {
+  entry: Entry;
+}
+
+export function EntryPageNsfwRevealing({ entry, children }: PropsWithChildren<Props>) {
+  const globalNsfw = useGlobalStore((s) => s.nsfw);
+
+  const { showIfNsfw } = EcencyClientServerBridge.useSafeContext(EntryPageContext);
+
+  const showNsfwWarning =
+    (entry.json_metadata.tags?.includes("nsfw") ?? false) && !showIfNsfw && !globalNsfw;
+
+  return showNsfwWarning ? <EntryPageNsfwWarning /> : children;
+}

src/app/submit/_hooks/api-draft-detector.ts

@@ -56,7 +56,7 @@ export function useApiDraftDetector(
       onDraftLoaded(draftQuery.data);
       setActivePoll(draftQuery.data.meta?.poll);
     }
-  }, [draftQuery.data, onDraftLoaded, setActivePoll]);
+  }, [draftQuery.data]);
 
   useEffect(() => {
     // location change. only occurs once a draft picked on drafts dialog

src/core/caches/entries-cache.tsx

@@ -114,23 +114,7 @@ export namespace EcencyEntriesCacheManagement {
     const qc = useQueryClient();
 
     return {
-      updateEntryQueryData: (entries: Entry[]) =>
-        entries.forEach((entry) => {
-          qc.setQueryData<Entry>(
-            [QueryIdentifiers.ENTRY, makeEntryPath("", entry.author, entry.permlink)],
-            () => {
-              const data = { ...entry };
-              if (
-                dmca.some((rx: string) => new RegExp(rx).test(`@${entry.author}/${entry.permlink}`))
-              ) {
-                data.body = "This post is not available due to a copyright/fraudulent claim.";
-                data.title = "";
-              }
-
-              return data;
-            }
-          );
-        })
+      updateEntryQueryData: (entries: Entry[]) => updateEntryQueryData(entries, qc)
     };
   }
 

src/features/i18n/locales/en-US.json

@@ -745,7 +745,8 @@
   },
   "comment": {
     "body-placeholder": "Write your reply here",
-    "preview": "Preview"
+    "preview": "Preview",
+    "success": "Your reply created successfully!"
   },
   "discussion": {
     "join": "Join the conversation now",

src/features/shared/comment/index.tsx

@@ -15,7 +15,7 @@ import { Entry } from "@/entities";
 import { useDebounce, useMount } from "react-use";
 import useUnmount from "react-use/lib/useUnmount";
 import { detectEvent, EditorToolbar, toolbarEventListener } from "@/features/shared/editor-toolbar";
-import { AvailableCredits } from "../available-credits";
+import { AvailableCredits } from "@/features/shared";
 import { TextareaAutocomplete } from "@/features/shared/textarea-autocomplete";
 import usePrevious from "react-use/lib/usePrevious";
 
@@ -149,9 +149,10 @@ export function Comment({
       if (resetSelection) resetSelection();
       updateLsCommentDraft(commentText);
     }
-    if (previousIsCommented && !isCommented) {
+    if (!previousIsCommented && isCommented) {
       setText("");
       setPreview("");
+      updateLsCommentDraft("");
     }
   }, [
     defText,

src/features/shared/discussion/index.tsx

@@ -43,19 +43,20 @@ export function Discussion({ hideControls, isRawContent, parent, community }: Pr
   ).useClientQuery();
   const { data: botsList } = getBotsQuery().useClientQuery();
 
-  const count = useMemo(() => parent.children, [parent]);
-  const strCount = useMemo(
-    () =>
-      count > 1 ? i18next.t("discussion.n-replies", { n: count }) : i18next.t("discussion.replies"),
-    [count]
-  );
   const filtered = useMemo(
     () =>
       data?.filter(
         (x) => x.parent_author === parent.author && x.parent_permlink === parent.permlink
-      ),
+      ) ?? [],
     [data, parent]
   );
+  const strCount = useMemo(
+    () =>
+      filtered.length > 1
+        ? i18next.t("discussion.n-replies", { n: filtered.length })
+        : i18next.t("discussion.replies"),
+    [filtered]
+  );
   const botsData = useMemo(
     () => filtered?.filter((entry) => botsList?.includes(entry.author) && entry.children === 0),
     [botsList, filtered]
@@ -69,8 +70,8 @@ export function Discussion({ hideControls, isRawContent, parent, community }: Pr
   useEffect(() => setVisible(!!activeUser), [activeUser]);
 
   useEffect(() => {
-    updateEntryQueryData(Array.from(Object.values(data ?? [])));
-  }, [data]);
+    updateEntryQueryData(filtered);
+  }, [filtered]);
 
   const show = () => setVisible(true);
 
@@ -92,15 +93,15 @@ export function Discussion({ hideControls, isRawContent, parent, community }: Pr
     );
   }
 
-  if (!activeUser && count < 1) {
+  if (!activeUser && filtered.length < 1) {
     return <div className="discussion">{join}</div>;
   }
 
-  if (count < 1) {
-    return <div className="discussion empty" />;
+  if (filtered.length < 1) {
+    return <></>;
   }
 
-  if (!visible && count >= 1) {
+  if (!visible && filtered.length >= 1) {
     return (
       <div className="discussion">
         <div className="discussion-card">

src/features/shared/textarea-autocomplete/index.tsx

@@ -30,9 +30,7 @@ export function TextareaAutocomplete(props: any) {
   }
 
   useEffect(() => {
-    if (!value && props.value) {
-      setValue(props.value);
-    }
+    setValue(props.value);
   }, [props.value, value]);
 
   const handleChange = (event: any) => {