From b32e4a57bc99a1efbd7422514f2f4ca169122e61 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Tue, 28 Nov 2017 15:46:23 +0000 Subject: [PATCH] Factor out _getDisplayeDGroups --- .../views/messages/SenderProfile.js | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/src/components/views/messages/SenderProfile.js b/src/components/views/messages/SenderProfile.js index d2ef8fe3a3..1d21ffd0fd 100644 --- a/src/components/views/messages/SenderProfile.js +++ b/src/components/views/messages/SenderProfile.js @@ -83,6 +83,18 @@ export default React.createClass({ }); }, + _getDisplayedGroups(userGroups, relatedGroups) { + let displayedGroups = userGroups || []; + if (relatedGroups && relatedGroups.length > 0) { + displayedGroups = displayedGroups.filter((groupId) => { + return relatedGroups.includes(groupId); + }); + } else { + displayedGroups = []; + } + return displayedGroups; + }, + render() { const EmojiText = sdk.getComponent('elements.EmojiText'); const {mxEvent} = this.props; @@ -93,14 +105,9 @@ export default React.createClass({ return ; // emote message must include the name so don't duplicate it } - let displayedGroups = this.state.userGroups || []; - if (this.state.relatedGroups && this.state.relatedGroups.length > 0) { - displayedGroups = displayedGroups.filter((groupId) => { - return this.state.relatedGroups.includes(groupId); - }); - } else { - displayedGroups = []; - } + const displayedGroups = this._getDisplayedGroups( + this.state.userGroups, this.state.relatedGroups, + ); name = displayedGroups.length > 0 ? name.replace(' (IRC)', '') : name;