Merge pull request #21 from zekroTJA/dev

Dev

SETTINGS.txt

@@ -6,7 +6,7 @@
 # GENERAL SERVER SETTINGS #
 
     # Enter here your Discord API Token you'll get from here: https://discordapp.com/developers/applications/me
-        TOKEN = "Mjg3NTM4NDM1NjU1MjA0ODY0.DCppvg.lNnxUM-y_P7kSaRhmVZlevQ5m3I"
+        TOKEN = "Mjg3NTM4NDM1NjU1MjA0ODY0.DD0qvg.XN0l_ZRmwnl3uixRq5Vonrp3OMo"
     # Prefix to send bot commands (like -help or ~help or .help, what ever you want)
         CMD_PREFIX = "."
 
@@ -16,7 +16,7 @@
     # Log entered command in console of the bot
         COMMAND_CONSOLE_OUTPUT = true
     # Automatically check for updates
-        AUTO_UPDATE = false
+        UPDATE_INFO = false
     # Only allow members to use music commands in music channel
         MUSIC_COMMANDS_ONLY_IN_MUSIC_CHANNEL = false
     # Volume in percent (0 - 100, 0 -> Disabled -> 100% volume)

src/main/java/commands/Command.java

@@ -13,5 +13,6 @@ public interface Command {
     String help();
     String description();
     String commandType();
+    int permission();
 }
 

src/main/java/commands/administration/Broadcast.java

@@ -64,11 +64,16 @@ public String help() {
 
     @Override
     public String description() {
-        return null;
+        return "Send a message to all servers general chats";
     }
 
     @Override
     public String commandType() {
         return STATICS.CMDTYPE.etc;
     }
+
+    @Override
+    public int permission() {
+        return 3;
+    }
 }

src/main/java/commands/administration/Guilds.java

@@ -12,6 +12,7 @@
 
 import java.io.IOException;
 import java.text.ParseException;
+import java.util.Comparator;
 
 /**
  * Created by zekro on 11.06.2017 / 11:02
@@ -56,8 +57,10 @@ public void action(String[] args, MessageReceivedEvent event) throws ParseExcept
         StringBuilder sb = new StringBuilder();
 
         sb.append("**Running on `" + event.getJDA().getGuilds().size() + "` guilds.**\n\n");
-        event.getJDA().getGuilds().forEach(g -> sb.append(
-                ":white_small_square:   **" + g.getName() + "**  -  `" + g.getId() + "`  -  " + g.getOwner().getAsMention() + "\n"
+        event.getJDA().getGuilds().stream()
+                .sorted(Comparator.comparingInt(s -> s.getMembers().size()))
+                .forEach(g -> sb.append(
+                ":white_small_square:   *[" + g.getMembers().size() + "]*  -  **" + g.getName() + "**  -  `" + g.getId() + "`  -  " + g.getOwner().getEffectiveName() + "\n"
         ));
 
         event.getTextChannel().sendMessage(new EmbedBuilder().setTitle("Guilds", null).setDescription(sb.toString()).build()).queue();
@@ -76,11 +79,16 @@ public String help() {
 
     @Override
     public String description() {
-        return null;
+        return "Get list of guilds bot is running on";
     }
 
     @Override
     public String commandType() {
         return STATICS.CMDTYPE.administration;
     }
+
+    @Override
+    public int permission() {
+        return 3;
+    }
 }

src/main/java/commands/administration/Restart.java

@@ -35,7 +35,7 @@ public void action(String[] args, MessageReceivedEvent event) throws ParseExcept
         event.getTextChannel().sendMessage(":warning:  Bot will restart now...").queue();
 
         if (System.getProperty("os.name").toLowerCase().contains("linux"))
-            Runtime.getRuntime().exec("sudo screen sudo python restart.py");
+            Runtime.getRuntime().exec("screen sudo python restart.py");
         else
             Runtime.getRuntime().exec("wincmd.exe -restart");
 
@@ -62,4 +62,9 @@ public String description() {
     public String commandType() {
         return STATICS.CMDTYPE.administration;
     }
+
+    @Override
+    public int permission() {
+        return 3;
+    }
 }

src/main/java/commands/administration/Stop.java

@@ -1,13 +1,16 @@
 package commands.administration;
 
 import commands.Command;
+import commands.etc.BotStats;
 import core.Perms;
 import core.coreCommands;
 import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
 import utils.STATICS;
 
 import java.io.IOException;
 import java.text.ParseException;
+import java.util.Timer;
+import java.util.TimerTask;
 
 /**
  * Created by zekro on 23.03.2017 / 21:13
@@ -27,8 +30,16 @@ public void action(String[] args, MessageReceivedEvent event) throws ParseExcept
 
         if (!Perms.isOwner(event.getAuthor(), event.getTextChannel())) return;
 
-        event.getTextChannel().sendMessage(":warning: :mobile_phone_off:   " + event.getAuthor().getAsMention() + " shut down " + event.getJDA().getSelfUser().getAsMention() + " because of maintenance or an unexpected behavior.").queue();
-        System.exit(0);
+        BotStats.save();
+
+        //event.getTextChannel().sendMessage(":warning: :mobile_phone_off:   " + event.getAuthor().getAsMention() + " shut down " + event.getJDA().getSelfUser().getAsMention() + " because of maintenance or an unexpected behavior.").queue();
+        new Timer().schedule(new TimerTask() {
+            @Override
+            public void run() {
+                System.exit(0);
+            }
+        }, 1000);
+
     }
 
     @Override
@@ -50,4 +61,9 @@ public String description() {
     public String commandType() {
         return STATICS.CMDTYPE.administration;
     }
+
+    @Override
+    public int permission() {
+        return 3;
+    }
 }

src/main/java/commands/administration/Update.java

@@ -28,14 +28,7 @@ public void action(String[] args, MessageReceivedEvent event) throws ParseExcept
 
         if (!Perms.isOwner(event.getAuthor(), event.getTextChannel())) return;
 
-        if (!core.update.checkIfUpdate()) {
-            event.getTextChannel().sendMessage(
-                    ":warning:   The bot is up to date! ;)"
-            ).queue();
-            return;
-        }
-
-        core.update.getUpdate(event.getJDA().getGuilds());
+        update.manualCheck(event.getMessage().getTextChannel());
 
     }
 
@@ -58,4 +51,9 @@ public String description() {
     public String commandType() {
         return STATICS.CMDTYPE.administration;
     }
+
+    @Override
+    public int permission() {
+        return 3;
+    }
 }

src/main/java/commands/administration/testCMD.java

@@ -54,4 +54,9 @@ public String description() {
     public String commandType() {
         return STATICS.CMDTYPE.administration;
     }
+
+    @Override
+    public int permission() {
+        return 3;
+    }
 }

src/main/java/commands/chat/BJoke.java

@@ -109,4 +109,9 @@ public String description() {
     public String commandType() {
         return STATICS.CMDTYPE.chatutils;
     }
+
+    @Override
+    public int permission() {
+        return 0;
+    }
 }

src/main/java/commands/chat/Cat.java

@@ -135,4 +135,10 @@ public static String getCat() {
 
         return outputMessage;
     }
+
+
+    @Override
+    public int permission() {
+        return 0;
+    }
 }

src/main/java/commands/chat/Clear.java

@@ -188,4 +188,9 @@ public String description() {
     public String commandType() {
         return STATICS.CMDTYPE.chatutils;
     }
+
+    @Override
+    public int permission() {
+        return 1;
+    }
 }

src/main/java/commands/chat/EightBall.java

@@ -57,4 +57,9 @@ public String description() {
     public String commandType() {
         return STATICS.CMDTYPE.chatutils;
     }
+
+    @Override
+    public int permission() {
+        return 0;
+    }
 }

src/main/java/commands/chat/Joke.java

@@ -100,4 +100,9 @@ public String description() {
     public String commandType() {
         return STATICS.CMDTYPE.chatutils;
     }
+
+    @Override
+    public int permission() {
+        return 0;
+    }
 }

src/main/java/commands/chat/JokeV2.java

@@ -77,11 +77,16 @@ public String help() {
 
     @Override
     public String description() {
-        return null;
+        return "Throw around with some yo mama jokes";
     }
 
     @Override
     public String commandType() {
         return STATICS.CMDTYPE.chatutils;
     }
+
+    @Override
+    public int permission() {
+        return 0;
+    }
 }

src/main/java/commands/chat/Quote.java

@@ -79,11 +79,16 @@ public String help() {
 
     @Override
     public String description() {
-        return null;
+        return "Quote a message in any channel on guild";
     }
 
     @Override
     public String commandType() {
         return STATICS.CMDTYPE.chatutils;
     }
+
+    @Override
+    public int permission() {
+        return 0;
+    }
 }