Add customisation point for mxid display (#7595)

* add wrapping component for hiding UI Signed-off-by: Kerry Archibald <kerrya@element.io> * add Setting Signed-off-by: Kerry Archibald <kerrya@element.io> * apply setting to profile settings, user menu, invite dialog, userinfo Signed-off-by: Kerry Archibald <kerrya@element.io> * hide mxids in user autocomplete * remove mxids from title in memeber list and timeline Signed-off-by: Kerry Archibald <kerrya@element.io> * hide mxid in ConfirmUserActionDialog Signed-off-by: Kerry Archibald <kerrya@element.io> * use name in power level event message when displayMxids is falsy Signed-off-by: Kerry Archibald <kerrya@element.io> * add customisation point for mxid display Signed-off-by: Kerry Archibald <kerrya@element.io> * use userid customisation Signed-off-by: Kerry Archibald <kerrya@element.io> * use customisation in sender profile Signed-off-by: Kerry Archibald <kerrya@element.io> * hide profile settings mxid if falsy Signed-off-by: Kerry Archibald <kerrya@element.io> * rename and move to components Signed-off-by: Kerry Archibald <kerrya@element.io> * remove change to UIFeature.ts Signed-off-by: Kerry Archibald <kerrya@element.io> * improvements from pr Signed-off-by: Kerry Archibald <kerrya@element.io> * lint fix Signed-off-by: Kerry Archibald <kerrya@element.io>
matrix-org · Jan 25, 2022 · 502b805 · 502b805
1 parent b481fc0
commit 502b805
Show file tree

Hide file tree

Showing 15 changed files with 154 additions and 23 deletions.
diff --git a/res/css/views/settings/_ProfileSettings.scss b/res/css/views/settings/_ProfileSettings.scss
@@ -44,8 +44,8 @@ limitations under the License.
     margin-top: 0;
 }
 
-.mx_ProfileSettings_hostingSignup {
-    margin-left: 20px;
+.mx_ProfileSettings_userId {
+    margin-right: $spacing-20;
 }
 
 .mx_ProfileSettings_avatarUpload {

diff --git a/src/TextForEvent.tsx b/src/TextForEvent.tsx
@@ -44,6 +44,7 @@ import { MatrixClientPeg } from "./MatrixClientPeg";
 import { ROOM_SECURITY_TAB } from "./components/views/dialogs/RoomSettingsDialog";
 import AccessibleButton from './components/views/elements/AccessibleButton';
 import RightPanelStore from './stores/right-panel/RightPanelStore';
+import UserIdentifierCustomisations from './customisations/UserIdentifier';
 
 export function getSenderName(event: MatrixEvent): string {
     return event.sender?.name ?? event.getSender() ?? _t("Someone");
@@ -499,6 +500,7 @@ function textForPowerEvent(event: MatrixEvent): () => string | null {
             if (users.indexOf(userId) === -1) users.push(userId);
         },
     );
+
     const diffs = [];
     users.forEach((userId) => {
         // Previous power level
@@ -513,18 +515,20 @@ function textForPowerEvent(event: MatrixEvent): () => string | null {
         }
         if (from === previousUserDefault && to === currentUserDefault) { return; }
         if (to !== from) {
-            diffs.push({ userId, from, to });
+            const name = UserIdentifierCustomisations.getDisplayUserIdentifier(userId, { roomId: event.getRoomId() });
+            diffs.push({ userId, name, from, to });
         }
     });
     if (!diffs.length) {
         return null;
     }
+
     // XXX: This is also surely broken for i18n
     return () => _t('%(senderName)s changed the power level of %(powerLevelDiffText)s.', {
         senderName,
         powerLevelDiffText: diffs.map(diff =>
             _t('%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s', {
-                userId: diff.userId,
+                userId: diff.name,
                 fromPowerLevel: Roles.textualPowerLevel(diff.from, previousUserDefault),
                 toPowerLevel: Roles.textualPowerLevel(diff.to, currentUserDefault),
             }),

diff --git a/src/autocomplete/UserProvider.tsx b/src/autocomplete/UserProvider.tsx
@@ -34,6 +34,7 @@ import { makeUserPermalink } from "../utils/permalinks/Permalinks";
 import { ICompletion, ISelectionRange } from "./Autocompleter";
 import MemberAvatar from '../components/views/avatars/MemberAvatar';
 import { TimelineRenderingType } from '../contexts/RoomContext';
+import UserIdentifierCustomisations from '../customisations/UserIdentifier';
 
 const USER_REGEX = /\B@\S*/g;
 
@@ -127,6 +128,9 @@ export default class UserProvider extends AutocompleteProvider {
             // Don't include the '@' in our search query - it's only used as a way to trigger completion
             const query = fullMatch.startsWith('@') ? fullMatch.substring(1) : fullMatch;
             completions = this.matcher.match(query, limit).map((user) => {
+                const description = UserIdentifierCustomisations.getDisplayUserIdentifier(
+                    user.userId, { roomId: this.room.roomId, withDisplayName: true },
+                );
                 const displayName = (user.name || user.userId || '');
                 return {
                     // Length of completion should equal length of text in decorator. draft-js
@@ -137,7 +141,7 @@ export default class UserProvider extends AutocompleteProvider {
                     suffix: (selection.beginning && range.start === 0) ? ': ' : ' ',
                     href: makeUserPermalink(user.userId),
                     component: (
-                        <PillCompletion title={displayName} description={user.userId}>
+                        <PillCompletion title={displayName} description={description}>
                             <MemberAvatar member={user} width={24} height={24} />
                         </PillCompletion>
                     ),

diff --git a/src/components/structures/UserMenu.tsx b/src/components/structures/UserMenu.tsx
@@ -59,6 +59,7 @@ import { UPDATE_SELECTED_SPACE } from "../../stores/spaces";
 import { replaceableComponent } from "../../utils/replaceableComponent";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import { SettingUpdatedPayload } from "../../dispatcher/payloads/SettingUpdatedPayload";
+import UserIdentifierCustomisations from "../../customisations/UserIdentifier";
 
 const CustomStatusSection = () => {
     const cli = useContext(MatrixClientContext);
@@ -499,7 +500,8 @@ export default class UserMenu extends React.Component<IProps, IState> {
                         { OwnProfileStore.instance.displayName }
                     </span>
                     <span className="mx_UserMenu_contextMenu_userId">
-                        { MatrixClientPeg.get().getUserId() }
+                        { UserIdentifierCustomisations.getDisplayUserIdentifier(
+                            MatrixClientPeg.get().getUserId(), { withDisplayName: true }) }
                     </span>
                 </div>
 

diff --git a/src/components/views/avatars/MemberAvatar.tsx b/src/components/views/avatars/MemberAvatar.tsx
@@ -26,6 +26,7 @@ import BaseAvatar from "./BaseAvatar";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { mediaFromMxc } from "../../../customisations/Media";
 import { CardContext } from '../right_panel/BaseCard';
+import UserIdentifierCustomisations from '../../../customisations/UserIdentifier';
 
 interface IProps extends Omit<React.ComponentProps<typeof BaseAvatar>, "name" | "idName" | "url"> {
     member: RoomMember;
@@ -70,6 +71,9 @@ export default class MemberAvatar extends React.Component<IProps, IState> {
     private static getState(props: IProps): IState {
         if (props.member?.name) {
             let imageUrl = null;
+            const userTitle = UserIdentifierCustomisations.getDisplayUserIdentifier(
+                props.member.userId, { roomId: props.member?.roomId },
+            );
             if (props.member.getMxcAvatarUrl()) {
                 imageUrl = mediaFromMxc(props.member.getMxcAvatarUrl()).getThumbnailOfSourceHttp(
                     props.width,
@@ -79,7 +83,7 @@ export default class MemberAvatar extends React.Component<IProps, IState> {
             }
             return {
                 name: props.member.name,
-                title: props.title || props.member.userId,
+                title: props.title || userTitle,
                 imageUrl: imageUrl,
             };
         } else if (props.fallbackUserId) {

diff --git a/src/components/views/dialogs/ConfirmSpaceUserActionDialog.tsx b/src/components/views/dialogs/ConfirmSpaceUserActionDialog.tsx
@@ -67,6 +67,7 @@ const ConfirmSpaceUserActionDialog: React.FC<IProps> = ({
                 onFinished(success, reason, roomsToLeave);
             }}
             className="mx_ConfirmSpaceUserActionDialog"
+            roomId={space.roomId}
         >
             { warning }
             <SpaceChildrenPicker

diff --git a/src/components/views/dialogs/ConfirmUserActionDialog.tsx b/src/components/views/dialogs/ConfirmUserActionDialog.tsx
@@ -28,6 +28,7 @@ import BaseAvatar from '../avatars/BaseAvatar';
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
 import Field from '../elements/Field';
+import UserIdentifierCustomisations from '../../../customisations/UserIdentifier';
 
 interface IProps {
     // matrix-js-sdk (room) member object. Supply either this or 'groupMember'
@@ -46,6 +47,7 @@ interface IProps {
     danger?: boolean;
     children?: ReactNode;
     className?: string;
+    roomId?: string;
     onFinished: (success: boolean, reason?: string) => void;
 }
 
@@ -126,6 +128,10 @@ export default class ConfirmUserActionDialog extends React.Component<IProps, ISt
             avatar = <BaseAvatar name={name} url={httpAvatarUrl} width={48} height={48} />;
         }
 
+        const displayUserIdentifier = UserIdentifierCustomisations.getDisplayUserIdentifier(
+            userId, { roomId: this.props.roomId, withDisplayName: true },
+        );
+
         return (
             <BaseDialog
                 className={classNames("mx_ConfirmUserActionDialog", this.props.className)}
@@ -139,7 +145,7 @@ export default class ConfirmUserActionDialog extends React.Component<IProps, ISt
                             { avatar }
                         </div>
                         <div className="mx_ConfirmUserActionDialog_name">{ name }</div>
-                        <div className="mx_ConfirmUserActionDialog_userId">{ userId }</div>
+                        <div className="mx_ConfirmUserActionDialog_userId">{ displayUserIdentifier }</div>
                     </div>
 
                     { reasonBox }

diff --git a/src/components/views/dialogs/InviteDialog.tsx b/src/components/views/dialogs/InviteDialog.tsx
@@ -72,6 +72,7 @@ import BaseDialog from "./BaseDialog";
 import DialPadBackspaceButton from "../elements/DialPadBackspaceButton";
 import SpaceStore from "../../../stores/spaces/SpaceStore";
 import CallHandler from "../../../CallHandler";
+import UserIdentifierCustomisations from '../../../customisations/UserIdentifier';
 
 // we have a number of types defined from the Matrix spec which can't reasonably be altered here.
 /* eslint-disable camelcase */
@@ -329,9 +330,13 @@ class DMRoomTile extends React.PureComponent<IDMRoomTileProps> {
             </span>
         );
 
+        const userIdentifier = UserIdentifierCustomisations.getDisplayUserIdentifier(
+            this.props.member.userId, { withDisplayName: true },
+        );
+
         const caption = (this.props.member as ThreepidMember).isEmail
             ? _t("Invite by email")
-            : this.highlightName(this.props.member.userId);
+            : this.highlightName(userIdentifier);
 
         return (
             <div className='mx_InviteDialog_roomTile' onClick={this.onClick}>

diff --git a/src/components/views/messages/SenderProfile.tsx b/src/components/views/messages/SenderProfile.tsx
@@ -23,6 +23,7 @@ import FlairStore from '../../../stores/FlairStore';
 import { getUserNameColorClass } from '../../../utils/FormattingUtils';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
+import UserIdentifier from '../../../customisations/UserIdentifier';
 
 interface IProps {
     mxEvent: MatrixEvent;
@@ -116,7 +117,9 @@ export default class SenderProfile extends React.Component<IProps, IState> {
         if (disambiguate) {
             mxidElement = (
                 <span className="mx_SenderProfile_mxid">
-                    { mxid }
+                    { UserIdentifier.getDisplayUserIdentifier(
+                        mxid, { withDisplayName: true, roomId: mxEvent.getRoomId() },
+                    ) }
                 </span>
             );
         }

diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx
@@ -77,6 +77,7 @@ import { TimelineRenderingType } from "../../../contexts/RoomContext";
 import RightPanelStore from '../../../stores/right-panel/RightPanelStore';
 import { IRightPanelCardState } from '../../../stores/right-panel/RightPanelStoreIPanelState';
 import { useUserStatusMessage } from "../../../hooks/useUserStatusMessage";
+import UserIdentifierCustomisations from '../../../customisations/UserIdentifier';
 
 export interface IDevice {
     deviceId: string;
@@ -1517,7 +1518,8 @@ export type Member = User | RoomMember | GroupMember;
 const UserInfoHeader: React.FC<{
     member: Member;
     e2eStatus: E2EStatus;
-}> = ({ member, e2eStatus }) => {
+    roomId: string;
+}> = ({ member, e2eStatus, roomId }) => {
     const cli = useContext(MatrixClientContext);
     const statusMessage = useUserStatusMessage(member);
 
@@ -1604,7 +1606,7 @@ const UserInfoHeader: React.FC<{
                         </span>
                     </h2>
                 </div>
-                <div>{ member.userId }</div>
+                <div>{ UserIdentifierCustomisations.getDisplayUserIdentifier(member.userId, { roomId, withDisplayName: true }) }</div>
                 <div className="mx_UserInfo_profileStatus">
                     { presenceLabel }
                     { statusLabel }
@@ -1708,7 +1710,7 @@ const UserInfo: React.FC<IProps> = ({
 
     const header = <React.Fragment>
         { scopeHeader }
-        <UserInfoHeader member={member} e2eStatus={e2eStatus} />
+        <UserInfoHeader member={member} e2eStatus={e2eStatus} roomId={room.roomId} />
     </React.Fragment>;
     return <BaseCard
         className={classes.join(" ")}

diff --git a/src/components/views/rooms/MemberTile.tsx b/src/components/views/rooms/MemberTile.tsx
@@ -29,6 +29,7 @@ import { Action } from "../../../dispatcher/actions";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 import EntityTile, { PowerStatus } from "./EntityTile";
 import MemberAvatar from "./../avatars/MemberAvatar";
+import UserIdentifierCustomisations from '../../../customisations/UserIdentifier';
 
 interface IProps {
     member: RoomMember;
@@ -209,9 +210,11 @@ export default class MemberTile extends React.Component<IProps, IState> {
 
     private getPowerLabel(): string {
         return _t("%(userName)s (power %(powerLevelNumber)s)", {
-            userName: this.props.member.userId,
+            userName: UserIdentifierCustomisations.getDisplayUserIdentifier(
+                this.props.member.userId, { roomId: this.props.member.roomId },
+            ),
             powerLevelNumber: this.props.member.powerLevel,
-        });
+        }).trim();
     }
 
     render() {

diff --git a/src/components/views/rooms/RoomPreviewBar.tsx b/src/components/views/rooms/RoomPreviewBar.tsx
@@ -34,9 +34,9 @@ import InviteReason from "../elements/InviteReason";
 import { IOOBData } from "../../../stores/ThreepidInviteStore";
 import Spinner from "../elements/Spinner";
 import AccessibleButton from "../elements/AccessibleButton";
-import { UIFeature } from "../../../settings/UIFeature";
-import SettingsStore from "../../../settings/SettingsStore";
 import RoomAvatar from "../avatars/RoomAvatar";
+import SettingsStore from "../../../settings/SettingsStore";
+import { UIFeature } from "../../../settings/UIFeature";
 
 const MemberEventHtmlReasonField = "io.element.html_reason";
 

diff --git a/src/components/views/settings/ProfileSettings.tsx b/src/components/views/settings/ProfileSettings.tsx
@@ -29,6 +29,7 @@ import { mediaFromMxc } from "../../../customisations/Media";
 import AccessibleButton from '../elements/AccessibleButton';
 import AvatarSetting from './AvatarSetting';
 import ExternalLink from '../elements/ExternalLink';
+import UserIdentifierCustomisations from '../../../customisations/UserIdentifier';
 
 interface IState {
     userId?: string;
@@ -162,7 +163,7 @@ export default class ProfileSettings extends React.Component<{}, IState> {
         const hostingSignupLink = getHostingLink('user-settings');
         let hostingSignup = null;
         if (hostingSignupLink) {
-            hostingSignup = <span className="mx_ProfileSettings_hostingSignup">
+            hostingSignup = <span>
                 { _t(
                     "<a>Upgrade</a> to your own domain", {},
                     {
@@ -174,6 +175,10 @@ export default class ProfileSettings extends React.Component<{}, IState> {
             </span>;
         }
 
+        const userIdentifier = UserIdentifierCustomisations.getDisplayUserIdentifier(
+            this.state.userId, { withDisplayName: true },
+        );
+
         return (
             <form
                 onSubmit={this.saveProfile}
@@ -199,7 +204,9 @@ export default class ProfileSettings extends React.Component<{}, IState> {
                             onChange={this.onDisplayNameChanged}
                         />
                         <p>
-                            { this.state.userId }
+                            { userIdentifier && <span className="mx_ProfileSettings_userId">
+                                { userIdentifier }
+                            </span> }
                             { hostingSignup }
                         </p>
                     </div>

diff --git a/src/customisations/UserIdentifier.ts b/src/customisations/UserIdentifier.ts
@@ -0,0 +1,41 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/**
+ * Customise display of the user identifier
+ * hide userId for guests, display 3pid
+ *
+ * Set withDisplayName to true when user identifier will be displayed alongside user name
+ */
+function getDisplayUserIdentifier(
+    userId: string,
+    { roomId, withDisplayName }: { roomId?: string, withDisplayName?: boolean },
+): string | null {
+    return userId;
+}
+
+// This interface summarises all available customisation points and also marks
+// them all as optional. This allows customisers to only define and export the
+// customisations they need while still maintaining type safety.
+export interface IUserIdentifierCustomisations {
+    getDisplayUserIdentifier?: typeof getDisplayUserIdentifier;
+}
+
+// A real customisation module will define and export one or more of the
+// customisation points that make up `IUserIdentifierCustomisations`.
+export default {
+    getDisplayUserIdentifier,
+} as IUserIdentifierCustomisations;