External/5chan
1
0
Fork 0
mirror of https://github.com/bitsocialnet/5chan.git synced 2026-08-03 07:41:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

disabled mock content

Browse Source
This commit is contained in:
plebbitor
2023-04-15 18:12:46 +02:00
parent 71fd9adf7c
commit 9d4d989068
6 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/views/Board.jsx
+5 -5
View File
@@ -375,7 +375,7 @@ const Board = () => {
hasMore={hasMore}
>
{selectedFeed.map((thread) => {
const { replies: { pages: { topAll: { comments } } } } = thread;
const { replies: { pages: { topAll: { comments } = {} } = {} } = {} } = thread;
const { renderedComments, omittedCount } = renderComments(comments);
const commentMediaInfo = getCommentMediaInfo(thread);
const fallbackImgUrl = "/assets/filedeleted-res.gif";
@@ -471,7 +471,7 @@ const Board = () => {
</span>&nbsp;
<button key={`pmb-${thread.cid}`} className="post-menu-button" title="Post menu" style={{ all: 'unset', cursor: 'pointer' }} data-cmd="post-menu">▶</button>
<div key={`bi-${thread.cid}`} id="backlink-id" className="backlink">
{thread.replies?.pages.topAll.comments
{thread.replies?.pages?.topAll.comments
.sort((a, b) => a.timestamp - b.timestamp)
.map((reply) => (
<div key={`div-${reply.cid}`} style={{display: 'inline-block'}}>
@@ -514,7 +514,7 @@ const Board = () => {
</span>
</span>) : null}
</span>
{renderedComments.map((reply) => {
{renderedComments?.map((reply) => {
const replyMediaInfo = getCommentMediaInfo(reply);
const fallbackImgUrl = "/assets/filedeleted-res.gif";
return (
@@ -558,7 +558,7 @@ const Board = () => {
</span>&nbsp;
<button key={`pmb-${reply.cid}`} className="post-menu-button" onClick={() => {}} title="Post menu" style={{ all: 'unset', cursor: 'pointer' }} data-cmd="post-menu">▶</button>
<div id="backlink-id" className="backlink">
{reply.replies?.pages.topAll.comments
{reply.replies?.pages?.topAll.comments
.sort((a, b) => a.timestamp - b.timestamp)
.map((reply) => (
<div key={`div-${reply.cid}`} style={{display: 'inline-block'}}>
@@ -749,7 +749,7 @@ const Board = () => {
<Link key={`rl2-${thread.cid}`} to={`/p/${selectedAddress}/c/${thread.cid}`} onClick={() => setSelectedThread(thread.cid)} className="button-mobile" >View Thread</Link>
</div>
</div>
{renderedComments.map((reply) => {
{renderedComments?.map((reply) => {
const replyMediaInfo = getCommentMediaInfo(reply);
return (
<div key={`mob-rc-${reply.cid}`} className="reply-container">
src/components/views/Thread.jsx
+6 -6
View File
@@ -481,7 +481,7 @@ const Thread = () => {
</span>&nbsp;&nbsp;
<button key={`pmb-${comment.cid}`} className="post-menu-button" onClick={() => {}} title="Post menu" style={{ all: 'unset', cursor: 'pointer' }}>▶</button>
<div id="backlink-id" className="backlink">
{comment.replies?.pages.topAll.comments
{comment?.replies?.pages?.topAll.comments
.sort((a, b) => a.timestamp - b.timestamp)
.map((reply) => (
<div key={`div-${reply.cid}`} style={{display: 'inline-block'}}>
@@ -503,8 +503,8 @@ const Thread = () => {
</div>
{comment.replyCount === undefined ? <PostLoader /> : null}
{comment.replyCount > 0 &&
Object.keys(comment.replies.pages.topAll.comments).map(() => {
const renderedComments = renderThreadComments(comment.replies.pages.topAll.comments);
Object.keys(comment?.replies?.pages?.topAll.comments).map(() => {
const renderedComments = renderThreadComments(comment?.replies?.pages?.topAll.comments);
return renderedComments.map(reply => {
const replyMediaInfo = getCommentMediaInfo(reply);
const fallbackImgUrl = "/assets/filedeleted-res.gif";
@@ -548,7 +548,7 @@ const Thread = () => {
</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">
{reply.replies?.pages.topAll.comments
{reply.replies?.pages?.topAll.comments
.sort((a, b) => a.timestamp - b.timestamp)
.map((reply) => (
<div key={`div-${reply.cid}`} style={{display: 'inline-block'}}>
@@ -711,8 +711,8 @@ const Thread = () => {
</div>
{comment.replyCount === undefined ? <PostLoader /> : null}
{comment.replyCount > 0 &&
Object.keys(comment.replies.pages.topAll.comments).map(() => {
const renderedComments = renderThreadComments(comment.replies.pages.topAll.comments);
Object.keys(comment?.replies?.pages?.topAll.comments).map(() => {
const renderedComments = renderThreadComments(comment?.replies?.pages?.topAll.comments);
return renderedComments.map(reply => {
return (
<div key={`mob-rc-${reply.cid}-${Math.random()}`} className="reply-container">
src/utils/getCommentMediaInfo.js
+6 -6
View File
@@ -4,12 +4,12 @@ const getCommentMediaInfo = (comment) => {
if (!comment?.thumbnailUrl && !comment?.link) {
return;
}
if (comment?.thumbnailUrl) {
return {
url: comment.link,
type: 'webpage'
};
}
// if (comment?.thumbnailUrl) {
// return {
// url: comment.link,
// type: 'webpage'
// };
// }
if (comment?.link) {
try {
new URL(comment.link);
src/utils/renderComments.js
+3 -3
View File
@@ -3,7 +3,7 @@ function renderComments(comments) {
let omittedCount = 0;
const renderComment = (comment) => {
const { replyCount, replies: { pages: { topAll: { comments: nestedComments } } } } = comment;
const { replyCount, replies: { pages: { topAll: { comments: nestedComments = [] } = {} } = {} } = {} } = comment;
let renderedNestedComments = [];
if (replyCount > 0 && nestedComments.length > 0) {
@@ -21,8 +21,8 @@ function renderComments(comments) {
return displayedComments;
};
const renderedComments = comments.flatMap(renderComment);
renderedComments.sort((a, b) => a.timestamp - b.timestamp);
const renderedComments = comments?.flatMap(renderComment);
renderedComments?.sort((a, b) => a.timestamp - b.timestamp);
return { renderedComments, omittedCount };
}
src/utils/renderThreadComments.js
+1 -1
View File
@@ -2,7 +2,7 @@ function renderThreadComments(comments) {
const commentKeys = Object.keys(comments);
const renderedComments = commentKeys.map(key => {
const comment = comments[key];
const { replies: { pages: { topAll: { comments: nestedComments } } } } = comment;
const { replies: { pages: { topAll: { comments: nestedComments = [] } = {} } = {} } = {} } = comment;
if (comment.replyCount > 0 && nestedComments) {
const renderedNestedComments = renderThreadComments(nestedComments);
return [comment, ...renderedNestedComments];