From ff67f45b4c62636aa6c47ec751010ccb33cb57c2 Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Thu, 12 Dec 2019 20:53:16 +0100
Subject: [PATCH] Merge @someone into MentionListener

---
 src/main/java/com/bbn/hadder/Hadder.java      |  3 +--
 .../bbn/hadder/listener/MentionListener.java  |  6 +++++
 .../bbn/hadder/listener/SomeoneListener.java  | 24 -------------------
 3 files changed, 7 insertions(+), 26 deletions(-)
 delete mode 100644 src/main/java/com/bbn/hadder/listener/SomeoneListener.java

diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java
index 45506be..b4f0ad9 100644
--- a/src/main/java/com/bbn/hadder/Hadder.java
+++ b/src/main/java/com/bbn/hadder/Hadder.java
@@ -98,8 +98,7 @@ public class Hadder {
                 new ReadyListener(rethink, config),
                 // new LinkListener(rethink),
                 new InviteLinkListener(rethink),
-                new RulesListener(rethink),
-                new SomeoneListener());
+                new RulesListener(rethink));
 
         try {
             shardManager = builder.build();
diff --git a/src/main/java/com/bbn/hadder/listener/MentionListener.java b/src/main/java/com/bbn/hadder/listener/MentionListener.java
index 3d46a3d..f5089e0 100644
--- a/src/main/java/com/bbn/hadder/listener/MentionListener.java
+++ b/src/main/java/com/bbn/hadder/listener/MentionListener.java
@@ -7,6 +7,7 @@ import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 
 import javax.annotation.Nonnull;
+import java.util.Random;
 
 public class MentionListener extends ListenerAdapter {
 
@@ -27,6 +28,11 @@ public class MentionListener extends ListenerAdapter {
                     .addField("Prefix (User)", rethink.getUserPrefix(event.getAuthor().getId()), false)
                     .addField("Prefix (Guild)", rethink.getGuildPrefix(event.getGuild().getId()), false)
                     .build()).queue();
+        } else if (event.getMessage().getContentRaw().equalsIgnoreCase("@someone")) {
+            int member = new Random().nextInt(event.getGuild().getMembers().size()-1);
+            if (member>0&&member<event.getGuild().getMembers().size()) {
+                event.getChannel().sendMessage(event.getGuild().getMembers().get(member).getAsMention()+ " (Executed by: "+event.getAuthor().getAsTag()+")").queue();
+            }
         }
     }
 }
diff --git a/src/main/java/com/bbn/hadder/listener/SomeoneListener.java b/src/main/java/com/bbn/hadder/listener/SomeoneListener.java
deleted file mode 100644
index 0abfbb5..0000000
--- a/src/main/java/com/bbn/hadder/listener/SomeoneListener.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * @author Hax / Hax6775 / Schlauer_Hax
- */
-
-package com.bbn.hadder.listener;
-
-import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
-import net.dv8tion.jda.api.hooks.ListenerAdapter;
-
-import javax.annotation.Nonnull;
-import java.util.Random;
-
-public class SomeoneListener extends ListenerAdapter {
-
-    @Override
-    public void onGuildMessageReceived(@Nonnull GuildMessageReceivedEvent event) {
-        if (event.getMessage().getContentRaw().equalsIgnoreCase("@someone")) {
-            int member = new Random().nextInt(event.getGuild().getMembers().size()-1);
-            if (member>0&&member<event.getGuild().getMembers().size()) {
-                event.getChannel().sendMessage(event.getGuild().getMembers().get(member).getAsMention()+ " (Executed by: "+event.getAuthor().getAsTag()+")").queue();
-            }
-        }
-    }
-}