Merge pull request #363 from BigBotNetwork/greg-dev

Greg dev

pom.xml

@@ -56,7 +56,7 @@
     <dependency>
       <groupId>net.dv8tion</groupId>
       <artifactId>JDA</artifactId>
-      <version>4.1.1_104</version>
+      <version>4.1.1_105</version>
     </dependency>
     <dependency>
       <groupId>org.json</groupId>

src/main/java/com/bbn/hadder/Rethink.java

@@ -18,7 +18,6 @@ package com.bbn.hadder;
 
 import com.bbn.hadder.core.Config;
 import com.rethinkdb.RethinkDB;
-import com.rethinkdb.gen.exc.ReqlNonExistenceError;
 import com.rethinkdb.gen.exc.ReqlOpFailedError;
 import com.rethinkdb.net.Connection;
 import org.json.JSONArray;
@@ -126,10 +125,10 @@ public class Rethink {
         this.insert("server", r
                 .hashMap("id", id)
                 .with("prefix", "h.")
-                .with("message_id", null)
-                .with("role_id", null)
+                .with("message_id", "")
+                .with("role_id", "")
                 .with("invite_detect", false)
-                .with("starboard", null)
+                .with("starboard", "")
                 .with("neededstars", "4")
         );
     }
@@ -144,7 +143,7 @@ public class Rethink {
 
     // TODO
     public boolean hasStarboardChannel(String guild_id) {
-        return this.getByID("server", guild_id, "starboard") != null;
+        return !this.getByID("server", guild_id, "starboard").equals("");
     }
     // TODO
     public void insertStarboardMessage(String message_id, String guild_id, String starboard_message_id) {
@@ -160,12 +159,7 @@ public class Rethink {
     }
     // TODO
     public boolean hasStarboardMessage(String message_id) {
-        try {
-            this.getByID("stars", message_id, "guild");
-            return true;
-        } catch (ReqlNonExistenceError e) {
-            return false;
-        }
+        return this.getByID("stars", message_id, "guild") != null;
     }
 
 

src/main/java/com/bbn/hadder/RethinkServer.java

@@ -24,15 +24,15 @@ public class RethinkServer {
 
     private Rethink rethink;
 
-    public String accept_emote = null;
-    public String decline_emote = null;
-    public String id;
-    public boolean invite_detect = false;
-    public String message_id = null;
-    public String neededstars = "3";
-    public String prefix = "h.";
-    public String role_id = null;
-    public String starboard = null;
+    String accept_emote = "";
+    String decline_emote = "";
+    String id;
+    boolean invite_detect = false;
+    String message_id = "";
+    String neededstars = "3";
+    String prefix = "h.";
+    String role_id = "";
+    String starboard = "";
 
     public RethinkServer(JSONObject object, Rethink rethink) {
         for (Field field : this.getClass().getDeclaredFields()) {

src/main/java/com/bbn/hadder/RethinkUser.java

@@ -24,10 +24,10 @@ public class RethinkUser {
 
     private Rethink rethink;
 
-    public String id;
-    public String prefix = "h.";
-    public String language = "en";
-    public String blacklisted = null;
+    String id;
+    String prefix = "h.";
+    String language = "en";
+    String blacklisted = "none";
 
     public RethinkUser(JSONObject object, Rethink rethink) {
         for (Field field : this.getClass().getDeclaredFields()) {
@@ -43,18 +43,10 @@ public class RethinkUser {
         this.rethink = rethink;
     }
 
-    public RethinkUser(String id) {
-        this.id = id;
-    }
-
     public Rethink getRethink() {
         return rethink;
     }
 
-    public void setRethink(Rethink rethink) {
-        this.rethink = rethink;
-    }
-
     public String getId() {
         return id;
     }

src/main/java/com/bbn/hadder/audio/AudioManager.java

@@ -18,16 +18,12 @@ package com.bbn.hadder.audio;
 
 import com.bbn.hadder.commands.CommandEvent;
 import com.bbn.hadder.utils.MessageEditor;
-import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
-import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
-import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
-import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
+import com.sedmelluq.discord.lavaplayer.player.*;
 import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import net.dv8tion.jda.api.entities.Guild;
-import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;
 
 import java.util.AbstractMap;

src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java

@@ -111,7 +111,7 @@ public class AvatarCommand implements Command {
 
     @Override
     public String usage() {
-        return "[User]";
+        return "[user]";
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java

@@ -85,7 +85,7 @@ public class ClydeCommand implements Command {
 
     @Override
     public String usage() {
-        return "[Content]";
+        return "[content]";
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/fun/GifCommand.java

@@ -70,11 +70,11 @@ public class GifCommand implements Command {
 
     @Override
     public String usage() {
-        return "[Term]";
+        return "[term]";
     }
 
     @Override
     public String example() {
-        return "Cute cat";
+        return "cute cat";
     }
 }

src/main/java/com/bbn/hadder/commands/general/HelpCommand.java

@@ -104,7 +104,7 @@ public class HelpCommand implements Command {
 
     @Override
     public String usage() {
-        return "[Command name]";
+        return "[command]";
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java

@@ -117,7 +117,7 @@ public class GitHubCommand implements Command {
 
     @Override
     public String usage() {
-        return "[GH name]";
+        return "[user]";
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java

@@ -1,5 +1,17 @@
 /*
- * @author Hax / Hax6775 / Schlauer_Hax
+ * Copyright 2019-2020 GregTCLTK and Schlauer-Hax
+ *
+ * Licensed under the GNU Affero General Public License, Version 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://www.gnu.org/licenses/agpl-3.0.en.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package com.bbn.hadder.commands.misc;
@@ -8,7 +20,6 @@ import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
 import com.bbn.hadder.utils.MessageEditor;
 import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.User;
 import org.apache.commons.lang3.StringUtils;
 
@@ -16,61 +27,62 @@ import java.time.format.DateTimeFormatter;
 
 public class ProfileCommand implements Command {
 
-
     @Override
     public void executed(String[] args, CommandEvent e) {
-        Member member = null;
+        User u = null;
         if (args.length == 0) {
-            member = e.getMember();
-        } else if (StringUtils.isNumeric(args[0])) {
-            member = e.getGuild().getMemberById(args[0]);
+            u = e.getAuthor();
+        } else if (StringUtils.isNumeric(args[0]) && args[0].length() == 18) {
+            u = e.getJDA().getUserById(args[0]);
         } else if (!StringUtils.isNumeric(args[0]) && args[0].contains("#")) {
             try {
-                member = e.getGuild().getMemberByTag(args[0]);
-            } catch (IllegalArgumentException ex) {
-                // TODO: Translate and give better message
-                e.getChannel().sendMessage("Stop it. Just give me some valid user").queue();
+                u = e.getJDA().getUserByTag(args[0]);
+            } catch (Exception ex) {
+                e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+                        "commands.misc.profile.error.title",
+                        "commands.misc.profile.error.description").build()).queue();
+                return;
             }
-        } else if (e.getMessage().getMentionedMembers().size() == 1) {
-            member = e.getMessage().getMentionedMembers().get(0);
+        } else if (e.getMessage().getMentionedUsers().size() == 1) {
+            u = e.getMessage().getMentionedUsers().get(0);
         }
         try {
-            member.getUser();
             // TODO: Translate
             EmbedBuilder embed = e.getMessageEditor()
                     .getMessage(MessageEditor.MessageType.INFO)
                     .setTitle("User Information")
-                    .addField("Username", member.getUser().getName(), true)
-                    .addField("Usertag", member.getUser().getAsTag(), true)
-                    .addField("Userid", member.getUser().getId(), true)
-                    .addField("Account Creation Date", member.getUser().getTimeCreated()
+                    .addField("Username", u.getName(), true)
+                    .addField("Tag", u.getAsTag(), true)
+                    .addField("ID", u.getId(), true)
+                    .addField("Account Creation Date", u.getTimeCreated()
                             .format(DateTimeFormatter.ISO_DATE_TIME).replace("T", " ").replace("Z", ""), true)
-                    .addField("Name on Guild", member.getEffectiveName(), true)
-                    .addField("Guild Join Date", member.getTimeJoined()
+                    .addField("Nickname", e.getGuild().getMember(u).getEffectiveName(), true)
+                    .addField("Guild Join Date", e.getGuild().getMember(u).getTimeJoined()
                             .format(DateTimeFormatter.ISO_DATE_TIME).replace("T", " ").replace("Z", ""), true)
-                    .addField("Roles", String.valueOf(member.getRoles().size()), true);
+                    .addField("Roles", String.valueOf(e.getGuild().getMember(u).getRoles().size()), true);
 
             e.getChannel().sendMessage(embed.build()).queue();
         } catch (NullPointerException ex) {
-            // TODO: Translate and give better message
-            e.getChannel().sendMessage("Stop it. Just give me some valid user").queue();
+            e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+                    "commands.misc.profile.error.title",
+                    "commands.misc.profile.error.description").build()).queue();
         }
 
     }
 
     @Override
     public String[] labels() {
-        return new String[]{"profile", "user"};
+        return new String[]{"profile", "user", "userinfo"};
     }
 
     @Override
     public String description() {
-        return "Shows some information about the user.";
+        return "commands.misc.profile.help.description";
     }
 
     @Override
     public String usage() {
-        return "@User|UserID|Username";
+        return "[user/id]";
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java

@@ -91,11 +91,11 @@ public class ScreenShareCommand implements Command {
 
     @Override
     public String usage() {
-        return "[Channel]";
+        return "[channel]";
     }
 
     @Override
     public String example() {
-        return "Gaming-Lounge";
+        return "Talk";
     }
 }

src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java

@@ -34,6 +34,15 @@ public class ServerStatsCommand implements Command {
                 .addField("ID", e.getGuild().getId(), true)
                 .addField("Region", e.getGuild().getRegion().getName(), true)
                 .addField("Time created", new Date(e.getGuild().getTimeCreated().toInstant().toEpochMilli()).toString(), true)
+                .addField("Roles", String.valueOf(e.getGuild().getRoles().size()), true)
+                .addField("Emotes", String.valueOf(e.getGuild().getEmotes().size()), true)
+                .addField("Categories", String.valueOf(e.getGuild().getCategories().size()), true)
+                .addField("Text/Voice/Store Channels", "`" + e.getGuild().getTextChannels().size() + "`" + "/" + "`" + e.getGuild().getVoiceChannels().size() + "`" + "/" + "`" + e.getGuild().getStoreChannels().size() + "`", true)
+                .addField("Verification Level", e.getGuild().getVerificationLevel().getKey() + ": " +  e.getGuild().getVerificationLevel(), true)
+                .addField("MFA Level", String.valueOf(e.getGuild().getRequiredMFALevel().getKey()), true)
+                .addField("Member Count", String.valueOf(e.getGuild().getMemberCount()), true)
+                .addField("Explicit Content Level", e.getGuild().getExplicitContentLevel().getKey() + ": " + e.getGuild().getExplicitContentLevel(), true)
+                //TODO: Features
                 .setThumbnail(e.getGuild().getIconUrl())
                 .setImage(e.getGuild().getBannerUrl());
 
@@ -45,7 +54,7 @@ public class ServerStatsCommand implements Command {
 
     @Override
     public String[] labels() {
-        return new String[]{"serverstats"};
+        return new String[]{"serverstats", "guildstats"};
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java

@@ -104,7 +104,7 @@ public class BanCommand implements Command {
 
     @Override
     public String usage() {
-        return "[User(s)]";
+        return "[user]";
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java

@@ -109,7 +109,7 @@ public class ClearCommand implements Command {
 
     @Override
     public String usage() {
-        return "[Amount]";
+        return "[amount]";
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java

@@ -89,7 +89,7 @@ public class KickCommand implements Command {
 
     @Override
     public String usage() {
-        return "[User(s)]";
+        return "[user]";
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java

@@ -117,7 +117,7 @@ public class NickCommand implements Command {
 
     @Override
     public String usage() {
-        return "[User(s)] [New nickname]";
+        return "[user] [nickname]";
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java

@@ -62,7 +62,7 @@ public class PrefixCommand implements Command {
 
     @Override
     public String usage() {
-        return "[New Prefix]";
+        return "[new prefix]";
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java

@@ -134,7 +134,7 @@ public class RegionChangeCommand implements Command {
 
     @Override
     public String usage() {
-        return "[New region]";
+        return "[new region]";
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java

@@ -112,7 +112,7 @@ public class RoleCommand implements Command {
 
     @Override
     public String usage() {
-        return "[add/remove] [Role>] [User]";
+        return "[add/remove] [role] [user]";
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java

@@ -63,7 +63,7 @@ public class StarboardCommand implements Command {
 
     @Override
     public String usage() {
-        return "[Channel] [Needed stars]";
+        return "[channel] [needed stars]";
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/music/BassCommand.java

@@ -63,7 +63,7 @@ public class BassCommand implements Command {
 
     @Override
     public String usage() {
-        return "[Bass-Level]";
+        return "[bass level]";
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/music/PlayCommand.java

@@ -83,7 +83,7 @@ public class PlayCommand implements Command {
 
     @Override
     public String usage() {
-        return "[Song URL/Name]";
+        return "[URL/name]";
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java

@@ -19,6 +19,7 @@ package com.bbn.hadder.commands.music;
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
 import com.bbn.hadder.utils.MessageEditor;
+import org.jsoup.internal.StringUtil;
 
 public class VolumeCommand implements Command {
 
@@ -27,7 +28,7 @@ public class VolumeCommand implements Command {
         if (args.length > 0) {
             if (e.getAudioManager().hasPlayer(e.getGuild()) && e.getAudioManager().getPlayer(e.getGuild()).getPlayingTrack() != null) {
                 if (e.getMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().getChannel().equals(e.getMember().getVoiceState().getChannel())) {
-                    try {
+                    if (StringUtil.isNumeric(args[0])) {
                         int volume = Integer.parseInt(args[0]);
                         if (volume < 201 && volume > 0 || e.getConfig().getOwners().contains(e.getAuthor().getIdLong())) {
                             e.getAudioManager().getPlayer(e.getGuild()).setVolume(volume);
@@ -39,9 +40,7 @@ public class VolumeCommand implements Command {
                                     "commands.music.volume.error.int.title",
                                     "commands.music.volume.error.int.description").build()).queue();
                         }
-                    } catch (NumberFormatException ex) {
-                        e.getHelpCommand().sendHelp(this, e);
-                    }
+                    } else e.getHelpCommand().sendHelp(this, e);
                 } else {
                     e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
                             "commands.music.volume.error.connected.title",
@@ -68,7 +67,7 @@ public class VolumeCommand implements Command {
 
     @Override
     public String usage() {
-        return "[New volume]";
+        return "[volume]";
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java

@@ -41,7 +41,7 @@ public class BlacklistCommand implements Command {
                     if (args.length == 3) {
                         String blacklisted = e.getRethinkUser().getBlacklisted();
                         List<String> commands = new ArrayList<>();
-                        if (null != blacklisted) commands.addAll(Arrays.asList(blacklisted.split(",")));
+                        if (!"none".equals(blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(",")));
                         commands.addAll(Arrays.asList(args[1].split(",")));
                         LinkedHashSet<String> hashSet = new LinkedHashSet<>(commands);
 
@@ -61,7 +61,7 @@ public class BlacklistCommand implements Command {
                     if (args.length == 3) {
                         String blacklisted = e.getRethinkUser().getBlacklisted();
                         List<String> commands = new ArrayList<>();
-                        if (null != blacklisted) commands.addAll(Arrays.asList(blacklisted.split(",")));
+                        if (!"none".equals(blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(",")));
                         commands.removeAll(Arrays.asList(args[1].split(",")));
                         LinkedHashSet<String> hashSet = new LinkedHashSet<>(commands);
 
@@ -82,7 +82,7 @@ public class BlacklistCommand implements Command {
                     for (User user : e.getJDA().getUsers()) {
                         if (!user.getId().equals(e.getJDA().getSelfUser().getId())) {
                             String blacklisted = e.getRethinkUser().getBlacklisted();
-                            if (null != blacklisted) {
+                            if (!"none".equals(blacklisted)) {
                                 stringBuilder.append(user.getAsTag()).append(" (").append(user.getId()).append(") - ").append(blacklisted).append("\n");
                             }
                         }
@@ -113,7 +113,7 @@ public class BlacklistCommand implements Command {
 
     @Override
     public String usage() {
-        return "add|remove|list command @User";
+        return "[add|remove|list] [command] [user]";
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java

@@ -114,7 +114,7 @@ public class EvalCommand implements Command {
 
     @Override
     public String usage() {
-        return "[Code]";
+        return "[code]";
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java

@@ -58,7 +58,7 @@ public class GuildLeaveCommand implements Command {
 
     @Override
     public String usage() {
-        return "[Guild-ID]";
+        return "[id]";
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java

@@ -82,7 +82,7 @@ public class LanguageCommand implements Command {
 
     @Override
     public String usage() {
-        return "[Language code]";
+        return "[language code]";
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java

@@ -49,7 +49,7 @@ public class UserPrefixCommand implements Command {
 
     @Override
     public String usage() {
-        return "[New Prefix]";
+        return "[new prefix]";
     }
 
     @Override

src/main/java/com/bbn/hadder/core/CommandHandler.java

@@ -69,7 +69,7 @@ public class CommandHandler {
 
                     boolean run = true;
                     String blacklisted = rethinkUser.getBlacklisted();
-                    if (null != blacklisted) {
+                    if (!"none".equals(blacklisted)) {
                         for (String BLLabel : blacklisted.split(",")) {
                             if (Arrays.asList(cmd.labels()).contains(BLLabel)) {
                                 run = false;

src/main/resources/Translations/Translations_en.properties

@@ -90,6 +90,9 @@ commands.misc.screenshare.help.description = Shows you the link to share your sc
 commands.misc.serverstats.title = Serverstats
 commands.misc.serverstats.description = This message contains some information about `%extra%`
 commands.misc.serverstats.help.description = Shows information about a server.
+commands.misc.profile.error.title = Not found
+commands.misc.profile.error.description = I can't find the specified user.
+commands.misc.profile.help.description = Shows some information about the specified user.
 
 commands.moderation.ban.success.title = Successfully banned
 commands.moderation.ban.success.description = I successfully baned %extra%