OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #5592 from matrix-org/jryans/opt-room-id 

Tweak a few room ID checks
pull/21833/head
J. Ryan Stinnett 2021-02-01 10:54:29 +00:00 committed by GitHub
parent 89b835dd20 c9a6214256
commit 50452d52ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/structures/FilePanel.js
View File

@ -45,7 +45,7 @@ class FilePanel extends React.Component {
}; };
onRoomTimeline = (ev, room, toStartOfTimeline, removed, data) => { onRoomTimeline = (ev, room, toStartOfTimeline, removed, data) => {
if (room.roomId !== this.props.roomId) return; if (room?.roomId !== this.props?.roomId) return;
if (toStartOfTimeline || !data || !data.liveEvent || ev.isRedacted()) return; if (toStartOfTimeline || !data || !data.liveEvent || ev.isRedacted()) return;
if (ev.isBeingDecrypted()) { if (ev.isBeingDecrypted()) {

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

@ -81,7 +81,7 @@ export default class WhoIsTypingTile extends React.Component {
}; };
onRoomTimeline = (event, room) => { onRoomTimeline = (event, room) => {
if (room && room.roomId === this.props.room.roomId) { if (room?.roomId === this.props.room?.roomId) {
const userId = event.getSender(); const userId = event.getSender();
// remove user from usersTyping // remove user from usersTyping
const usersTyping = this.state.usersTyping.filter((m) => m.userId !== userId); const usersTyping = this.state.usersTyping.filter((m) => m.userId !== userId);