Merge pull request #107 from BigBotNetwork/Greg

d

Author: greg6775

pom.xml

@@ -79,7 +79,7 @@
         <dependency>
             <groupId>com.sedmelluq</groupId>
             <artifactId>lavaplayer</artifactId>
-            <version>1.2.56</version>
+            <version>1.2.34</version>
         </dependency>
         <dependency>
             <groupId>com.github.taycaldwell</groupId>

src/main/java/commands/moderation/CommandBan.java

@@ -22,6 +22,7 @@ public boolean called(String[] args, MessageReceivedEvent event) {
     public void action(String[] args, MessageReceivedEvent event) {
         if (event.getAuthor().getId() == event.getGuild().getOwner().getUser().getId() || event.getMember().hasPermission(Permission.BAN_MEMBERS) || Owner.get(event.getAuthor())) {
             Message msg = event.getMessage();
+
             if (msg.getMentionedUsers().size()== 0) {
                 event.getTextChannel().sendMessage(MessageHandler.getEmbed("moderation.ban.title", "moderation.ban.text", "", "normal", event)).queue();
             } else {
@@ -33,8 +34,15 @@ public void action(String[] args, MessageReceivedEvent event) {
                         PrivateChannel channel = User.getUser().openPrivateChannel().complete();
                         channel.sendMessage(MessageHandler.getEmbed("moderation.ban.ban", "moderation.ban.user", event.getGuild().getName(), "sucess", event)).queue();
                     }
-                    msg.getGuild().getController().ban(User, 1).queue();
-                    event.getTextChannel().sendMessage(MessageHandler.getEmbed("moderation.ban.ban", "moderation.ban.channel", User.getUser().getName(), "sucess", event)).queue();
+                    if (args.length > 0) {
+                        String reason = event.getMessage().getContentRaw().replaceFirst(MessageHandler.getprefix(event.getGuild()), "").replaceFirst("ban", "").replaceFirst(args[0], "");
+                        msg.getGuild().getController().ban(User, 1).reason(reason).queue();
+                        event.getTextChannel().sendMessage(MessageHandler.getEmbed("moderation.ban.ban", "moderation.ban.channel", User.getUser().getName(), "sucess", event)).queue();
+                    } else {
+                        msg.getGuild().getController().ban(User, 1).queue();
+                        event.getTextChannel().sendMessage(MessageHandler.getEmbed("moderation.ban.ban", "moderation.ban.channel", User.getUser().getName(), "sucess", event)).queue();
+                    }
+
                 }
             }
         } else {

src/main/java/commands/music/CommandJoin.java

@@ -29,7 +29,10 @@ public void action(String[] args, MessageReceivedEvent event) {
 
                     JsonObject jsonObject = new JsonParser().parse(requestResponse.getResponseMessage()).getAsJsonObject();
                     event.getTextChannel().sendMessage(jsonObject.toString()).queue();
-                    event.getTextChannel().sendMessage(new EmbedBuilder().setThumbnail(jsonObject.get("avatar").getAsString()).setTitle("Botinfo: " + jsonObject.get("name").getAsString()).build()).queue();
+                    event.getTextChannel().sendMessage(new EmbedBuilder().setThumbnail(jsonObject.get("avatar").getAsString())
+                            .setTitle("Botinfo: " + jsonObject.get("name").getAsString())
+                            .addField("Owner", "jisdjisdjijsdij " + jsonObject.get("username"), true)
+                            .build()).queue();
 
                 } catch (IOException e) {
                     e.printStackTrace();
@@ -49,9 +52,6 @@ public void action(String[] args, MessageReceivedEvent event) {
 
             }
 
-
-
-
         } else {
             event.getTextChannel().sendMessage("Zu kurz!").queue();
         }

src/main/java/commands/music/CommandLeave.java

@@ -34,7 +34,6 @@ public void action(String[] args, MessageReceivedEvent event) {
 
             List<String> voters = api.getVoterIds("407189087649398795", 1);
 
-
                 if (event.getMessage().getGuild().getId().equals(BBN)) {
                     if (voters.contains(u.getId())) {
 

src/main/java/commands/tools/CommandBotInfo.java

@@ -2,18 +2,15 @@
 
 import commands.botowner.*;
 import commands.moderation.*;
-import commands.music.CommandJoin;
 import commands.tools.*;
 import commands.usercommands.*;
 import commands.usercommands.CommandHelp;
 import commands.botowner.CommandInfo;
 import commands.usercommands.CommandPremium;
 import listener.*;
-import music.AudioCore;
 import net.dv8tion.jda.bot.sharding.DefaultShardManagerBuilder;
 import net.dv8tion.jda.bot.sharding.ShardManager;
 import net.dv8tion.jda.core.JDA;
-import net.dv8tion.jda.core.entities.Game;
 import net.dv8tion.jda.core.utils.SessionController;
 import org.apache.commons.net.ftp.FTPClient;
 import org.slf4j.Logger;
@@ -31,7 +28,6 @@ public class Main {
     public static boolean dev = true;
     public static SessionController sessionController;
     public static ShardManager shardManager;
-    public static AudioCore audioCore;
 
     public static void main(String[] args2) {
         try {
@@ -82,7 +78,7 @@ public static void main(String[] args2) {
             commandHandler.commands.put("ban", new CommandBan());
             commandHandler.commands.put("kick", new CommandKick());
             commandHandler.commands.put("github", new CommandGitHub());
-            commandHandler.commands.put("stop", new CommandStop());
+            commandHandler.commands.put("botstop", new CommandStop());
             commandHandler.commands.put("setlvl", new CommandSetLevel());
             commandHandler.commands.put("setxp", new CommandSetXP());
             commandHandler.commands.put("clyde", new CommandClyde());
@@ -96,11 +92,11 @@ public static void main(String[] args2) {
             commandHandler.commands.put("levelmessage", new CommandLevelMessage());
             commandHandler.commands.put("guild", new CommandGuild());
             commandHandler.commands.put("help", new CommandHelp());
-            commandHandler.commands.put("info", new CommandInfo());
+            commandHandler.commands.put("about", new CommandInfo());
             commandHandler.commands.put("warn", new CommandWarn());
             commandHandler.commands.put("token", new CommandToken());
             commandHandler.commands.put("log", new CommandLog());
-            commandHandler.commands.put("play", new CommandPlay());
+            commandHandler.commands.put("game-play", new CommandPlay());
             commandHandler.commands.put("dm", new CommandDM());
             commandHandler.commands.put("miner", new CommandMiner());
             commandHandler.commands.put("premium", new CommandPremium());
@@ -111,9 +107,8 @@ public static void main(String[] args2) {
             commandHandler.commands.put("uptime", new CommandUptime());
             commandHandler.commands.put("role", new CommandRole());
             commandHandler.commands.put("botinfo", new CommandBotInfo());
-            /*MUSIC*/
-            commandHandler.commands.put("join", new CommandJoin());
-            commandHandler.commands.put("leave", new commands.music.CommandLeave());
+            commandHandler.commands.put("upvoted", new CommandUpvoted());
+
             args = args2;
             logger.info("loaded all commands");
             logger.info("Starting the Bot...");

src/main/java/commands/tools/CommandUpvoted.java

@@ -15,6 +15,15 @@ public class Constants {
             progBars.put(names[i], ids[i]);
         }
     }
+    public static String argsToString(String[] args, String filler){
+        String out = "";
+        for (String s : args){
+            if (out != "")
+                out += filler;
+            out += s;
+        }
+        return out;
+    }
 
 
 }