From aff2cc9065cad00b14a266bd59d927c7a1342f78 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 23 Jun 2018 01:21:42 +0100 Subject: [PATCH 1/3] EventTile:notif apply EmojiText to room name Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/rooms/EventTile.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js index aa2f28024e..537545c904 100644 --- a/src/components/views/rooms/EventTile.js +++ b/src/components/views/rooms/EventTile.js @@ -621,13 +621,14 @@ module.exports = withMatrixClient(React.createClass({ switch (this.props.tileShape) { case 'notif': { + const EmojiText = sdk.getComponent('elements.EmojiText'); const room = this.props.matrixClient.getRoom(this.props.mxEvent.getRoomId()); return (
- + { room ? room.name : '' } - +
{ avatar } From 807d72f2d9150ac7f0aa40d0f252a1e9f2352121 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 23 Jun 2018 01:22:38 +0100 Subject: [PATCH 2/3] nullguard SenderProfile,broke when NotifPanel had evs from forgotten rooms Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/messages/SenderProfile.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/components/views/messages/SenderProfile.js b/src/components/views/messages/SenderProfile.js index 5ca2fc6ed8..a91bed8a73 100644 --- a/src/components/views/messages/SenderProfile.js +++ b/src/components/views/messages/SenderProfile.js @@ -72,14 +72,12 @@ export default React.createClass({ _updateRelatedGroups() { if (this.unmounted) return; - const relatedGroupsEvent = this.context.matrixClient - .getRoom(this.props.mxEvent.getRoomId()) - .currentState - .getStateEvents('m.room.related_groups', ''); + const room = this.context.matrixClient.getRoom(this.props.mxEvent.getRoomId()) + if (!room) return; + + const relatedGroupsEvent = room.currentState.getStateEvents('m.room.related_groups', ''); this.setState({ - relatedGroups: relatedGroupsEvent ? - relatedGroupsEvent.getContent().groups || [] - : [], + relatedGroups: relatedGroupsEvent ? relatedGroupsEvent.getContent().groups || [] : [], }); }, From f7a0ad3aa086478d81fc6395cffe3c3b3940aefb Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 23 Jun 2018 01:29:38 +0100 Subject: [PATCH 3/3] delint Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/messages/SenderProfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/messages/SenderProfile.js b/src/components/views/messages/SenderProfile.js index a91bed8a73..70c9c711fc 100644 --- a/src/components/views/messages/SenderProfile.js +++ b/src/components/views/messages/SenderProfile.js @@ -72,7 +72,7 @@ export default React.createClass({ _updateRelatedGroups() { if (this.unmounted) return; - const room = this.context.matrixClient.getRoom(this.props.mxEvent.getRoomId()) + const room = this.context.matrixClient.getRoom(this.props.mxEvent.getRoomId()); if (!room) return; const relatedGroupsEvent = room.currentState.getStateEvents('m.room.related_groups', '');