Force Discord avatars to be PNGs in a friendly matter

Co-Authored-By: Travis Ralston <[email protected]>
matrix-org · Jun 7, 2022 · f2b9d1b · f2b9d1b
1 parent cbd3c67
commit f2b9d1b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/matrixeventprocessor.ts b/src/matrixeventprocessor.ts
@@ -500,13 +500,13 @@ export class MatrixEventProcessor {
             if (userOrMember instanceof Discord.User) {
                 embed.setAuthor(
                     userOrMember.username,
-                    userOrMember.avatarURL() || undefined,
+                    userOrMember.avatarURL({ format: 'png' }) || undefined,
                 );
                 return;
             } else if (userOrMember instanceof Discord.GuildMember) {
                 embed.setAuthor(
                     userOrMember.displayName,
-                    userOrMember.user.avatarURL() || undefined,
+                    userOrMember.user.avatarURL({ format: 'png' }) || undefined,
                 );
                 return;
             }

diff --git a/src/usersyncroniser.ts b/src/usersyncroniser.ts
@@ -257,7 +257,7 @@ export class UserSyncroniser {
             userState.createUser = true;
             userState.displayName = displayName;
             if (discordUser.avatar) {
-                userState.avatarUrl = discordUser.avatarURL();
+                userState.avatarUrl = discordUser.avatarURL({ format: 'png' });
                 userState.avatarId = discordUser.avatar;
             }
             return userState;
@@ -270,10 +270,12 @@ export class UserSyncroniser {
         }
 
         const oldAvatarUrl = remoteUser.avatarurl;
-        if (oldAvatarUrl !== discordUser.avatarURL()) {
+        const pngAvatarUrl = discordUser.avatarURL({ format: 'png' });
+        const webpAvatarUrl = discordUser.avatarURL();
+        if (oldAvatarUrl !== webpAvatarUrl && oldAvatarUrl !== pngAvatarUrl) {
             log.verbose(`User ${discordUser.id} avatarurl should be updated`);
             if (discordUser.avatar) {
-                userState.avatarUrl = discordUser.avatarURL();
+                userState.avatarUrl = pngAvatarUrl;
                 userState.avatarId = discordUser.avatar;
             } else {
                 userState.removeAvatar = true;