matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00
Code Activity

Merge pull request #4573 from matrix-org/t3chguy/remove_recent_self

Browse Source 
Don't try and redact redactions for "Remove recent messages"
This commit is contained in:
Michael Telatynski
2020-05-12 09:43:23 +01:00
committed by GitHub
parent aacc582b52 c0061e2f2a
commit b95d533c4a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/right_panel/UserInfo.js
View File

@@ -557,7 +557,7 @@ const RedactMessagesButton = ({member}) => {
let eventsToRedact = []; let eventsToRedact = [];
while (timeline) { while (timeline) {
eventsToRedact = timeline.getEvents().reduce((events, event) => { eventsToRedact = timeline.getEvents().reduce((events, event) => {
if (event.getSender() === userId && !event.isRedacted()) { if (event.getSender() === userId && !event.isRedacted() && !event.isRedaction()) {
return events.concat(event); return events.concat(event);
} else { } else {
return events; return events;

2
src/components/views/rooms/MemberInfo.js
View File

@@ -364,7 +364,7 @@ export default createReactClass({
let eventsToRedact = []; let eventsToRedact = [];
for (const timeline of timelineSet.getTimelines()) { for (const timeline of timelineSet.getTimelines()) {
eventsToRedact = timeline.getEvents().reduce((events, event) => { eventsToRedact = timeline.getEvents().reduce((events, event) => {
if (event.getSender() === userId && !event.isRedacted()) { if (event.getSender() === userId && !event.isRedacted() && !event.isRedaction()) {
return events.concat(event); return events.concat(event);
} else { } else {
return events; return events;