Prefer server-level display names when available

Signed-off-by: Bob Arctor <[email protected]>
matrix-org · Jun 18, 2023 · 866de2f · 866de2f
1 parent ece29f4
commit 866de2f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/changelog.d/888.misc b/changelog.d/888.misc
@@ -0,0 +1 @@
+Prefer server-level display names when available
diff --git a/src/bot.ts b/src/bot.ts
@@ -1027,7 +1027,7 @@ export class DiscordBot {
         }
 
         // Update presence because sometimes discord misses people.
-        await this.userSync.OnUpdateUser(msg.author, Boolean(msg.webhookID));
+        await this.userSync.OnUpdateUser(msg.author, Boolean(msg.webhookID), msg);
         let rooms: string[];
         try {
             rooms = await this.channelSync.GetRoomIdsFromChannel(msg.channel);

diff --git a/src/usersyncroniser.ts b/src/usersyncroniser.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { User, GuildMember } from "better-discord.js";
+import { User, GuildMember, Message } from "better-discord.js";
 import { DiscordBot } from "./bot";
 import { Util } from "./util";
 import { DiscordBridgeConfig } from "./config";
@@ -96,8 +96,11 @@ export class UserSyncroniser {
      * @returns {Promise<void>}
      * @constructor
      */
-    public async OnUpdateUser(discordUser: User, isWebhook: boolean = false) {
+    public async OnUpdateUser(discordUser: User, isWebhook: boolean = false, msg?: Message) {
         const userState = await this.GetUserUpdateState(discordUser, isWebhook);
+	if (msg?.member?.nickname) {
+	    userState.displayName = msg.member.nickname;
+	}
         try {
             await this.ApplyStateToProfile(userState);
         } catch (e) {