diff --git a/src/pages/common/Post.js b/src/pages/common/Post.js index 1283aa2..c03ec71 100644 --- a/src/pages/common/Post.js +++ b/src/pages/common/Post.js @@ -62,21 +62,22 @@ const Post = (props) => { const innerHTML = Array(editedModes.length) if (props.removed && isRemoved(props.selftext)) { if (!hasOwnProperty.call(props, 'retrieved_utc') && !hasOwnProperty.call(props, 'retrieved_on') || !hasOwnProperty.call(props, 'created_utc')) { - innerHTML[editedModes.orig] = '
[removed too quickly to be archived]
' + innerHTML[editedModes.dfault] = '[removed too quickly to be archived]
' } else { const retrieved = hasOwnProperty.call(props, 'retrieved_utc') ? props.retrieved_utc : props.retrieved_on; - innerHTML[editedModes.orig] = `[removed within ${prettyTimeDiff(retrieved - props.created_utc)}]
` + innerHTML[editedModes.dfault] = `[removed within ${prettyTimeDiff(retrieved - props.created_utc)}]
` } } else if (props.selftext && (props.is_self || !isDeleted(props.selftext))) { - innerHTML[editedModes.orig] = parse(props.selftext) if (hasOwnProperty.call(props, 'edited_selftext')) { + innerHTML[editedModes.orig] = parse(props.selftext) innerHTML[editedModes.edited] = parse(props.edited_selftext) - innerHTML[editedModes.rich] = Diff.execute(innerHTML[editedModes.orig], innerHTML[editedModes.edited]) - } + innerHTML[editedModes.dfault] = Diff.execute(innerHTML[editedModes.orig], innerHTML[editedModes.edited]) + } else + innerHTML[editedModes.dfault] = parse(props.selftext) } // eslint-disable-next-line react-hooks/rules-of-hooks - const [editedMode, setEditedMode] = useState(innerHTML[editedModes.rich] ? editedModes.rich : editedModes.orig) + const [editedMode, setEditedMode] = useState(editedModes.dfault) const totalComments =[removed too quickly to be archived]
' + innerHTML[editedModes.dfault] = '[removed too quickly to be archived]
' } else if (props.created_utc < 1627776000) { // Aug 1 2021 const retrieved = hasOwnProperty.call(props, 'retrieved_utc') ? props.retrieved_utc : props.retrieved_on; - innerHTML[editedModes.orig] = `[removed within ${prettyTimeDiff(retrieved - props.created_utc)}]
` + innerHTML[editedModes.dfault] = `[removed within ${prettyTimeDiff(retrieved - props.created_utc)}]
` } // After around Aug 1 2021, Pushshift began updating comments from Reddit after around // 24-48 hours, including removing(?) comments that were removed from Reddit. The presence // of either retrieved_utc or retrieved_on can currently be used to test for this behaviour. else if (hasOwnProperty.call(props, 'retrieved_utc')) { - innerHTML[editedModes.orig] = `[removed within ${prettyTimeDiff(props.retrieved_utc - props.created_utc)}]
` + innerHTML[editedModes.dfault] = `[removed within ${prettyTimeDiff(props.retrieved_utc - props.created_utc)}]
` } else { - innerHTML[editedModes.orig] = `[either removed too quickly, or removed(?) from archive after ${prettyTimeDiff(props.retrieved_on - props.created_utc, true)}]
` + innerHTML[editedModes.dfault] = `[either removed too quickly, or removed(?) from archive after ${prettyTimeDiff(props.retrieved_on - props.created_utc, true)}]
` } } else { - innerHTML[editedModes.orig] = parse(props.body) if (hasOwnProperty.call(props, 'edited_body')) { + innerHTML[editedModes.orig] = parse(props.body) innerHTML[editedModes.edited] = parse(props.edited_body) - innerHTML[editedModes.rich] = Diff.execute(innerHTML[editedModes.orig], innerHTML[editedModes.edited]) - } + innerHTML[editedModes.dfault] = Diff.execute(innerHTML[editedModes.orig], innerHTML[editedModes.edited]) + } else + innerHTML[editedModes.dfault] = parse(props.body) } const [collapsed, setCollapsed] = useState(false) - const [editedMode, setEditedMode] = useState(innerHTML[editedModes.rich] ? editedModes.rich : editedModes.orig) + const [editedMode, setEditedMode] = useState(editedModes.dfault) const permalink = `/r/${props.subreddit}/comments/${props.link_id}/_/${props.id}/` const parentlink = props.parent_id == props.link_id ? undefined : ( props.depth == 0 ? diff --git a/src/utils.js b/src/utils.js index c2de8d2..79ee7ea 100644 --- a/src/utils.js +++ b/src/utils.js @@ -118,13 +118,13 @@ export const showRemovedAndDeleted = comment => comment.removed === true || comm // Edited text display modes export const editedModes = { - orig: 0, - edited: 1, - rich: 2, + dfault: 0, // diff mode if it's been edited, otherwise same as orig + orig: 1, + edited: 2, length: 3 } export const editedTitles = [ + 'Edits are highlighted; click to change', 'The first archived edit is shown; click to change', - 'The most recent edit is shown; click to change', - 'Edits are highlighted; click to change' + 'The most recent edit is shown; click to change' ]