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(Presence): account for multiple activities everywhere #3703

Merged
merged 2 commits into from
Jan 19, 2020
Merged

fix(Presence): account for multiple activities everywhere #3703

merged 2 commits into from
Jan 19, 2020

Conversation

SpaceEEC
Copy link
Member

Please describe the changes this PR makes and why it should be merged:

This PR fixes #3695 by accounting for the activities array from Presence in multiple places:

  • Default packet.game to the first activity or null if none was set.
  • Update example still using activity
  • Use single activity / game if activities array is missing (for example when patching the ClientPresence)
  • _clone the activities array
  • Account for an activities array in equals

Status

  • Code changes have been tested against the Discord API, or there are no code changes
  • I know how to update typings and have done so, or typings don't need updating

Semantic versioning classification:

  • This PR changes the library's interface (methods or parameters added)
    • This PR includes breaking changes (methods removed or renamed, parameters moved or removed)
  • This PR only includes non-code changes, like changes to documentation, README, etc.

amishshah
amishshah requested changes Jan 16, 2020
View reviewed changes
src/structures/Presence.js Outdated
data.activities.map(activity => new Activity(this, activity)) :
data.game || data.activity ?
[new Activity(this, data.game || data.activity)] :
[];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In my opinion this is not very readable

@SpaceEEC SpaceEEC merged commit f501d06 into discordjs:master Jan 19, 2020
@SpaceEEC SpaceEEC deleted the fix/multiple_activities branch January 19, 2020 12:05
@SpaceEEC SpaceEEC mentioned this pull request Jan 25, 2020
Merged
5 tasks
samsamson33 pushed a commit to samsamson33/discord.js that referenced this pull request Feb 27, 2020
@SpaceEEC @samsamson33
fix(Presence): account for multiple activities everywhere (discordjs#…
0d0725a 
…3703)

* fix(Presence): account for multiple activities everywhere

* refactor(Presence): make initialization of 'activities' more readable
samsamson33 added a commit to samsamson33/discord.js that referenced this pull request Feb 27, 2020
@samsamson33
Revert "fix(Presence): account for multiple activities everywhere (di…
22e922a 
…scordjs#3703)"

This reverts commit 0d0725a.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amishshah amishshah amishshah approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Presence changing broken after "support for multiple activities" commit
2 participants
@SpaceEEC @amishshah