Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(Partials): Use more user objects available from the gateway #4791

Merged
merged 7 commits into from
Sep 13, 2020
Merged

fix(Partials): Use more user objects available from the gateway #4791

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
481e303
fix(Partials): don't swallow user data in GuildMemberRemove
wasdennnoch Sep 3, 2020
5c9fd05
fix(Partials): use user data in TYPING_START, if available
wasdennnoch Sep 3, 2020
736f8dc
fix(Partials): use user data in MessageReactionAdd if there
wasdennnoch Sep 3, 2020
3c40a71
fix(Action): use full member data in getMember
wasdennnoch Sep 5, 2020
1b49d62
Use full member objects, if available
wasdennnoch Sep 5, 2020
9f3cd21
Move duplicated code to Action#getUserFromMember
wasdennnoch Sep 5, 2020
f6ae44f
derp
wasdennnoch Sep 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/client/actions/Action.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,13 @@ class GenericAction {
}

getMember(data, guild) {
const id = data.user.id;
const user = data.user;
return this.getPayload(
{
user: {
id,
},
user,
},
guild.members,
id,
user.id,
PartialTypes.GUILD_MEMBER,
);
}
Expand Down
2 changes: 1 addition & 1 deletion src/client/actions/MessageReactionAdd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class MessageReactionAdd extends Action {
handle(data) {
if (!data.emoji) return false;

const user = this.getUser(data);
const user = data.member ? this.client.users.add(data.member.user) : this.getUser(data);
wasdennnoch marked this conversation as resolved.
Show resolved Hide resolved
if (!user) return false;

// Verify channel
Expand Down
2 changes: 1 addition & 1 deletion src/client/websocket/handlers/TYPING_START.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const textBasedChannelTypes = ['dm', 'text', 'news'];

module.exports = (client, { d: data }) => {
const channel = client.channels.cache.get(data.channel_id);
const user = client.users.cache.get(data.user_id);
const user = data.member ? client.users.add(data.member.user) : client.users.cache.get(data.user_id);
const timestamp = new Date(data.timestamp * 1000);

if (channel && user) {
Expand Down