bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tombstone: work for descendants, too

Browse source
This commit is contained in:
Alex Gleason 2021-04-21 15:25:18 -05:00
parent 217fbea7a3
commit 8cdb0581d3
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/soapbox/features/status/index.js
View file

@ -411,7 +411,7 @@ class Status extends ImmutablePureComponent {
renderTombstone(id) {
return (
<div className='tombstone'>
<div className='tombstone' key={id}>
<p><FormattedMessage id='statuses.tombstone' defaultMessage='One or more posts is no longer available.' /></p>
</div>
);

19
app/soapbox/reducers/contexts.js
View file

@ -26,15 +26,22 @@ const normalizeContext = (immutableState, id, ancestors, descendants) => immutab
}
ancestors.forEach(addReply);
descendants.forEach(addReply);
descendants.forEach(status => {
if (status.in_reply_to_id) {
addReply(status);
} else {
addReply({ id: `tombstone-${status.id}`, in_reply_to_id: id });
addReply({ id: status.id, in_reply_to_id: `tombstone-${status.id}` });
}
});
if (ancestors.length > 0 && !inReplyTos.get(id)) {
const tombstoneId = `tombstone-${id}`;
const { id: lastId } = ancestors[ancestors.length - 1];
replies.update(tombstoneId, ImmutableOrderedSet(), siblings => siblings.add(id).sort());
replies.update(lastId, ImmutableOrderedSet(), siblings => siblings.add(tombstoneId).sort());
inReplyTos.set(id, tombstoneId);
inReplyTos.set(tombstoneId, lastId);
replies.update(`tombstone-${id}`, ImmutableOrderedSet(), siblings => siblings.add(id).sort());
replies.update(lastId, ImmutableOrderedSet(), siblings => siblings.add(`tombstone-${id}`).sort());
inReplyTos.set(id, `tombstone-${id}`);
inReplyTos.set(`tombstone-${id}`, lastId);
}
}));
}));