Fix error when logging slash commands done in PM

Vauff · May 4, 2022 · 6496aff · 6496aff
1 parent 82b6beb
commit 6496aff
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -67,5 +67,5 @@
             <version>4.6.0</version>
         </dependency>
     </dependencies>
-    <version>r45</version>
+    <version>r46</version>
 </project>
diff --git a/src/com/vauff/maunzdiscord/core/Logger.java b/src/com/vauff/maunzdiscord/core/Logger.java
@@ -12,6 +12,7 @@
 import discord4j.core.object.entity.Attachment;
 import discord4j.core.object.entity.Message;
 import discord4j.core.object.entity.channel.GuildChannel;
+import discord4j.core.object.entity.channel.MessageChannel;
 import discord4j.core.object.entity.channel.PrivateChannel;
 import discord4j.rest.http.client.ClientException;
 
@@ -25,15 +26,24 @@ public static void onChatInputInteraction(ChatInputInteractionEvent event)
 	{
 		try
 		{
+			MessageChannel channel = event.getInteraction().getChannel().block();
 			String userName = event.getInteraction().getUser().getUsername();
 			String userId = event.getInteraction().getUser().getId().asString();
-			String channelId = event.getInteraction().getChannel().block().getId().asString();
-			String channelName = ((GuildChannel) event.getInteraction().getChannel().block()).getName();
-			String guildName = event.getInteraction().getGuild().block().getName();
-			String guildId = event.getInteraction().getGuild().block().getId().asString();
+			String channelId = channel.getId().asString();
 			String cmdName = event.getInteraction().getCommandInteraction().get().getName().get();
 
-			Logger.log.debug(userName + " (" + userId + ") | " + guildName + " (" + guildId + ") | #" + channelName + " (" + channelId + ") | used /" + cmdName + getArguments(event.getInteraction().getCommandInteraction().get().getOptions()));
+			if (channel instanceof GuildChannel)
+			{
+				String channelName = ((GuildChannel) channel).getName();
+				String guildName = event.getInteraction().getGuild().block().getName();
+				String guildId = event.getInteraction().getGuild().block().getId().asString();
+
+				Logger.log.debug(userName + " (" + userId + ") | " + guildName + " (" + guildId + ") | #" + channelName + " (" + channelId + ") | used /" + cmdName + getArguments(event.getInteraction().getCommandInteraction().get().getOptions()));
+			}
+			else
+			{
+				Logger.log.debug(userName + " (" + userId + ") | PM (" + channelId + ") | used /" + cmdName + getArguments(event.getInteraction().getCommandInteraction().get().getOptions()));
+			}
 		}
 		catch (Exception e)
 		{

diff --git a/src/com/vauff/maunzdiscord/core/Main.java b/src/com/vauff/maunzdiscord/core/Main.java
@@ -38,7 +38,7 @@ public class Main
 {
 	public static GatewayDiscordClient gateway;
 	public static MongoDatabase mongoDatabase;
-	public static String version = "r45";
+	public static String version = "r46";
 	public static Config cfg;
 
 	/**