From c5b7f67a22a31157ad0d8c57efca8ee37bfeaf71 Mon Sep 17 00:00:00 2001
From: plebbitor <mottoes_recap0u@icloud.com>
Date: Sun, 16 Apr 2023 18:07:20 +0200
Subject: [PATCH] added pending reply to thread

---
 src/components/views/Pending.jsx  |  1 -
 src/components/views/Thread.jsx   | 19 +++++++++++--------
 src/utils/renderThreadComments.js | 18 ++++++++++++------
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/components/views/Pending.jsx b/src/components/views/Pending.jsx
index b766b9cc..4456f321 100644
--- a/src/components/views/Pending.jsx
+++ b/src/components/views/Pending.jsx
@@ -252,7 +252,6 @@ const Pending = () => {
                       &nbsp;
                       <span className="post-number">
                         <Link to="" onClick={() => {}} title="Link to this post">c/</Link>
-                        &nbsp;
                         <span key="pending" style={{color: 'red', fontWeight: '700'}}>Pending</span>
                       </span>&nbsp;&nbsp;
                       <button key={`pmb-${"pending"}`} className="post-menu-button" onClick={() => {}} title="Post menu" style={{ all: 'unset', cursor: 'pointer' }}>▶</button>
diff --git a/src/components/views/Thread.jsx b/src/components/views/Thread.jsx
index 098eedd0..17e2cb78 100644
--- a/src/components/views/Thread.jsx
+++ b/src/components/views/Thread.jsx
@@ -28,7 +28,7 @@ const Thread = () => {
     defaultSubplebbits,
     setIsCaptchaOpen,
     isSettingsOpen, setIsSettingsOpen,
-    setPendingComment,
+    pendingComment, setPendingComment,
     selectedAddress, setSelectedAddress,
     setSelectedParentCid,
     setSelectedShortCid,
@@ -61,7 +61,7 @@ const Thread = () => {
   useError(errorMessage, [errorMessage]);
   useSuccess(successMessage, [successMessage]);
 
-  const renderedComments = renderThreadComments(comment?.replies?.pages?.topAll.comments);
+  const renderedComments = renderThreadComments(comment, pendingComment);
 
   // temporary title from JSON, gets subplebbitAddress and threadCid from URL
   useEffect(() => {
@@ -90,7 +90,6 @@ const Thread = () => {
   const onChallengeVerification = (challengeVerification) => {
     if (challengeVerification.challengeSuccess === true) {
       setSuccessMessage('challenge success', {publishedCid: challengeVerification.publication?.cid});
-      navigate(`/p/${selectedAddress}/c/${selectedThread}`);
     }
     else if (challengeVerification.challengeSuccess === false) {
       setErrorMessage('challenge failed', {reason: challengeVerification.reason, errors: challengeVerification.errors});
@@ -130,7 +129,7 @@ const Thread = () => {
 
   useEffect(() => {
     if (index !== undefined) {
-      navigate(`/profile/c/${index}`);
+      window.scrollTo(0, document.body.scrollHeight);
       setSuccessMessage('Comment pending with index ' + index + '.');
     }
   }, [index]);
@@ -160,7 +159,9 @@ const Thread = () => {
 
     setPublishCommentOptions((prevPublishCommentOptions) => ({
       ...prevPublishCommentOptions,
-      displayName: nameRef.current.value || undefined,
+      author: {
+        displayName: nameRef.current.value || undefined,
+      },
       content: commentRef.current.value || undefined,
       link: linkRef.current.value || undefined,
       parentCid: selectedThread,
@@ -526,14 +527,14 @@ const Thread = () => {
                               </span>
                             </>
                             : <span key={`mob-n-${reply.cid}`} className="name">
-                              {reply.author?.displayName}</span>
+                              {reply.author?.displayName ?? reply.displayName}</span>
                           : <span key={`mob-n-${reply.cid}`} className="name">
                             Anonymous</span>}
                             &nbsp;
                             <span key={`pa-${reply.cid}`} className="poster-address">
                               (u/
                               <span key={`mob-ha-${reply.cid}`}>
-                                {reply.author?.shortAddress}
+                                {reply.author?.shortAddress ?? reply.author.address}
                               </span>)
                             </span>
                           </span>
@@ -544,7 +545,9 @@ const Thread = () => {
                             <Link to="" key={`pl1-${reply.cid}`} onClick={() => {}} title="Link to this post">c/</Link>
                             <button id="reply-button" style={{ all: 'unset', cursor: 'pointer' }} key={`pl2-${reply.cid}`} onClick={() => { 
                               setIsReplyOpen(true); setSelectedParentCid(reply.cid); setSelectedShortCid(reply.shortCid);
-                              }} title="Reply to this post">{reply.shortCid}</button>
+                              }} title="Reply to this post">{reply.shortCid ?? (
+                                <span key="pending" style={{color: 'red', fontWeight: '700'}}>Pending</span>
+                              )}</button>
                           </span>&nbsp;
                           <button key={`pmb-${reply.cid}`} className="post-menu-button" onClick={() => {}} title="Post menu" style={{ all: 'unset', cursor: 'pointer' }}>▶</button>
                           <div id="backlink-id" className="backlink">
diff --git a/src/utils/renderThreadComments.js b/src/utils/renderThreadComments.js
index 77bce119..9961882b 100644
--- a/src/utils/renderThreadComments.js
+++ b/src/utils/renderThreadComments.js
@@ -1,15 +1,21 @@
-function renderThreadComments(comments) {
-  const commentKeys = Object.keys(comments? comments : {});
+function renderThreadComments(comment, pendingComment = null) {
+  const nestedComments = comment?.replies?.pages?.topAll?.comments || {};
+  const commentKeys = Object.keys(nestedComments);
+
   const renderedComments = commentKeys.map(key => {
-    const comment = comments[key];
-    const { replies: { pages: { topAll: { comments: nestedComments = [] } = {} } = {} } = {} } = comment;
-    if (comment.replyCount > 0 && nestedComments) {
-      const renderedNestedComments = renderThreadComments(nestedComments);
+    const comment = nestedComments[key];
+    const { replies: { pages: { topAll: { comments: childNestedComments = [] } = {} } = {} } = {} } = comment;
+    if (comment.replyCount > 0 && childNestedComments) {
+      const renderedNestedComments = renderThreadComments(comment);
       return [comment, ...renderedNestedComments];
     }
     return [comment];
   }).flat();
 
+  if (pendingComment?.parentCid === comment?.cid) {
+    renderedComments.push(pendingComment);
+  }
+
   const sortedComments = renderedComments.sort((a, b) => a.timestamp - b.timestamp);
   return sortedComments;
 }