Show zephyr signatures :)

sipb · Aug 20, 2024 · 9b280a8 · 9b280a8
1 parent 523bc00
commit 9b280a8
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 5 deletions.
diff --git a/src/components/views/messages/DisambiguatedProfile.tsx b/src/components/views/messages/DisambiguatedProfile.tsx
@@ -30,11 +30,15 @@ interface IProps {
     colored?: boolean;
     emphasizeDisplayName?: boolean;
     withTooltip?: boolean;
+
+    // These name overrides are used for Zephyr (if set, will use that name instead)
+    overrideName?: string | undefined;
+    overrideDisambiguation?: string | undefined;
 }
 
 export default class DisambiguatedProfile extends React.Component<IProps> {
     public render(): React.ReactNode {
-        const { fallbackName, member, colored, emphasizeDisplayName, withTooltip, onClick } = this.props;
+        const { fallbackName, member, colored, emphasizeDisplayName, withTooltip, onClick, overrideName, overrideDisambiguation } = this.props;
         const rawDisplayName = member?.rawDisplayName || fallbackName;
         const mxid = member?.userId;
 
@@ -52,8 +56,8 @@ export default class DisambiguatedProfile extends React.Component<IProps> {
                     withDisplayName: true,
                     roomId: member.roomId,
                 }) ?? mxid;
-            if (member?.disambiguate) {
-                mxidElement = <span className="mx_DisambiguatedProfile_mxid">{identifier}</span>;
+            if (overrideDisambiguation || member?.disambiguate) {
+                mxidElement = <span className="mx_DisambiguatedProfile_mxid">{overrideDisambiguation ?? identifier}</span>;
             }
             title = _t("timeline|disambiguated_profile", {
                 displayName: rawDisplayName,
@@ -68,7 +72,7 @@ export default class DisambiguatedProfile extends React.Component<IProps> {
         return (
             <div className="mx_DisambiguatedProfile" title={withTooltip ? title : undefined} onClick={onClick}>
                 <span className={displayNameClasses} dir="auto">
-                    {rawDisplayName}
+                    {overrideName ?? rawDisplayName}
                 </span>
                 {mxidElement}
             </div>

diff --git a/src/components/views/messages/SenderProfile.tsx b/src/components/views/messages/SenderProfile.tsx
@@ -27,12 +27,37 @@ interface IProps {
     withTooltip?: boolean;
 }
 
-export default function SenderProfile({ mxEvent, onClick, withTooltip }: IProps): JSX.Element {
+export default function SenderProfile({ mxEvent, onClick, withTooltip }: IProps): JSX.Element {    
     const member = useRoomMemberProfile({
         userId: mxEvent.getSender(),
         member: mxEvent.sender,
     });
 
+    // Zephyr specific stuff!
+
+    let overrideName: string | undefined;
+    let overrideDisambiguation: string | undefined;
+
+    const signature = mxEvent.getContent()['im.zephyr.signature'];
+    // const isAuthentic = mxEvent.getContent()['im.zephyr.authentic'];
+    if (signature) {
+        // This is a Zephyr message
+        // Not extracting it to a variable to avoid merge conflicts in the future
+        const senderId = mxEvent.getSender();
+        if (senderId) {
+            // Example: "@_zephyr_rgabriel:matrix.mit.edu"
+            const kerb = senderId.split(":")[0].substring(9);
+
+            // This doesn't look that good, commenting out for now...
+            // if (isAuthentic === true) {
+                // overrideName = kerb + " ✅";
+            // } else {
+            overrideName = kerb;
+            // }            
+            overrideDisambiguation = signature;
+        }
+    }
+
     return mxEvent.getContent().msgtype !== MsgType.Emote ? (
         <DisambiguatedProfile
             fallbackName={mxEvent.getSender() ?? ""}
@@ -41,6 +66,8 @@ export default function SenderProfile({ mxEvent, onClick, withTooltip }: IProps)
             colored={true}
             emphasizeDisplayName={true}
             withTooltip={withTooltip}
+            overrideName={overrideName}
+            overrideDisambiguation={overrideDisambiguation}
         />
     ) : (
         <></>