reactiflux/discord-irc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix avatars not displaying via webhooks (#511)

Browse Source 
* Fix avatars not displaying via webhooks

Avatars that were 2048x2048 would break webhooks displaying avatars, defaulting to 128x128 fixes that.

* travis-ci fix

* Fix null-checks

* Fix travis-ci tests for avatar size
This commit is contained in:
Miosame 2019-12-24 15:12:28 +01:00 committed by Edward Jones
parent 03d6ac2170
commit 88fecf3aa1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/bot.js
View File

@ -438,7 +438,7 @@ class Bot {
// No matching user or more than one => default avatar
if (users && users.size === 1) {
return users.first().user.avatarURL;
return users.first().user.avatarURL.replace(/\?size=\d{1,}$/, '?size=128');
}
// If there isn't a URL format, don't send an avatar at all

6
test/bot.test.js
View File

@ -1079,7 +1079,7 @@ describe('Bot', function () {
const userObj = { id: 123, username: 'Nick', avatar: 'avatarURL' };
const memberObj = { nickname: 'Different' };
this.addUser(userObj, memberObj);
this.bot.getDiscordAvatar('Nick', '#irc').should.equal('/avatars/123/avatarURL.png?size=2048');
this.bot.getDiscordAvatar('Nick', '#irc').should.equal('/avatars/123/avatarURL.png?size=128');
});
it('should find a matching username, case insensitive, when looking for an avatar', function () {
@ -1089,7 +1089,7 @@ describe('Bot', function () {
const userObj = { id: 124, username: 'nick', avatar: 'avatarURL' };
const memberObj = { nickname: 'Different' };
this.addUser(userObj, memberObj);
this.bot.getDiscordAvatar('Nick', '#irc').should.equal('/avatars/124/avatarURL.png?size=2048');
this.bot.getDiscordAvatar('Nick', '#irc').should.equal('/avatars/124/avatarURL.png?size=128');
});
it('should find a matching nickname, case sensitive, when looking for an avatar', function () {
@ -1099,7 +1099,7 @@ describe('Bot', function () {
const userObj = { id: 125, username: 'Nick', avatar: 'avatarURL' };
const memberObj = { nickname: 'Different' };
this.addUser(userObj, memberObj);
this.bot.getDiscordAvatar('Different', '#irc').should.equal('/avatars/125/avatarURL.png?size=2048');
this.bot.getDiscordAvatar('Different', '#irc').should.equal('/avatars/125/avatarURL.png?size=128');
});
it('should not return an avatar with two matching usernames when looking for an avatar', function () {