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

Fix TS check

Browse source
This commit is contained in:
Will Hunt 2021-02-23 13:00:05 +00:00
parent aa86c1d751
commit 84bcdf66f2
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/components/structures/LoggedInView.tsx
View file

@ -336,10 +336,12 @@ class LoggedInView extends React.Component<IProps, IState> {
if (!serverNoticeList) return []; if (!serverNoticeList) return [];
const events = []; const events = [];
let pinnedEventTs = 0;
for (const room of serverNoticeList) { for (const room of serverNoticeList) {
const pinStateEvent = room.currentState.getStateEvents("m.room.pinned_events", ""); const pinStateEvent = room.currentState.getStateEvents("m.room.pinned_events", "");
if (!pinStateEvent || !pinStateEvent.getContent().pinned) continue; if (!pinStateEvent || !pinStateEvent.getContent().pinned) continue;
pinnedEventTs = pinStateEvent.getTs();
const pinnedEventIds = pinStateEvent.getContent().pinned.slice(0, MAX_PINNED_NOTICES_PER_ROOM); const pinnedEventIds = pinStateEvent.getContent().pinned.slice(0, MAX_PINNED_NOTICES_PER_ROOM);
for (const eventId of pinnedEventIds) { for (const eventId of pinnedEventIds) {
@ -349,21 +351,22 @@ class LoggedInView extends React.Component<IProps, IState> {
} }
} }
if (pinnedEventTs && this.state.usageLimitEventTs > pinnedEventTs) {
// We've processed a newer event than this one, so ignore it.
return;
}
const usageLimitEvent = events.find((e) => { const usageLimitEvent = events.find((e) => {
return ( return (
e && e.getType() === 'm.room.message' && e && e.getType() === 'm.room.message' &&
e.getContent()['server_notice_type'] === 'm.server_notice.usage_limit_reached' e.getContent()['server_notice_type'] === 'm.server_notice.usage_limit_reached'
); );
}); });
if (this.state.usageLimitEventTs > usageLimitEvent.getTs()) {
// We've processed a newer event than this one, so ignore it.
return;
}
const usageLimitEventContent = usageLimitEvent && usageLimitEvent.getContent(); const usageLimitEventContent = usageLimitEvent && usageLimitEvent.getContent();
this._calculateServerLimitToast(this.state.syncErrorData, usageLimitEventContent); this._calculateServerLimitToast(this.state.syncErrorData, usageLimitEventContent);
this.setState({ this.setState({
usageLimitEventContent, usageLimitEventContent,
usageLimitEventTs: usageLimitEvent.getTs(), usageLimitEventTs: pinnedEventTs,
// This is a fresh toast, we can show toasts again // This is a fresh toast, we can show toasts again
usageLimitDismissed: false, usageLimitDismissed: false,
}); });