PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Only calculate displayed groups if flair enabled

Browse source
This commit is contained in:
Luke Barnard 2017-11-28 15:49:11 +00:00
parent b32e4a57bc
commit 204bbebfca
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/components/views/messages/SenderProfile.js
View file

@ -105,11 +105,20 @@ export default React.createClass({
return <span />; // emote message must include the name so don't duplicate it
}
const displayedGroups = this._getDisplayedGroups(
this.state.userGroups, this.state.relatedGroups,
);
let flair = <div />;
if (this.props.enableFlair) {
const displayedGroups = this._getDisplayedGroups(
this.state.userGroups, this.state.relatedGroups,
);
name = displayedGroups.length > 0 ? name.replace(' (IRC)', '') : name;
// Backwards-compatible replacing of "(IRC)" with AS user flair
name = displayedGroups.length > 0 ? name.replace(' (IRC)', '') : name;
flair = <Flair key='flair'
userId={mxEvent.getSender()}
groups={displayedGroups}
/>;
}
const nameElem = <EmojiText key='name'>{ name || '' }</EmojiText>;
@ -118,13 +127,7 @@ export default React.createClass({
<span className="mx_SenderProfile_name">
{ nameElem }
</span>
{ this.props.enableFlair ?
<Flair key='flair'
userId={mxEvent.getSender()}
groups={displayedGroups}
/>
: null
}
{ flair }
</span>;
const content = this.props.text ?