PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Revert "Use ignoreSelfEvent in the RoomListStore (which doesn't work!)"

Browse source 
This reverts commit 0a4a1506d4.
This commit is contained in:
Šimon Brandner 2021-08-25 08:38:47 +02:00
parent 0a4a1506d4
commit b7df1127bd
No known key found for this signature in database
GPG key ID: 55C211A1226CB17D
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/stores/room-list/RoomListStore.ts
View file

@ -38,7 +38,6 @@ import { SpaceWatcher } from "./SpaceWatcher";
import SpaceStore from "../SpaceStore"; import SpaceStore from "../SpaceStore";
import { Action } from "../../dispatcher/actions"; import { Action } from "../../dispatcher/actions";
import { SettingUpdatedPayload } from "../../dispatcher/payloads/SettingUpdatedPayload"; import { SettingUpdatedPayload } from "../../dispatcher/payloads/SettingUpdatedPayload";
import { ignoreSelfEvent } from "./algorithms/tag-sorting/RecentAlgorithm";
interface IState { interface IState {
tagsEnabled?: boolean; tagsEnabled?: boolean;
@ -271,9 +270,6 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
// Ignore non-live events (backfill) // Ignore non-live events (backfill)
if (!eventPayload.isLiveEvent || !payload.isLiveUnfilteredRoomTimelineEvent) return; if (!eventPayload.isLiveEvent || !payload.isLiveUnfilteredRoomTimelineEvent) return;
// Avoid re-ordering on status, profile etc. changes
if (ignoreSelfEvent(eventPayload.event)) return;
const roomId = eventPayload.event.getRoomId(); const roomId = eventPayload.event.getRoomId();
const room = this.matrixClient.getRoom(roomId); const room = this.matrixClient.getRoom(roomId);
const tryUpdate = async (updatedRoom: Room) => { const tryUpdate = async (updatedRoom: Room) => {

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

@ -87,7 +87,10 @@ export const sortRooms = (rooms: Room[]): Room[] => {
const ev = r.timeline[i]; const ev = r.timeline[i];
if (!ev.getTs()) continue; // skip events that don't have timestamps (tests only?) if (!ev.getTs()) continue; // skip events that don't have timestamps (tests only?)
if (ev.getSender() === myUserId || Unread.eventTriggersUnreadCount(ev)) { if (
(ev.getSender() === myUserId && !ignoreSelfEvent(ev)) ||
Unread.eventTriggersUnreadCount(ev)
) {
return ev.getTs(); return ev.getTs();
} }
} }