Merge pull request #10 from zekroTJA/dev2

updated bot message command

src/main/java/commands/settings/Botmessage.java

@@ -1,15 +1,20 @@
 package commands.settings;
 
 import commands.Command;
+import core.Perms;
 import net.dv8tion.jda.core.EmbedBuilder;
+import net.dv8tion.jda.core.JDA;
 import net.dv8tion.jda.core.entities.Game;
+import net.dv8tion.jda.core.events.guild.member.GuildMemberJoinEvent;
+import net.dv8tion.jda.core.events.guild.member.GuildMemberLeaveEvent;
 import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
 import utils.STATICS;
 
 import java.awt.*;
 import java.io.IOException;
 import java.text.ParseException;
 import java.util.Arrays;
+import java.util.stream.Collectors;
 
 /**
  * Created by zekro on 17.05.2017 / 13:55
@@ -20,6 +25,23 @@
 public class Botmessage implements Command {
 
 
+    private static boolean custom = false;
+    private static int members = 0;
+
+    private static void count() {
+        members++;
+    }
+
+    public static void setSupplyingMessage(JDA jda) {
+
+        if (!custom) {
+            jda.getGuilds().forEach(g -> g.getMembers().forEach(m -> count()));
+            jda.getPresence().setGame(Game.of("Supplying " + members + " users" + " | -help | v." + STATICS.VERSION));
+            members = 0;
+        }
+    }
+
+
     @Override
     public boolean called(String[] args, MessageReceivedEvent event) {
         return false;
@@ -28,11 +50,11 @@ public boolean called(String[] args, MessageReceivedEvent event) {
     @Override
     public void action(String[] args, MessageReceivedEvent event) throws ParseException, IOException {
 
-        if (core.Perms.check(2, event)) return;
+        if (!Perms.isOwner(event.getAuthor(), event.getTextChannel())) return;
+
+        custom = true;
 
-        StringBuilder message = new StringBuilder();
-        Arrays.stream(args).forEach(s -> message.append(s + " "));
-        String messageString = message.substring(0, message.length() - 1);
+        String messageString = Arrays.stream(args).collect(Collectors.joining(" ")).substring(1);
         event.getJDA().getPresence().setGame(Game.of(messageString + " | -help | v." + STATICS.VERSION));
         event.getTextChannel().sendMessage(new EmbedBuilder().setColor(Color.GREEN).setDescription("Successfully set bot message to `" + messageString + "`!").build()).queue();
 

src/main/java/listeners/guildJoinListener.java

@@ -22,6 +22,8 @@ public class guildJoinListener extends ListenerAdapter {
 
     public void onGuildMemberJoin(GuildMemberJoinEvent event) {
 
+        commands.settings.Botmessage.setSupplyingMessage(event.getJDA());
+
         if (event.getMember().getUser().isBot()) return;
 
         if (!SSSS.getSERVERJOINMESSAGE(event.getGuild()).toLowerCase().equals("off")) {
@@ -51,6 +53,8 @@ public void onGuildMemberJoin(GuildMemberJoinEvent event) {
 
     public void onGuildMemberLeave(GuildMemberLeaveEvent event) {
 
+        commands.settings.Botmessage.setSupplyingMessage(event.getJDA());
+
         if (event.getMember().getUser().isBot()) return;
 
         if (!SSSS.getSERVERLEAVEMESSAGE(event.getGuild()).toLowerCase().equals("off")) {

src/main/java/listeners/readyListener.java

@@ -82,6 +82,7 @@ public void onReady(ReadyEvent event) {
                 "#--------------------------------------------------------------------------------- - -  -  -\n\n"
         );
 
+        commands.settings.Botmessage.setSupplyingMessage(event.getJDA());
 
         readyEvent = event;
 

src/main/java/utils/STATICS.java

@@ -16,7 +16,7 @@ public class STATICS {
 
     //######### GENERAL BOT SETTINGS #########//
 
-    public static String VERSION = "1.29.0.1";
+    public static String VERSION = "1.29.1.0";
     public static String THISBUILD = BUILDTYPE.STABLE;
 
     public static class BUILDTYPE {