dont rely on timeline linkage to find events to redact

matrix-org · Oct 2, 2019 · 37f3acb · 37f3acb
1 parent c8c4dc2
commit 37f3acb
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
@@ -364,17 +364,16 @@ module.exports = createReactClass({
         if (!room) {
             return;
         }
-        let timeline = room.getLiveTimeline();
+        const timelineSet = room.getUnfilteredTimelineSet();
         let eventsToRedact = [];
-        while (timeline) {
+        for (const timeline of timelineSet.getTimelines()) {
             eventsToRedact = timeline.getEvents().reduce((events, event) => {
                 if (event.getSender() === userId && !event.isRedacted()) {
                     return events.concat(event);
                 } else {
                     return events;
                 }
             }, eventsToRedact);
-            timeline = timeline.getNeighbouringTimeline(EventTimeline.BACKWARDS);
         }
 
         const count = eventsToRedact.length;