Do not handle private messages twice for JDA

Author: Vampire

src/main/java/net/kautler/command/handler/CommandHandlerJda.java

@@ -20,7 +20,6 @@
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.events.GenericEvent;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
-import net.dv8tion.jda.api.events.message.priv.PrivateMessageReceivedEvent;
 import net.dv8tion.jda.api.hooks.EventListener;
 import net.dv8tion.jda.api.hooks.SubscribeEvent;
 import net.dv8tion.jda.api.sharding.ShardManager;
@@ -205,8 +204,6 @@ private void removeListener() {
     public void onEvent(GenericEvent event) {
         if (event instanceof MessageReceivedEvent) {
             onMessageReceived((MessageReceivedEvent) event);
-        } else if (event instanceof PrivateMessageReceivedEvent) {
-            onPrivateMessageReceived((PrivateMessageReceivedEvent) event);
         }
     }
 
@@ -221,17 +218,6 @@ private void onMessageReceived(MessageReceivedEvent messageReceivedEvent) {
         doHandleMessage(message, message.getContentRaw());
     }
 
-    /**
-     * Handles the actual private messages received.
-     *
-     * @param privateMessageReceivedEvent the private message received event
-     */
-    @SubscribeEvent
-    private void onPrivateMessageReceived(PrivateMessageReceivedEvent privateMessageReceivedEvent) {
-        Message message = privateMessageReceivedEvent.getMessage();
-        doHandleMessage(message, message.getContentRaw());
-    }
-
     @Override
     protected void fireCommandNotAllowedEvent(Message message, String prefix, String usedAlias) {
         commandNotAllowedEvent.fireAsync(new CommandNotAllowedEventJda(message, prefix, usedAlias));

src/test/groovy/net/kautler/command/handler/CommandHandlerJdaTest.groovy

@@ -20,7 +20,6 @@ import net.dv8tion.jda.api.JDA
 import net.dv8tion.jda.api.entities.Message
 import net.dv8tion.jda.api.events.GenericEvent
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent
-import net.dv8tion.jda.api.events.message.priv.PrivateMessageReceivedEvent
 import net.dv8tion.jda.api.sharding.ShardManager
 import net.kautler.command.Internal
 import net.kautler.command.LoggerProducer
@@ -160,10 +159,6 @@ class CommandHandlerJdaTest extends Specification {
         it.message >> message
     }
 
-    PrivateMessageReceivedEvent privateMessageReceivedEvent = Stub {
-        it.message >> message
-    }
-
     def 'an injector method for available restrictions should exist and forward to the common base class'() {
         given:
             CommandHandlerJda commandHandlerJda = Spy(useObjenesis: true)
@@ -290,12 +285,11 @@ class CommandHandlerJdaTest extends Specification {
                 1 * it.addEventListener(_) >> {
                     it.first().each {
                         it.onEvent(messageReceivedEvent)
-                        it.onEvent(privateMessageReceivedEvent)
                         it.onEvent(otherEvent)
                     }
                 }
             }
-            12 * commandHandlerJda.doHandleMessage(message, message.contentRaw) >> { }
+            6 * commandHandlerJda.doHandleMessage(message, message.contentRaw) >> { }
             0 * commandHandlerJda.doHandleMessage(*_)
     }