Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit b7df112

Browse files
committed
Revert "Use ignoreSelfEvent in the RoomListStore (which doesn't work!)"
This reverts commit 0a4a150.
1 parent 0a4a150 commit b7df112

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/stores/room-list/RoomListStore.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import { SpaceWatcher } from "./SpaceWatcher";
3838
import SpaceStore from "../SpaceStore";
3939
import { Action } from "../../dispatcher/actions";
4040
import { SettingUpdatedPayload } from "../../dispatcher/payloads/SettingUpdatedPayload";
41-
import { ignoreSelfEvent } from "./algorithms/tag-sorting/RecentAlgorithm";
4241

4342
interface IState {
4443
tagsEnabled?: boolean;
@@ -271,9 +270,6 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
271270
// Ignore non-live events (backfill)
272271
if (!eventPayload.isLiveEvent || !payload.isLiveUnfilteredRoomTimelineEvent) return;
273272

274-
// Avoid re-ordering on status, profile etc. changes
275-
if (ignoreSelfEvent(eventPayload.event)) return;
276-
277273
const roomId = eventPayload.event.getRoomId();
278274
const room = this.matrixClient.getRoom(roomId);
279275
const tryUpdate = async (updatedRoom: Room) => {

src/stores/room-list/algorithms/tag-sorting/RecentAlgorithm.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,10 @@ export const sortRooms = (rooms: Room[]): Room[] => {
8787
const ev = r.timeline[i];
8888
if (!ev.getTs()) continue; // skip events that don't have timestamps (tests only?)
8989

90-
if (ev.getSender() === myUserId || Unread.eventTriggersUnreadCount(ev)) {
90+
if (
91+
(ev.getSender() === myUserId && !ignoreSelfEvent(ev)) ||
92+
Unread.eventTriggersUnreadCount(ev)
93+
) {
9194
return ev.getTs();
9295
}
9396
}

0 commit comments

Comments
 (0)