OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Don't try and redact redactions for "Remove recent messages" 

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/21833/head
Michael Telatynski 2020-05-11 16:39:14 +01:00
parent 159547e6f8
commit c0061e2f2a
2 changed files with 2 additions and 2 deletions
Show Stats 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;