Skip to content

Commit 8b91ac5

Browse files
authored
fix(MessageReaction*Action): correctly cache incoming members and users (#4969)
1 parent 7faa73a commit 8b91ac5

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

src/client/actions/Action.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,9 @@ class GenericAction {
9393
if (data.guild_id && data.member && data.member.user) {
9494
const guild = this.client.guilds.cache.get(data.guild_id);
9595
if (guild) {
96-
const member = this.getMember(data.member, guild);
97-
return member ? member.user : this.getUser(data.member.user);
96+
return guild.members.add(data.member).user;
97+
} else {
98+
return this.client.users.add(data.member.user);
9899
}
99100
}
100101
return this.getUser(data);

src/client/actions/MessageReactionAdd.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ const { PartialTypes } = require('../../util/Constants');
88
{ user_id: 'id',
99
message_id: 'id',
1010
emoji: { name: '�', id: null },
11-
channel_id: 'id' } }
11+
channel_id: 'id',
12+
// If originating from a guild
13+
guild_id: 'id',
14+
member: { ..., user: { ... } } }
1215
*/
1316

1417
class MessageReactionAdd extends Action {

src/client/actions/MessageReactionRemove.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ const { Events } = require('../../util/Constants');
77
{ user_id: 'id',
88
message_id: 'id',
99
emoji: { name: '�', id: null },
10-
channel_id: 'id' } }
10+
channel_id: 'id',
11+
guild_id: 'id' }
1112
*/
1213

1314
class MessageReactionRemove extends Action {

0 commit comments

Comments
 (0)