Added handling for relationship presence updates #494
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,6 +15,9 @@ | |
| */ | ||
| package net.dv8tion.jda.core.handle; | ||
|
|
||
| import net.dv8tion.jda.client.JDAClient; | ||
| import net.dv8tion.jda.client.entities.impl.FriendImpl; | ||
| import net.dv8tion.jda.core.AccountType; | ||
| import net.dv8tion.jda.core.OnlineStatus; | ||
| import net.dv8tion.jda.core.entities.Game; | ||
| import net.dv8tion.jda.core.entities.impl.*; | ||
|
|
@@ -37,12 +40,21 @@ public PresenceUpdateHandler(JDAImpl api) | |
| @Override | ||
| protected Long handleInternally(JSONObject content) | ||
| { | ||
| GuildImpl guild = null; | ||
| //Do a pre-check to see if this is for a Guild, and if it is, if the guild is currently locked or not cached. | ||
| if (!content.isNull("guild_id")) | ||
| { | ||
| final long guildId = content.getLong("guild_id"); | ||
| if (api.getGuildLock().isLocked(guildId)) | ||
| return guildId; | ||
| guild = (GuildImpl) api.getGuildById(guildId); | ||
| if (guild == null) | ||
| { | ||
| api.getEventCache().cache(EventCache.Type.GUILD, guildId, () -> handle(responseNumber, allContent)); | ||
| EventCache.LOG.debug("Received a PRESENCE_UPDATE for a guild that is not yet cached! " + | ||
| "GuildId: " + guildId + " UserId: " + content.getJSONObject("user").get("id")); | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| JSONObject jsonUser = content.getJSONObject("user"); | ||
|
|
@@ -74,7 +86,7 @@ protected Long handleInternally(JSONObject content) | |
| user, oldUsername, oldDiscriminator)); | ||
| } | ||
| String oldAvatar = user.getAvatarId(); | ||
| if (!Objects.equals(avatarId, oldAvatar)) | ||
| { | ||
| String oldAvatarId = user.getAvatarId(); | ||
| user.setAvatarId(avatarId); | ||
|
|
@@ -90,31 +102,29 @@ protected Long handleInternally(JSONObject content) | |
| String gameName = null; | ||
| String gameUrl = null; | ||
| Game.GameType type = null; | ||
| final JSONObject game = content.optJSONObject("game"); | ||
| if (game != null && !game.isNull("name")) | ||
| { | ||
| gameName = game.get("name").toString(); | ||
| gameUrl = game.isNull("url") ? null : game.get("url").toString(); | ||
| try | ||
| { | ||
| type = game.isNull("type") | ||
| ? Game.GameType.DEFAULT | ||
| : Game.GameType.fromKey(Integer.parseInt(game.get("type").toString())); | ||
| } | ||
| catch (NumberFormatException ex) | ||
| { | ||
| type = Game.GameType.DEFAULT; | ||
| } | ||
| } | ||
| Game nextGame = gameName == null ? null : api.getEntityBuilder().createGame(gameName, gameUrl, type); | ||
| OnlineStatus status = OnlineStatus.fromKey(content.getString("status")); | ||
|
|
||
| //If we are in a Guild, then we will use Member. | ||
| // If we aren't we'll be dealing with the Relation system. | ||
| if (guild != null) | ||
| { | ||
| MemberImpl member = (MemberImpl) guild.getMember(user); | ||
|
|
||
| //If the Member is null, then User isn't in the Guild. | ||
|
|
@@ -144,7 +154,7 @@ protected Long handleInternally(JSONObject content) | |
| api, responseNumber, | ||
| user, guild, oldStatus)); | ||
| } | ||
| if (!Objects.equals(member.getGame(), nextGame)) | ||
| { | ||
| Game oldGame = member.getGame(); | ||
| member.setGame(nextGame); | ||
|
|
@@ -158,7 +168,32 @@ protected Long handleInternally(JSONObject content) | |
| else | ||
| { | ||
| //In this case, this PRESENCE_UPDATE is for a Relation. | ||
| if (api.getAccountType() != AccountType.CLIENT) | ||
| return null; | ||
| JDAClient client = api.asClient(); | ||
| FriendImpl friend = (FriendImpl) client.getFriendById(userId); | ||
|
|
||
| if (friend != null) | ||
| { | ||
| if (!friend.getOnlineStatus().equals(status)) | ||
| { | ||
| OnlineStatus oldStatus = friend.getOnlineStatus(); | ||
| friend.setOnlineStatus(status); | ||
| api.getEventManager().handle( | ||
| new UserOnlineStatusUpdateEvent( | ||
| api, responseNumber, | ||
| user, null, oldStatus)); | ||
| } | ||
| if (!Objects.equals(friend.getGame(), nextGame)) | ||
| { | ||
| Game oldGame = friend.getGame(); | ||
| friend.setGame(nextGame); | ||
| api.getEventManager().handle( | ||
| new UserGameUpdateEvent( | ||
| api, responseNumber, | ||
| user, null, oldGame)); | ||
|
There was a problem hiding this comment. We should be firing FriendXEvents, not UserXEvents I think. There was a problem hiding this comment. Or, at a minimum, take a Friend object to these User events so that you can call There was a problem hiding this comment. That is already supported in message-rw changes: https://github.com/DV8FromTheWorld/JDA/pull/453/files#diff-b7dbbd6a832a00b7f5e6173633fefff6 |
||
| } | ||
| } | ||
| } | ||
| } | ||
| else | ||
|
|
@@ -173,19 +208,10 @@ protected Long handleInternally(JSONObject content) | |
|
|
||
| //If the OnlineStatus is OFFLINE, ignore the event and return. | ||
| OnlineStatus status = OnlineStatus.fromKey(content.getString("status")); | ||
|
There was a problem hiding this comment. We lost the ability to return in an There was a problem hiding this comment. Can you elaborate? Not sure what you mean There was a problem hiding this comment. Nevermind. I see what has changed here. The fast escape logic is no longer needed. |
||
|
|
||
| //If this was for a Guild, cache it in the Guild for later use in GUILD_MEMBER_ADD | ||
| if (status != OnlineStatus.OFFLINE && guild != null) | ||
| guild.getCachedPresenceMap().put(userId, content); | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wouldn't
game.getInt("type")be the same here?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In the past we've encountered numerous issues with game objects due to them not being checked by the API, I didn't touch that logic at all here.