fix: added link to invite message

linagora · Jul 11, 2024 · ed0f03d · ed0f03d
1 parent 794b996
commit ed0f03d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/packages/matrix-identity-server/src/invitation/index.ts b/packages/matrix-identity-server/src/invitation/index.ts
@@ -57,25 +57,32 @@ const preConfigureTemplate = (
 
 // TODO : don't forget to modify this : cf matrix.to or other method
 const inviteLink = (
-  method: 'matrix.org' | 'twake.org',
-  address: string,
-  name: string
+  server: string,
+  senderId: string,
+  roomAlias?: string
 ): string => {
-  return `https://${method}/${address}/${name}`
+  if (roomAlias != null) {
+    return `https://${server}/#/${roomAlias}`
+  } else {
+    return `https://${server}/#/${senderId}`
+  }
 }
 
 const mailBody = (
   template: string,
   // eslint-disable-next-line @typescript-eslint/naming-convention
   inviter_name: string,
   // eslint-disable-next-line @typescript-eslint/naming-convention
+  sender_user_id: string,
   dst: string,
   // eslint-disable-next-line @typescript-eslint/naming-convention
   room_name: string,
   // eslint-disable-next-line @typescript-eslint/naming-convention
   room_avatar: string,
   // eslint-disable-next-line @typescript-eslint/naming-convention
-  room_type: string
+  room_type: string,
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  room_alias?: string
 ): string => {
   return (
     template
@@ -90,7 +97,7 @@ const mailBody = (
       .replace(/__room_name__/g, room_name)
       .replace(/__room_avatar__/g, room_avatar)
       .replace(/__room_type__/g, room_type)
-      .replace(/__link__/g, inviteLink('matrix.org', dst, room_name))
+      .replace(/__link__/g, inviteLink('matrix.to', sender_user_id, room_alias))
   )
 }
 
@@ -216,10 +223,12 @@ const StoreInvit = <T extends string = never>(
                       verificationTemplate,
                       (obj as storeInvitationArgs).sender_display_name ??
                         '*****',
+                      (obj as storeInvitationArgs).sender,
                       _address,
                       (obj as storeInvitationArgs).room_name ?? '*****',
                       (obj as storeInvitationArgs).room_avatar_url ?? '*****',
-                      (obj as storeInvitationArgs).room_type ?? '*****'
+                      (obj as storeInvitationArgs).room_type ?? '*****',
+                      (obj as storeInvitationArgs).room_alias
                     )
                   })
                   break

diff --git a/packages/matrix-identity-server/templates/3pidInvitation.tpl b/packages/matrix-identity-server/templates/3pidInvitation.tpl
@@ -12,7 +12,7 @@ Content-Type: text/plain; charset=UTF-8
 Content-Disposition: inline
 Hello,
 
-You have been invited to join a Matrix room by __inviter_name__. 
+You have been invited to join the __room_name__ Matrix room by __inviter_name__. 
 Please click on the following link to accept the invitation: __link__
 
 About Matrix:
@@ -40,7 +40,7 @@ body {
 <body>
 <p>Hello,</p>
 
-<p>You have been invited to join a Matrix room by __inviter_name__. Please click on the following link to accept the invitation: <a href="__link__">__link__</a></p>
+<p>You have been invited to join the __room_name__ Matrix room by __inviter_name__. Please click on the following link to accept the invitation: <a href="__link__">__link__</a></p>
 
 <p>About Matrix:</p>