From 81ef854db2fd147f2f4c3c3ce03a22953d674968 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 1 Feb 2020 13:45:50 +0100 Subject: [PATCH 01/16] guildstats label --- .../java/com/bbn/hadder/commands/misc/ServerStatsCommand.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java index 9c12a6c..4110a7e 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java @@ -34,6 +34,8 @@ 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("Text/Voice Channels", "`" + e.getGuild().getTextChannels().size() + "`" + "/" + "`" + e.getGuild().getVoiceChannels().size() + "`", true) .setThumbnail(e.getGuild().getIconUrl()) .setImage(e.getGuild().getBannerUrl()); @@ -45,7 +47,7 @@ public class ServerStatsCommand implements Command { @Override public String[] labels() { - return new String[]{"serverstats"}; + return new String[]{"serverstats", "guildstats"}; } @Override From 5cfc4857ecff529fbe3b190dd5e2e31e8b91861c Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 1 Feb 2020 13:54:58 +0100 Subject: [PATCH 02/16] V level --- .../java/com/bbn/hadder/commands/misc/ServerStatsCommand.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java index 4110a7e..cc587d0 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java @@ -36,6 +36,7 @@ public class ServerStatsCommand implements Command { .addField("Time created", new Date(e.getGuild().getTimeCreated().toInstant().toEpochMilli()).toString(), true) .addField("Roles", String.valueOf(e.getGuild().getRoles().size()), true) .addField("Text/Voice Channels", "`" + e.getGuild().getTextChannels().size() + "`" + "/" + "`" + e.getGuild().getVoiceChannels().size() + "`", true) + .addField("Verification Level", e.getGuild().getVerificationLevel().getKey() + ": " + e.getGuild().getVerificationLevel(), true) .setThumbnail(e.getGuild().getIconUrl()) .setImage(e.getGuild().getBannerUrl()); From 003aa8b3d7bf1f8c8a4575b8fb4788f5c8300f2c Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 1 Feb 2020 14:45:23 +0100 Subject: [PATCH 03/16] Add stuff --- .../java/com/bbn/hadder/commands/misc/ServerStatsCommand.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java index cc587d0..2f6be53 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java @@ -35,8 +35,9 @@ public class ServerStatsCommand implements Command { .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("Text/Voice Channels", "`" + e.getGuild().getTextChannels().size() + "`" + "/" + "`" + e.getGuild().getVoiceChannels().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) .setThumbnail(e.getGuild().getIconUrl()) .setImage(e.getGuild().getBannerUrl()); From 748fd7c1b2edadbbe551f80e9ea55fe8bd45a439 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 1 Feb 2020 16:40:49 +0100 Subject: [PATCH 04/16] More serverstats :^) --- .../com/bbn/hadder/commands/misc/ServerStatsCommand.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java index 2f6be53..788701c 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java @@ -35,9 +35,14 @@ public class ServerStatsCommand implements Command { .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()); From 6cb0929f41a812b4ee52322e05563676b7d6e55a Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 1 Feb 2020 21:20:00 +0100 Subject: [PATCH 05/16] Unused --- src/main/java/com/bbn/hadder/RethinkUser.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/main/java/com/bbn/hadder/RethinkUser.java b/src/main/java/com/bbn/hadder/RethinkUser.java index 6bce94a..760e79d 100644 --- a/src/main/java/com/bbn/hadder/RethinkUser.java +++ b/src/main/java/com/bbn/hadder/RethinkUser.java @@ -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; } From 60187df58c64bb075bb1cd525342517bd685ad55 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 1 Feb 2020 22:03:44 +0100 Subject: [PATCH 06/16] Codacy yk --- src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java index 784ef19..02aa6cd 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java @@ -9,7 +9,6 @@ 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; import java.time.format.DateTimeFormatter; From d4064b395cbefaf77a9dde2e7fff961a1cbcc2dd Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 1 Feb 2020 22:30:02 +0100 Subject: [PATCH 07/16] . --- .../java/com/bbn/hadder/commands/misc/ProfileCommand.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java index 02aa6cd..3862cdd 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java @@ -15,13 +15,12 @@ import java.time.format.DateTimeFormatter; public class ProfileCommand implements Command { - @Override public void executed(String[] args, CommandEvent e) { Member member = null; if (args.length == 0) { member = e.getMember(); - } else if (StringUtils.isNumeric(args[0])) { + } else if (StringUtils.isNumeric(args[0]) && args[0].length() == 18) { member = e.getGuild().getMemberById(args[0]); } else if (!StringUtils.isNumeric(args[0]) && args[0].contains("#")) { try { @@ -59,7 +58,7 @@ public class ProfileCommand implements Command { @Override public String[] labels() { - return new String[]{"profile", "user"}; + return new String[]{"profile", "user", "userinfo"}; } @Override From 2d9fb1e1e4428f01dc04c433cd44e99b7d9d7d14 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 1 Feb 2020 22:37:49 +0100 Subject: [PATCH 08/16] Better help --- src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java | 2 +- src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java | 2 +- src/main/java/com/bbn/hadder/commands/fun/GifCommand.java | 4 ++-- .../java/com/bbn/hadder/commands/general/HelpCommand.java | 2 +- src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java | 2 +- .../java/com/bbn/hadder/commands/misc/ProfileCommand.java | 2 +- .../java/com/bbn/hadder/commands/misc/ScreenShareCommand.java | 4 ++-- .../java/com/bbn/hadder/commands/moderation/BanCommand.java | 2 +- .../java/com/bbn/hadder/commands/moderation/ClearCommand.java | 2 +- .../java/com/bbn/hadder/commands/moderation/KickCommand.java | 2 +- .../java/com/bbn/hadder/commands/moderation/NickCommand.java | 2 +- .../com/bbn/hadder/commands/moderation/PrefixCommand.java | 2 +- .../bbn/hadder/commands/moderation/RegionChangeCommand.java | 2 +- .../java/com/bbn/hadder/commands/moderation/RoleCommand.java | 2 +- .../com/bbn/hadder/commands/moderation/StarboardCommand.java | 2 +- src/main/java/com/bbn/hadder/commands/music/BassCommand.java | 2 +- src/main/java/com/bbn/hadder/commands/music/PlayCommand.java | 2 +- .../java/com/bbn/hadder/commands/music/VolumeCommand.java | 2 +- .../java/com/bbn/hadder/commands/owner/BlacklistCommand.java | 2 +- src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java | 2 +- .../java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java | 2 +- .../com/bbn/hadder/commands/settings/LanguageCommand.java | 2 +- .../com/bbn/hadder/commands/settings/UserPrefixCommand.java | 2 +- 23 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java index ffc9c76..d40f71e 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java +++ b/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 diff --git a/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java b/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java index e456876..29e01e4 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java +++ b/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 diff --git a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java index 22e4e14..239e681 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java +++ b/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"; } } diff --git a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java index 533e688..d643576 100644 --- a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java +++ b/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 diff --git a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java b/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java index 343bc5c..606c9bb 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java +++ b/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 diff --git a/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java index 3862cdd..6a3a451 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java @@ -68,7 +68,7 @@ public class ProfileCommand implements Command { @Override public String usage() { - return "@User|UserID|Username"; + return "[user/id]"; } @Override diff --git a/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java index e8bb036..30265d7 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java +++ b/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"; } } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java index cb62cec..6fd6bb2 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java +++ b/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 diff --git a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java index 290a6af..9f6fc14 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java +++ b/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 diff --git a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java index 87db3de..990042f 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java +++ b/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 diff --git a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java index 2f838f7..1849238 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java +++ b/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 diff --git a/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java index 7d2293e..a6db1db 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java +++ b/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 diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java index 51a9e3d..59c7a0d 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java +++ b/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 diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java index 3d774d7..3799f7f 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java +++ b/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 diff --git a/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java index 2c497e3..59bdb7b 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java +++ b/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 diff --git a/src/main/java/com/bbn/hadder/commands/music/BassCommand.java b/src/main/java/com/bbn/hadder/commands/music/BassCommand.java index 2df554a..61facab 100644 --- a/src/main/java/com/bbn/hadder/commands/music/BassCommand.java +++ b/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 diff --git a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java index 794c960..45c3855 100644 --- a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java +++ b/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 diff --git a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java index 994224b..fc7be0b 100644 --- a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java @@ -68,7 +68,7 @@ public class VolumeCommand implements Command { @Override public String usage() { - return "[New volume]"; + return "[volume]"; } @Override diff --git a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java index 70d596d..daf809a 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java @@ -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 diff --git a/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java b/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java index 146d4a6..5b5f512 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java +++ b/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 diff --git a/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java b/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java index feb16ae..15bc1a9 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java +++ b/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 diff --git a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java index 67dd131..e09a44a 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java +++ b/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 diff --git a/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java b/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java index b83da2c..4b17d3f 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java +++ b/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 From 93598e51ead92e9cc8095f2aa685b40472180c1d Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 2 Feb 2020 02:24:24 +0100 Subject: [PATCH 09/16] yk stuff yk --- .../java/com/bbn/hadder/commands/music/VolumeCommand.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java index fc7be0b..dec010d 100644 --- a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java +++ b/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", From 11b0c7879a0f778cc2230d8141a24f3816cc573c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 2 Feb 2020 11:21:16 +0000 Subject: [PATCH 10/16] Bump JDA from 4.1.1_104 to 4.1.1_105 Bumps JDA from 4.1.1_104 to 4.1.1_105. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4535f77..87e9493 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ net.dv8tion JDA - 4.1.1_104 + 4.1.1_105 org.json From c0132ecb2179d4e92b0e61b75280efa1b7b0bd8d Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 2 Feb 2020 15:46:00 +0100 Subject: [PATCH 11/16] Profile Command --- .../hadder/commands/misc/ProfileCommand.java | 43 ++++++++++--------- .../Translations/Translations_en.properties | 3 ++ 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java index 6a3a451..bcfa3fe 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java @@ -9,6 +9,7 @@ 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; import java.time.format.DateTimeFormatter; @@ -17,41 +18,43 @@ 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(); + u = e.getAuthor(); } else if (StringUtils.isNumeric(args[0]) && args[0].length() == 18) { - member = e.getGuild().getMemberById(args[0]); + 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(); } } @@ -63,7 +66,7 @@ public class ProfileCommand implements Command { @Override public String description() { - return "Shows some information about the user."; + return "commands.misc.profile.help.description"; } @Override diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index aa667ef..d638b91 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/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% From e95dc393276a1b378dc65cfa9d71c95ca07ed5ea Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 2 Feb 2020 15:48:31 +0100 Subject: [PATCH 12/16] Unused import --- src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java index bcfa3fe..a2b0972 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java @@ -8,7 +8,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; From af3b5553e3747d78d81b786713545a72aa2869e6 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 2 Feb 2020 15:51:17 +0100 Subject: [PATCH 13/16] Copyright... --- .../bbn/hadder/commands/misc/ProfileCommand.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java index a2b0972..87d1901 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java +++ b/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; From 80a4137dca81bb15e6c856ce74209f8ac2ba3ba9 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 2 Feb 2020 15:53:09 +0100 Subject: [PATCH 14/16] Codacy again --- src/main/java/com/bbn/hadder/audio/AudioManager.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/com/bbn/hadder/audio/AudioManager.java b/src/main/java/com/bbn/hadder/audio/AudioManager.java index 05ae700..fe45e59 100644 --- a/src/main/java/com/bbn/hadder/audio/AudioManager.java +++ b/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; From 07edce3df37c22fbcee2a74920a5452fe7cb7940 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 2 Feb 2020 16:05:25 +0100 Subject: [PATCH 15/16] Revert "null" This reverts commit 07b8749e0b6fd514dfad22e86ba4461b416da0b5. --- src/main/java/com/bbn/hadder/Rethink.java | 16 +++++----------- .../java/com/bbn/hadder/RethinkServer.java | 18 +++++++++--------- src/main/java/com/bbn/hadder/RethinkUser.java | 8 ++++---- .../com/bbn/hadder/core/CommandHandler.java | 2 +- 4 files changed, 19 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 2a14fac..6b2b137 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/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; } diff --git a/src/main/java/com/bbn/hadder/RethinkServer.java b/src/main/java/com/bbn/hadder/RethinkServer.java index ee88da6..c15c448 100644 --- a/src/main/java/com/bbn/hadder/RethinkServer.java +++ b/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()) { diff --git a/src/main/java/com/bbn/hadder/RethinkUser.java b/src/main/java/com/bbn/hadder/RethinkUser.java index 760e79d..1d99ac5 100644 --- a/src/main/java/com/bbn/hadder/RethinkUser.java +++ b/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()) { diff --git a/src/main/java/com/bbn/hadder/core/CommandHandler.java b/src/main/java/com/bbn/hadder/core/CommandHandler.java index 78f2848..5f2029c 100644 --- a/src/main/java/com/bbn/hadder/core/CommandHandler.java +++ b/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; From 9a9eb334f0d05bf023267573e930ef7cb865e40a Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 2 Feb 2020 16:10:02 +0100 Subject: [PATCH 16/16] Revert null in the blc --- .../com/bbn/hadder/commands/owner/BlacklistCommand.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java index daf809a..54298c6 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java +++ b/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 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 hashSet = new LinkedHashSet<>(commands); @@ -61,7 +61,7 @@ public class BlacklistCommand implements Command { if (args.length == 3) { String blacklisted = e.getRethinkUser().getBlacklisted(); List 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 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"); } }