From ced6a27e9b3bb0595f3e09c0f12634983a43ba13 Mon Sep 17 00:00:00 2001 From: Christopher Gurnee Date: Mon, 14 Mar 2022 19:51:08 +0000 Subject: [PATCH] Remove unused 'removed' & 'deleted' arrays --- src/api/reddit/index.js | 2 +- src/pages/thread/index.js | 23 +++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/api/reddit/index.js b/src/api/reddit/index.js index 8b78dd3..ff221af 100644 --- a/src/api/reddit/index.js +++ b/src/api/reddit/index.js @@ -23,7 +23,7 @@ const errorHandler = (origError, from) => { } // Return the post itself -export const getPost = (subreddit, threadID) => ( +export const getPost = threadID => ( fetchJson(`${baseURL}/comments/${threadID}.json?limit=1`, requestSettings) .then(thread => thread[0].data.children[0].data) .catch(error => errorHandler(error, 'reddit.getPost')) diff --git a/src/pages/thread/index.js b/src/pages/thread/index.js index 033b5ab..cec9144 100644 --- a/src/pages/thread/index.js +++ b/src/pages/thread/index.js @@ -17,6 +17,7 @@ import SortBy from './SortBy' import CommentInfo from './CommentInfo' import LoadMore from './LoadMore' +// A FIFO queue with items pushed in individually, and shifted out in an Array of chunkSize class ChunkedQueue { constructor(chunkSize) { @@ -50,8 +51,8 @@ class Thread extends React.Component { state = { post: {}, pushshiftCommentLookup: new Map(), - removed: [], - deleted: [], + removed: 0, + deleted: 0, loadedAllComments: false, loadingComments: true, reloadingComments: false @@ -62,7 +63,7 @@ class Thread extends React.Component { this.props.global.setLoading('Loading post...') // Get post from reddit - getPost(subreddit, threadID) + getPost(threadID) .then(post => { document.title = post.title this.setState({ post }) @@ -122,7 +123,7 @@ class Thread extends React.Component { getComments (newCommentCount, after) { const { threadID } = this.props.match.params - const { pushshiftCommentLookup, removed, deleted } = this.state + const { pushshiftCommentLookup } = this.state const redditIdQueue = new ChunkedQueue(redditChunkSize) const pushshiftPromises = [], redditPromises = [] let redditError = false, doRedditComments @@ -168,10 +169,10 @@ class Thread extends React.Component { // Check what is removed / deleted according to reddit if (isRemoved(comment.body)) { - removed.push(comment.id) + this.state.removed++ pushshiftComment.removed = true } else if (isDeleted(comment.body)) { - deleted.push(comment.id) + this.state.deleted++ pushshiftComment.deleted = true } else if (pushshiftComment !== comment) { if (isRemoved(pushshiftComment.body)) { @@ -214,8 +215,8 @@ class Thread extends React.Component { this.props.global.setSuccess() this.setState({ pushshiftCommentLookup, - removed, - deleted, + removed: this.state.removed, + deleted: this.state.deleted, loadedAllComments, loadingComments: false, reloadingComments: false @@ -244,8 +245,8 @@ class Thread extends React.Component { <>