Merge pull request #1026 from matrix-org/dbkr/fix_add_pending_events_…

…chronological Fix addPendingEvent with pending event order == chronological
matrix-org · Aug 28, 2019 · 42b359e · 42b359e
2 parents 2315980 + 3071587
commit 42b359e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/models/room.js b/src/models/room.js
@@ -1175,7 +1175,7 @@ Room.prototype.addPendingEvent = function(event, txnId) {
         for (let i = 0; i < this._timelineSets.length; i++) {
             const timelineSet = this._timelineSets[i];
             if (timelineSet.getFilter()) {
-                if (this._filter.filterRoomTimeline([event]).length) {
+                if (timelineSet.getFilter().filterRoomTimeline([event]).length) {
                     timelineSet.addEventToTimeline(event,
                         timelineSet.getLiveTimeline(), false);
                 }
@@ -1204,7 +1204,7 @@ Room.prototype._aggregateNonLiveRelation = function(event) {
     for (let i = 0; i < this._timelineSets.length; i++) {
         const timelineSet = this._timelineSets[i];
         if (timelineSet.getFilter()) {
-            if (this._filter.filterRoomTimeline([event]).length) {
+            if (timelineSet.getFilter().filterRoomTimeline([event]).length) {
                 timelineSet.aggregateRelations(event);
             }
         } else {