sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Adapt Membership usage for the change to an enum KnownMembership

Browse Source
This commit is contained in:
Andy Balaam
2024-03-18 14:43:08 +00:00
parent da99bad7b9
commit 34559d2a89
115 changed files with 764 additions and 593 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/structures/TimelinePanel.tsx
+7 -5
View File
@@ -38,6 +38,8 @@ import {
Thread,
ThreadEvent,
ReceiptType,
KnownMembership,
Membership,
} from "matrix-js-sdk/src/matrix";
import { debounce, findLastIndex, throttle } from "lodash";
import { logger } from "matrix-js-sdk/src/logger";
@@ -1824,7 +1826,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
// that the event belongs to, and traversing the timeline looking for
// that event, while keeping track of the user's membership
let i = events.length - 1;
let userMembership = Membership.Leave;
let userMembership: Membership = KnownMembership.Leave;
for (; i >= 0; i--) {
const timeline = this.props.timelineSet.getTimelineForEvent(events[i].getId()!);
if (!timeline) {
@@ -1838,14 +1840,14 @@ class TimelinePanel extends React.Component<IProps, IState> {
}
userMembership =
timeline.getState(EventTimeline.FORWARDS)?.getMember(userId)?.membership ?? Membership.Leave;
timeline.getState(EventTimeline.FORWARDS)?.getMember(userId)?.membership ?? KnownMembership.Leave;
const timelineEvents = timeline.getEvents();
for (let j = timelineEvents.length - 1; j >= 0; j--) {
const event = timelineEvents[j];
if (event.getId() === events[i].getId()) {
break;
} else if (event.getStateKey() === userId && event.getType() === EventType.RoomMember) {
userMembership = event.getPrevContent().membership || Membership.Leave;
userMembership = event.getPrevContent().membership || KnownMembership.Leave;
}
}
break;
@@ -1856,9 +1858,9 @@ class TimelinePanel extends React.Component<IProps, IState> {
for (; i >= 0; i--) {
const event = events[i];
if (event.getStateKey() === userId && event.getType() === EventType.RoomMember) {
userMembership = event.getPrevContent().membership || Membership.Leave;
userMembership = event.getPrevContent().membership || KnownMembership.Leave;
} else if (
userMembership === Membership.Leave &&
userMembership === KnownMembership.Leave &&
(event.isDecryptionFailure() || event.isBeingDecrypted())
) {
// reached an undecryptable message when the user wasn't in the room -- don't try to load any more