Merge pull request #96 from matrix-org/hs/fix-gateway-profiles

Fix viewing matrix profiles over the gateway
matrix-org · Feb 3, 2020 · 2f7231f · 2f7231f
2 parents 17a6800 + d42cce7
commit 2f7231f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/changelog.d/96.bugfix b/changelog.d/96.bugfix
@@ -0,0 +1 @@
+Matrix profiles can now be viewed over the gateway
diff --git a/src/xmppjs/XJSInstance.ts b/src/xmppjs/XJSInstance.ts
@@ -253,13 +253,15 @@ export class XmppJsInstance extends EventEmitter implements IBifrostInstance {
         });
     }
 
-    public getAccountForJid(aJid: JID): XmppJsAccount|undefined {
-        log.debug(aJid);
+    public getAccountForJid(aJid: JID): {mxId: string}|undefined {
+        const gatewayMxid = this.gateway?.getMatrixIDForJID(`${aJid.local}@${aJid.domain}`, aJid);
+        if (gatewayMxid) {
+            return {mxId: gatewayMxid};
+        }
         if (aJid.domain === this.myAddress.domain) {
             log.debug(aJid.local, [...this.accounts.keys()]);
             return this.accounts.get(aJid.toString());
         }
-        // TODO: Handle MUC based JIDs?
         return;
     }