ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #7070 from deathbeam/discord-invite

Browse Source 
Update Discord library to latest version
This commit is contained in:
Adam
2018-12-23 18:20:48 -05:00
committed by GitHub
parent dc5f9fe264 3bb8fa1675
commit f5ff8e884a
3 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/pom.xml
View File

@@ -205,7 +205,7 @@
<dependency> <dependency>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>discord</artifactId> <artifactId>discord</artifactId>
<version>1.0</version> <version>1.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>

21
runelite-client/src/main/java/net/runelite/client/discord/DiscordService.java
View File

@@ -41,6 +41,7 @@ import net.runelite.client.eventbus.EventBus;
import net.runelite.discord.DiscordEventHandlers; import net.runelite.discord.DiscordEventHandlers;
import net.runelite.discord.DiscordRPC; import net.runelite.discord.DiscordRPC;
import net.runelite.discord.DiscordRichPresence; import net.runelite.discord.DiscordRichPresence;
import net.runelite.discord.DiscordUser;
@Singleton @Singleton
@Slf4j @Slf4j
@@ -168,10 +169,14 @@ public class DiscordService implements AutoCloseable
} }
} }
private void ready() private void ready(DiscordUser user)
{ {
log.info("Discord RPC service is ready."); log.info("Discord RPC service is ready with user {}.", user.username);
eventBus.post(new DiscordReady()); eventBus.post(new DiscordReady(
user.userId,
user.username,
user.discriminator,
user.avatar));
} }
private void disconnected(int errorCode, String message) private void disconnected(int errorCode, String message)
@@ -194,12 +199,12 @@ public class DiscordService implements AutoCloseable
eventBus.post(new DiscordSpectateGame(spectateSecret)); eventBus.post(new DiscordSpectateGame(spectateSecret));
} }
private void joinRequest(net.runelite.discord.DiscordJoinRequest joinRequest) private void joinRequest(DiscordUser user)
{ {
eventBus.post(new DiscordJoinRequest( eventBus.post(new DiscordJoinRequest(
joinRequest.userId, user.userId,
joinRequest.username, user.username,
joinRequest.discriminator, user.discriminator,
joinRequest.avatar)); user.avatar));
} }
} }

19
runelite-client/src/main/java/net/runelite/client/discord/events/DiscordReady.java
View File

@@ -32,4 +32,23 @@ import lombok.Value;
@Value @Value
public class DiscordReady public class DiscordReady
{ {
/**
* The userId for the active user
*/
private String userId;
/**
* The username of the active user
*/
private String username;
/**
* The discriminator of the active user
*/
private String discriminator;
/**
* The avatar of the active user
*/
private String avatar;
} }