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

show a pill as a moderated alias (canonical or alt) if available 

otherwise, display as the label in the link
pull/21833/head
Bruno Windels 2020-02-21 13:00:54 +01:00
parent 4219d2fcf6
commit 3c3839f863
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/views/elements/Pill.js
View File

@ -237,7 +237,15 @@ const Pill = createReactClass({
case Pill.TYPE_ROOM_MENTION: { case Pill.TYPE_ROOM_MENTION: {
const room = this.state.room; const room = this.state.room;
if (room) { if (room) {
linkText = (room ? getDisplayAliasForRoom(room) : null) || resource; const isModeratedAlias = room.getCanonicalAlias() === resource ||
room.getAltAliases().includes(resource);
if (!isModeratedAlias) {
linkText = getDisplayAliasForRoom(room);
}
// if there are no moderated aliases, stick to resource
if (!linkText) {
linkText = resource;
}
if (this.props.shouldShowPillAvatar) { if (this.props.shouldShowPillAvatar) {
avatar = <RoomAvatar room={room} width={16} height={16} aria-hidden="true" />; avatar = <RoomAvatar room={room} width={16} height={16} aria-hidden="true" />;
} }