diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml
index fc7c10da68..3768468767 100644
--- a/runelite-client/pom.xml
+++ b/runelite-client/pom.xml
@@ -205,7 +205,7 @@
net.runelite
discord
- 1.0
+ 1.1
net.runelite
diff --git a/runelite-client/src/main/java/net/runelite/client/discord/DiscordService.java b/runelite-client/src/main/java/net/runelite/client/discord/DiscordService.java
index 2d66037b28..be2939fcf9 100644
--- a/runelite-client/src/main/java/net/runelite/client/discord/DiscordService.java
+++ b/runelite-client/src/main/java/net/runelite/client/discord/DiscordService.java
@@ -41,6 +41,7 @@ import net.runelite.client.eventbus.EventBus;
import net.runelite.discord.DiscordEventHandlers;
import net.runelite.discord.DiscordRPC;
import net.runelite.discord.DiscordRichPresence;
+import net.runelite.discord.DiscordUser;
@Singleton
@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.");
- eventBus.post(new DiscordReady());
+ log.info("Discord RPC service is ready with user {}.", user.username);
+ eventBus.post(new DiscordReady(
+ user.userId,
+ user.username,
+ user.discriminator,
+ user.avatar));
}
private void disconnected(int errorCode, String message)
@@ -194,12 +199,12 @@ public class DiscordService implements AutoCloseable
eventBus.post(new DiscordSpectateGame(spectateSecret));
}
- private void joinRequest(net.runelite.discord.DiscordJoinRequest joinRequest)
+ private void joinRequest(DiscordUser user)
{
eventBus.post(new DiscordJoinRequest(
- joinRequest.userId,
- joinRequest.username,
- joinRequest.discriminator,
- joinRequest.avatar));
+ user.userId,
+ user.username,
+ user.discriminator,
+ user.avatar));
}
}
diff --git a/runelite-client/src/main/java/net/runelite/client/discord/events/DiscordReady.java b/runelite-client/src/main/java/net/runelite/client/discord/events/DiscordReady.java
index 133edb1d7f..2a6f9d622e 100644
--- a/runelite-client/src/main/java/net/runelite/client/discord/events/DiscordReady.java
+++ b/runelite-client/src/main/java/net/runelite/client/discord/events/DiscordReady.java
@@ -32,4 +32,23 @@ import lombok.Value;
@Value
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;
}