Fix NPE on private messages

Discord4J-Addons · May 24, 2018 · 427f5e4 · 427f5e4
1 parent 09da7a8
commit 427f5e4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/main/java/com/darichey/discord/CommandListener.java b/src/main/java/com/darichey/discord/CommandListener.java
@@ -18,7 +18,7 @@ public CommandListener(CommandRegistry registry) {
 	@Override
 	public void handle(MessageReceivedEvent event) {
 		String content = event.getMessage().getContent();
-		String prefix = registry.getEffectivePrefix(event.getGuild().getLongID());
+		String prefix = registry.getEffectivePrefix(event.getGuild());
 
 		if (content.startsWith(prefix)) {
 			String prefixRemoved = content.substring(prefix.length());

diff --git a/src/main/java/com/darichey/discord/CommandRegistry.java b/src/main/java/com/darichey/discord/CommandRegistry.java
@@ -125,16 +125,17 @@ public Optional<String> getPrefixForGuild(long id) {
 	/**
 	 * Gets the prefix for the given guild. This is either the guild-specific prefix or the default prefix if one is not set.
 	 * @param guild The guild to look up.
-	 * @return The guild-specific prefix for this guild or
+	 * @return The guild-specific prefix for this guild or the default prefix.
 	 */
 	public String getEffectivePrefix(IGuild guild) {
-		return getEffectivePrefix(guild.getLongID());
+		if (guild == null) return defaultPrefix;
+		else return getEffectivePrefix(guild.getLongID());
 	}
 
 	/**
 	 * Gets the prefix for the given guild. This is either the guild-specific prefix or the default prefix if one is not set.
 	 * @param id The id of the guild to look up.
-	 * @return The guild-specific prefix for this guild or
+	 * @return The guild-specific prefix for this guild or the default prefix.
 	 */
 	public String getEffectivePrefix(long id) {
 		return getPrefixForGuild(id).orElse(defaultPrefix);