mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2025-10-26 22:01:25 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1586 from turt2live/travis/message-pinning-fix1

Browse Source 
Default to no read pins if there is no applicable account data
This commit is contained in:
Matthew Hodgson 2017-11-07 18:24:21 +00:00 committed by GitHub
commit 3b1726657f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/rooms/PinnedEventsPanel.js
View File

@ -75,7 +75,7 @@ module.exports = React.createClass({
const pinnedEvents = this.props.room.currentState.getStateEvents("m.room.pinned_events", ""); const pinnedEvents = this.props.room.currentState.getStateEvents("m.room.pinned_events", "");
if (!pinnedEvents) return; // nothing to read if (!pinnedEvents) return; // nothing to read
let readStateEvents = null; let readStateEvents = [];
const readPinsEvent = this.props.room.getAccountData("im.vector.room.read_pins"); const readPinsEvent = this.props.room.getAccountData("im.vector.room.read_pins");
if (readPinsEvent && readPinsEvent.getContent()) { if (readPinsEvent && readPinsEvent.getContent()) {
readStateEvents = readPinsEvent.getContent().event_ids || []; readStateEvents = readPinsEvent.getContent().event_ids || [];