FilePanel: Listen for live events and add them to an open FilePanel.

pull/21833/head
Damir Jelić 2020-01-22 16:21:11 +01:00
parent 735ba4fd33
commit f917c2faea
1 changed files with 57 additions and 0 deletions

View File

@ -30,6 +30,7 @@ import { _t } from '../../languageHandler';
*/ */
const FilePanel = createReactClass({ const FilePanel = createReactClass({
displayName: 'FilePanel', displayName: 'FilePanel',
decryptingEvents: new Set(),
propTypes: { propTypes: {
roomId: PropTypes.string.isRequired, roomId: PropTypes.string.isRequired,
@ -41,8 +42,64 @@ const FilePanel = createReactClass({
}; };
}, },
onRoomTimeline (ev, room, toStartOfTimeline, removed, data) {
if (room.roomId !== this.props.roomId) return;
if (toStartOfTimeline || !data || !data.liveEvent || ev.isRedacted()) return;
if (ev.isBeingDecrypted()) {
this.decryptingEvents.add(ev.getId());
} else {
this.addEncryptedLiveEvent(ev);
}
},
onEventDecrypted (ev, err) {
if (ev.getRoomId() !== this.props.roomId) return;
const eventId = ev.getId();
if (!this.decryptingEvents.delete(eventId)) return;
if (err) return;
this.addEncryptedLiveEvent(ev);
},
addEncryptedLiveEvent(ev, toStartOfTimeline) {
if (!this.state.timelineSet) return;
const timeline = this.state.timelineSet.getLiveTimeline();
if (ev.getType() !== "m.room.message") return;
if (["m.file", "m.image", "m.video", "m.audio"].indexOf(ev.getContent().msgtype) == -1) {
return;
}
if (!this.state.timelineSet.eventIdToTimeline(ev.getId())) {
this.state.timelineSet.addEventToTimeline(ev, timeline, false);
}
},
async componentDidMount() { async componentDidMount() {
const client = MatrixClientPeg.get();
await this.updateTimelineSet(this.props.roomId); await this.updateTimelineSet(this.props.roomId);
if (!MatrixClientPeg.get().isRoomEncrypted(this.props.roomId)) return;
if (EventIndexPeg.get() !== null) {
client.on('Room.timeline', this.onRoomTimeline.bind(this));
client.on('Event.decrypted', this.onEventDecrypted.bind(this));
}
},
componentWillUnmount() {
const client = MatrixClientPeg.get();
if (client === null) return;
if (!MatrixClientPeg.get().isRoomEncrypted(this.props.roomId)) return;
if (EventIndexPeg.get() !== null) {
client.removeListener('Room.timeline', this.onRoomTimeline.bind(this));
client.removeListener('Event.decrypted', this.onEventDecrypted.bind(this));
}
}, },
async fetchFileEventsServer(room) { async fetchFileEventsServer(room) {