diff --git a/pom.xml b/pom.xml index c4f89c0..127cdcc 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ net.dv8tion JDA - 4.1.0_87 + 4.1.0_88 org.json @@ -36,11 +36,6 @@ gson 2.8.6 - - org.slf4j - slf4j-api - 1.7.30 - org.slf4j slf4j-simple @@ -61,7 +56,6 @@ lavaplayer 1.3.32 - @@ -83,10 +77,6 @@ maven-resources-plugin 3.1.0 - - maven-compiler-plugin - 3.8.1 - maven-surefire-plugin 2.22.2 @@ -125,6 +115,7 @@ org.apache.maven.plugins maven-compiler-plugin + 3.8.1 13 13 diff --git a/src/main/java/com/bbn/hadder/audio/AudioManager.java b/src/main/java/com/bbn/hadder/audio/AudioManager.java index 1333346..6dd6f18 100644 --- a/src/main/java/com/bbn/hadder/audio/AudioManager.java +++ b/src/main/java/com/bbn/hadder/audio/AudioManager.java @@ -10,7 +10,6 @@ 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 com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; @@ -26,13 +25,13 @@ import java.util.concurrent.TimeUnit; public class AudioManager { + public Map> players = new HashMap<>(); + private final AudioPlayerManager myManager = new DefaultAudioPlayerManager(); + public AudioManager() { AudioSourceManagers.registerRemoteSources(myManager); } - public Map> players = new HashMap<>(); - private final AudioPlayerManager myManager = new DefaultAudioPlayerManager(); - public boolean hasPlayer(Guild guild) { return players.containsKey(guild.getId()); } diff --git a/src/main/java/com/bbn/hadder/commands/Command.java b/src/main/java/com/bbn/hadder/commands/Command.java index c1e87c3..83132c0 100644 --- a/src/main/java/com/bbn/hadder/commands/Command.java +++ b/src/main/java/com/bbn/hadder/commands/Command.java @@ -6,7 +6,12 @@ package com.bbn.hadder.commands; public interface Command { void executed(String[] args, CommandEvent event); + String[] labels(); + String description(); + String usage(); + + String example(); } diff --git a/src/main/java/com/bbn/hadder/commands/CommandEvent.java b/src/main/java/com/bbn/hadder/commands/CommandEvent.java index 6e75d45..dc6d222 100644 --- a/src/main/java/com/bbn/hadder/commands/CommandEvent.java +++ b/src/main/java/com/bbn/hadder/commands/CommandEvent.java @@ -9,7 +9,6 @@ import com.bbn.hadder.utils.EventWaiter; import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.entities.Message; -import net.dv8tion.jda.api.events.Event; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import javax.annotation.Nonnull; 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 9bb48f9..e251c95 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java @@ -66,6 +66,11 @@ public class AvatarCommand implements Command { @Override public String usage() { - return "user/id"; + return "[User]"; + } + + @Override + public String example() { + return "@Skidder"; } } 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 eb9a51e..26d9070 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java @@ -73,6 +73,11 @@ public class ClydeCommand implements Command { @Override public String usage() { - return "content"; + return "[Content]"; + } + + @Override + public String example() { + return "Hey I am Clyde"; } } 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 760c139..78d70fd 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java @@ -58,6 +58,11 @@ public class GifCommand implements Command { @Override public String usage() { - return "searchterm"; + return "[Term]"; + } + + @Override + public String example() { + return "Cute cat"; } } diff --git a/src/main/java/com/bbn/hadder/commands/fun/MemeCommand.java b/src/main/java/com/bbn/hadder/commands/fun/MemeCommand.java index 2c1918b..b9c3e0c 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/MemeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/MemeCommand.java @@ -57,6 +57,11 @@ public class MemeCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } diff --git a/src/main/java/com/bbn/hadder/commands/general/AboutCommand.java b/src/main/java/com/bbn/hadder/commands/general/AboutCommand.java index 3800836..be5d20d 100644 --- a/src/main/java/com/bbn/hadder/commands/general/AboutCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/AboutCommand.java @@ -34,6 +34,11 @@ public class AboutCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } diff --git a/src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java b/src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java index f2772e3..e3380f5 100644 --- a/src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java @@ -50,6 +50,11 @@ public class EqualsCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } 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 c564410..529cdf7 100644 --- a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java @@ -9,6 +9,7 @@ import net.dv8tion.jda.api.Permission; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import java.util.Optional; public class HelpCommand implements Command { @@ -59,14 +60,20 @@ public class HelpCommand implements Command { public void sendHelp(Command cmd, CommandEvent event) { if (!cmd.getClass().getPackageName().endsWith("owner") || (cmd.getClass().getPackageName().endsWith("owner") && (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")))) { - String name = cmd.labels()[0]; + String name = labels()[0]; + StringBuilder b = new StringBuilder(); + b.append(event.getMessageEditor().getTerm("commands.general.help.description")).append(" ").append(event.getMessageEditor().getTerm(cmd.description())).append("\n"); + if (cmd.usage() != null) { + b.append(event.getMessageEditor().getTerm("commands.general.help.usage")).append(" ").append(event.getRethink().getGuildPrefix(event.getGuild().getId())).append(name).append(" ").append(cmd.usage()).append("\n"); + } + if (cmd.example() != null) { + b.append(event.getMessageEditor().getTerm("commands.general.help.example")).append(" ").append(event.getRethink().getGuildPrefix(event.getGuild().getId())).append(name).append(" ").append(cmd.example()); + } event.getChannel().sendMessage(event.getMessageEditor().getMessage( - MessageEditor.MessageType.INFO, "", cmd.description()) - .setTitle(name.replaceFirst(String.valueOf(name.charAt(0)), String.valueOf(name.charAt(0)).toUpperCase())) - .addField(MessageEditor.getTerm(event, "commands.general.help.field.usage", "", ""), - event.getRethink().getUserPrefix(event.getAuthor().getId()) + cmd.labels()[0] + " " + event.getMessageEditor().getTerm(cmd.usage()), false) + MessageEditor.MessageType.INFO) + .setTitle(cmd.labels()[0]) + .setDescription(b.toString()) .build()).queue(); - } } @@ -82,6 +89,11 @@ public class HelpCommand implements Command { @Override public String usage() { - return "commands.general.help.help.label"; + return "[Command name]"; + } + + @Override + public String example() { + return "ban"; } } diff --git a/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java b/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java index cac20c5..8d5a65c 100644 --- a/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java @@ -37,6 +37,11 @@ public class InviteCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } diff --git a/src/main/java/com/bbn/hadder/commands/general/PingCommand.java b/src/main/java/com/bbn/hadder/commands/general/PingCommand.java index 8317a45..09d2ebe 100644 --- a/src/main/java/com/bbn/hadder/commands/general/PingCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/PingCommand.java @@ -31,6 +31,11 @@ public class PingCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } diff --git a/src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java b/src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java index a84d9f3..fb8cc4f 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java @@ -65,6 +65,11 @@ public class FeedbackCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } 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 6547861..42fa95d 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java @@ -99,6 +99,11 @@ public class GitHubCommand implements Command { @Override public String usage() { - return "username"; + return "[GH-name]"; + } + + @Override + public String example() { + return "GregTCLTK"; } } 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 9077d04..07381f7 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java @@ -21,7 +21,7 @@ public class ScreenShareCommand implements Command { try { if (vc.getIdLong() == Long.parseLong(args[0])) { event.getChannel().sendMessage(event.getMessageEditor().getMessage( - MessageEditor.MessageType.INFO, + MessageEditor.MessageType.INFO, "commands.misc.screenshare.success.title", "") .setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vc.getId() + "/").build()).queue(); return; @@ -82,6 +82,11 @@ public class ScreenShareCommand implements Command { @Override public String usage() { - return "vc-name/id"; + return "[Channel]"; + } + + @Override + public String example() { + return "Gaming-Lounge"; } } 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 de948d9..a6addca 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java @@ -92,6 +92,11 @@ public class BanCommand implements Command { @Override public String usage() { - return "user"; + return "[User(s)]"; + } + + @Override + public String example() { + return "@Skidder"; } } 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 2e9bc1f..1bcb4c5 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java @@ -97,6 +97,11 @@ public class ClearCommand implements Command { @Override public String usage() { - return "number"; + return "[Amount]"; + } + + @Override + public String example() { + return "69"; } } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java index c8e9fd3..e276391 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java @@ -93,6 +93,11 @@ public class EditRulesCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java index b85fee6..7dd147b 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java @@ -70,6 +70,11 @@ public class InviteDetectCommand implements Command { @Override public String usage() { - return ""; + return "[on/off]"; + } + + @Override + public String example() { + return "on"; } } 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 911bb52..84f8dcf 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java @@ -77,6 +77,11 @@ public class KickCommand implements Command { @Override public String usage() { - return "user"; + return "[User(s)]"; + } + + @Override + public String example() { + return "@Skidder"; } } 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 6a10aa2..e15d9f9 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java @@ -105,6 +105,11 @@ public class NickCommand implements Command { @Override public String usage() { - return "user+nickname"; + return "[User(s)] [New nickname]"; + } + + @Override + public String example() { + return "@Skidder Cutie"; } } 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 86f2c12..ea643f2 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java @@ -46,6 +46,11 @@ public class PrefixCommand implements Command { @Override public String usage() { - return "prefix"; + return "[New Prefix]"; + } + + @Override + public String example() { + return "!"; } } 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 416a26b..f6bd71b 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java @@ -117,6 +117,11 @@ public class RegionChangeCommand implements Command { @Override public String usage() { - return "region"; + return "[New region]"; + } + + @Override + public String example() { + return "frankfurt"; } } 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 9c914bb..7dedf44 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java @@ -95,6 +95,11 @@ public class RoleCommand implements Command { @Override public String usage() { - return "add/remove <@role> <@user>"; + return "[add/remove] [Role>] [User]"; + } + + @Override + public String example() { + return "add @Skidder @Epic-Gamer"; } } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java index 99cc13e..7566d92 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java @@ -230,6 +230,11 @@ public class RulesCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } 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 3371eec..80d926c 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/StarBoardCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/StarBoardCommand.java @@ -45,6 +45,11 @@ public class StarBoardCommand implements Command { @Override public String usage() { - return " [Needed stars]"; + return "[Channel] [Needed stars]"; + } + + @Override + public String example() { + return "#starboard 4"; } } diff --git a/src/main/java/com/bbn/hadder/commands/music/InfoCommand.java b/src/main/java/com/bbn/hadder/commands/music/InfoCommand.java index cf83fc7..e91f03e 100644 --- a/src/main/java/com/bbn/hadder/commands/music/InfoCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/InfoCommand.java @@ -40,6 +40,11 @@ public class InfoCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } diff --git a/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java b/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java index d9ab13d..e9cc692 100644 --- a/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java @@ -74,6 +74,11 @@ public class JoinCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } diff --git a/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java b/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java index c2a0398..351d6d2 100644 --- a/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java @@ -40,6 +40,11 @@ public class LeaveCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } 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 c0d4cf5..4ac8e80 100644 --- a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java @@ -52,6 +52,11 @@ public class PlayCommand implements Command { @Override public String usage() { - return "song"; + return "[Song URL/Name]"; + } + + @Override + public String example() { + return "Last Christmas"; } } diff --git a/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java b/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java index 60747f4..dea68a1 100644 --- a/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java @@ -44,6 +44,11 @@ public class QueueCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } diff --git a/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java b/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java index c0b94c3..c2265bd 100644 --- a/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java @@ -36,6 +36,11 @@ public class SkipCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } diff --git a/src/main/java/com/bbn/hadder/commands/music/StopCommand.java b/src/main/java/com/bbn/hadder/commands/music/StopCommand.java index 84bc911..b9336bc 100644 --- a/src/main/java/com/bbn/hadder/commands/music/StopCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/StopCommand.java @@ -39,6 +39,11 @@ public class StopCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java index e03e354..e66169e 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java @@ -24,7 +24,6 @@ public class AnalCommand implements Command { Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/anal/").build(); try { - Response response = caller.newCall(request).execute(); JSONObject json = new JSONObject(response.body().string()); JSONObject data = json.getJSONObject("data"); @@ -58,6 +57,11 @@ public class AnalCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java index 9458f57..3136a3e 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java @@ -24,7 +24,6 @@ public class BDSMCommand implements Command { Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/img/bdsm_lewd").build(); try { - Response response = caller.newCall(request).execute(); JSONObject json = new JSONObject(response.body().string()); JSONObject data = json.getJSONObject("data"); @@ -58,6 +57,11 @@ public class BDSMCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java index 661fb02..7f4302a 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java @@ -54,6 +54,11 @@ public class BlowjobCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java index 526299b..9ff9393 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java @@ -58,6 +58,11 @@ public class BoobsCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java index 55b33df..4eacd90 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java @@ -58,6 +58,11 @@ public class CumCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java index 21a5531..f3d8434 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java @@ -54,6 +54,11 @@ public class EroticCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java index b0d84f7..b3a56d4 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java @@ -58,6 +58,11 @@ public class FeetCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java index 0f176a8..983d6db 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java @@ -58,6 +58,11 @@ public class FingeringCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java index 8e3d25a..2219b45 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java @@ -58,6 +58,11 @@ public class LickingCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java index 50f7a72..32cabcb 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java @@ -58,6 +58,11 @@ public class PornCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java index 0cf188f..9e6410c 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java @@ -54,6 +54,11 @@ public class PussyCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java index 579cde8..ddc3d7e 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java @@ -62,6 +62,11 @@ public class RandomPornCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java index 2b77f97..1514b8e 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java @@ -31,8 +31,8 @@ public class SoloCommand implements Command { JSONObject response1 = data.getJSONObject("response"); String url = response1.toString().replace("{\"url\":\"", ""); -event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) -.setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Solo") .build()).queue(); @@ -58,6 +58,11 @@ event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEd @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java index fb9f993..12615ec 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java @@ -59,6 +59,11 @@ public class SpankCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java index 45cf9d6..f2c0c97 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java @@ -55,6 +55,11 @@ public class TransCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } 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 b05c5f1..c9758b4 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java @@ -5,7 +5,6 @@ package com.bbn.hadder.commands.owner; */ import com.bbn.hadder.Hadder; -import com.bbn.hadder.audio.AudioManager; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.core.Perm; @@ -33,19 +32,19 @@ public class EvalCommand implements Command { ex.printStackTrace(); } - engine.put("msg", event.getMessage()); - engine.put("shardmanager", Hadder.shardManager); - engine.put("rethink", event.getRethink()); - engine.put("event", event); - engine.put("jda", event.getJDA()); - engine.put("message", event.getMessage()); - engine.put("guild", event.getGuild()); - engine.put("channel", event.getChannel()); - engine.put("author", event.getAuthor()); - engine.put("member", event.getMember()); - engine.put("self", event.getGuild().getSelfMember()); - engine.put("audio", event.getAudioManager()); - engine.put("out", System.out); + engine.put("msg".toLowerCase(), event.getMessage()); + engine.put("shardmanager".toLowerCase(), Hadder.shardManager); + engine.put("rethink".toLowerCase(), event.getRethink()); + engine.put("event".toLowerCase(), event); + engine.put("jda".toLowerCase(), event.getJDA()); + engine.put("message".toLowerCase(), event.getMessage()); + engine.put("guild".toLowerCase(), event.getGuild()); + engine.put("channel".toLowerCase(), event.getChannel()); + engine.put("author".toLowerCase(), event.getAuthor()); + engine.put("member".toLowerCase(), event.getMember()); + engine.put("self".toLowerCase(), event.getGuild().getSelfMember()); + engine.put("audio".toLowerCase(), event.getAudioManager()); + engine.put("out".toLowerCase(), System.out); ScheduledExecutorService service = Executors.newScheduledThreadPool(1); @@ -103,6 +102,11 @@ public class EvalCommand implements Command { @Override public String usage() { - return "commands.owner.eval.help.usage"; + return "[Code]"; + } + + @Override + public String example() { + return "System.out.println(\"Hey\")"; } } 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 b35d07d..a38860f 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java @@ -46,6 +46,11 @@ public class GuildLeaveCommand implements Command { @Override public String usage() { - return "guildid"; + return "[Guild-ID]"; + } + + @Override + public String example() { + return "366971954244354048"; } } diff --git a/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java b/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java index 35a2377..72f1feb 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java @@ -29,6 +29,11 @@ public class RebootCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } diff --git a/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java b/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java index a002481..3245a42 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java @@ -33,6 +33,11 @@ public class ShutdownCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } diff --git a/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java b/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java index 58aaca5..64633f2 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java @@ -2,6 +2,7 @@ package com.bbn.hadder.commands.owner; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; +import com.bbn.hadder.commands.general.HelpCommand; import com.bbn.hadder.utils.MessageEditor.MessageType; /* @@ -27,6 +28,11 @@ public class TestCommand implements Command { @Override public String usage() { - return ""; + return null; + } + + @Override + public String example() { + return null; } } 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 3fbc1bb..6a8ca22 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java +++ b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java @@ -64,6 +64,11 @@ public class LanguageCommand implements Command { @Override public String usage() { - return "commands.settings.language.help.usage"; + return "[Language code]"; + } + + @Override + public String example() { + return "de"; } } 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 bf360fe..19d52e9 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java +++ b/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java @@ -36,6 +36,11 @@ public class UserPrefixCommand implements Command { @Override public String usage() { - return "userprefix"; + return "[New Prefix]"; + } + + @Override + public String example() { + return "!"; } } diff --git a/src/main/java/com/bbn/hadder/utils/MessageEditor.java b/src/main/java/com/bbn/hadder/utils/MessageEditor.java index c5b10fe..81b94c2 100644 --- a/src/main/java/com/bbn/hadder/utils/MessageEditor.java +++ b/src/main/java/com/bbn/hadder/utils/MessageEditor.java @@ -113,10 +113,7 @@ public class MessageEditor { return this.handle(rethink.getLanguage(user.getId()), string, extra, extra_two); } - public static String getTerm(CommandEvent event, String string, String extra, String extra_two) { - return new MessageEditor(null, null) - .handle(event.getRethink().getLanguage(event.getAuthor().getId()), string, extra, extra_two); - } + private String handle(String language_code, String string, String extra, String extra_two) { Locale locale = new Locale(language_code); diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index d8cfb15..2b77714 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -44,7 +44,9 @@ commands.general.equals.string.first = First string\: commands.general.equals.string.second = Second string\: commands.general.equals.string.result = Result\: commands.general.equals.help.description = Checks if two strings are the same. -commands.general.help.field.usage = Usage\: +commands.general.help.description = **Description:** +commands.general.help.usage = **Usage\:** +commands.general.help.example = **Example:** commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\! commands.general.help.help.description = Shows each command and explains its usage. commands.general.help.help.label = [CommandName]