matrix/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2025-12-01 09:58:03 +03:00
Code Activity

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17529

Browse Source 
 Conflicts:
	package.json
	yarn.lock
This commit is contained in:
Michael Telatynski
2021-06-15 13:59:54 +01:00
parent 35948374e9 3eca1cbec3
commit a52dd57eb2
156 changed files with 3529 additions and 2124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/structures/LoggedInView.tsx
View File

@@ -355,7 +355,7 @@ class LoggedInView extends React.Component<IProps, IState> {
const pinnedEventIds = pinStateEvent.getContent().pinned.slice(0, MAX_PINNED_NOTICES_PER_ROOM);
for (const eventId of pinnedEventIds) {
const timeline = await this._matrixClient.getEventTimeline(room.getUnfilteredTimelineSet(), eventId, 0);
const timeline = await this._matrixClient.getEventTimeline(room.getUnfilteredTimelineSet(), eventId);
const event = timeline.getEvents().find(ev => ev.getId() === eventId);
if (event) events.push(event);
}