diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 45506be..b4f0ad9 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -98,8 +98,7 @@ public class Hadder { new ReadyListener(rethink, config), // new LinkListener(rethink), new InviteLinkListener(rethink), - new RulesListener(rethink), - new SomeoneListener()); + new RulesListener(rethink)); try { shardManager = builder.build(); 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 a4f28ad..0189cdd 100644 --- a/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java @@ -28,27 +28,27 @@ public class JoinCommand implements Command { .build()).queue(); } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) - .setTitle("Already connected") - .setDescription("I am already connected to your voice channel.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.error.connecting.already.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.error.connecting.already.description")) .build()).queue(); } } else { event.getGuild().getAudioManager().openAudioConnection(vc); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Successfully connected") - .setDescription("I successfully connected to " + vc.getName() + ".") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.success.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.success.description", vc.getName())) .build()).queue(); } } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) - .setTitle("Already trying to connect") - .setDescription("Hadder is already trying to connect. Please wait a moment.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.error.connecting.trying.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.error.connecting.trying.description")) .build()).queue(); } } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) - .setTitle("No Voice Channel") - .setDescription("You aren't in a Voice Channel.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.error.channel.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.error.channel.description")) .build()).queue(); } } @@ -60,7 +60,7 @@ public class JoinCommand implements Command { @Override public String description() { - return "Joins your voice channel"; + return MessageEditor.handle("en", "commands.music.join.help.description"); } @Override 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 cb47830..43bb467 100644 --- a/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java @@ -15,13 +15,13 @@ public class LeaveCommand implements Command { if (event.getGuild().getSelfMember().getVoiceState().inVoiceChannel()) { event.getGuild().getAudioManager().closeAudioConnection(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Successfully disconnected") - .setDescription("I successfully disconnected from the Voice Channel") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.leave.success.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.leave.success.description")) .build()).queue(); } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) - .setTitle("Not connected") - .setDescription("I'm currently in no Voice Channel on this Guild") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.leave.error.tile")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.leave.error.description")) .build()).queue(); } } @@ -33,7 +33,7 @@ public class LeaveCommand implements Command { @Override public String description() { - return "Leaves a voice channel"; + return MessageEditor.handle("en", "commands.music.leave.help.description"); } @Override 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 74faee4..b7e79a3 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java @@ -32,7 +32,7 @@ public class AnalCommand implements Command { String url = response1.toString().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Anal") .build()).queue(); @@ -42,7 +42,7 @@ public class AnalCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -53,7 +53,7 @@ public class AnalCommand implements Command { @Override public String description() { - return "Shows a random anal gif."; + return MessageEditor.handle("en", "commands.nsfw.anal.help.description"); } @Override 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 602fd22..59abceb 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java @@ -32,7 +32,7 @@ public class BDSMCommand implements Command { String url = response1.toString().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("Image not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.img.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("BDSM") .build()).queue(); @@ -42,7 +42,7 @@ public class BDSMCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -53,7 +53,7 @@ public class BDSMCommand implements Command { @Override public String description() { - return "Shows a random bdsm picture."; + return MessageEditor.handle("en", "commands.nsfw.bdsm.help.description"); } @Override 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 67bafb8..66b90f6 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java @@ -28,7 +28,7 @@ public class BlowjobCommand implements Command { String url = response.body().string().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("Image not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.img.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Blowjob") .build()).queue(); @@ -38,7 +38,7 @@ public class BlowjobCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -49,7 +49,7 @@ public class BlowjobCommand implements Command { @Override public String description() { - return "Shows a random Blowjob picture."; + return MessageEditor.handle("en", "commands.nsfw.blowjob.help.description"); } @Override 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 90625b4..9ecb843 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java @@ -32,7 +32,7 @@ public class BoobsCommand implements Command { String url = response1.toString().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Boobs") .build()).queue(); @@ -42,7 +42,7 @@ public class BoobsCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -53,7 +53,7 @@ public class BoobsCommand implements Command { @Override public String description() { - return "Shows a random boob gif."; + return MessageEditor.handle("en", "commands.nsfw.boobs.help.description"); } @Override 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 1bfae5e..00f9ea4 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java @@ -32,7 +32,7 @@ public class CumCommand implements Command { String url = response1.toString().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Cum") .build()).queue(); @@ -42,7 +42,7 @@ public class CumCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -53,7 +53,7 @@ public class CumCommand implements Command { @Override public String description() { - return "Shows a random cum gif."; + return MessageEditor.handle("en", "commands.nsfw.cum.help.description"); } @Override 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 8247ac6..2f828ab 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java @@ -28,7 +28,7 @@ public class EroticCommand implements Command { String url = response.body().string().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("Image not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.img.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Erotic") .build()).queue(); @@ -38,7 +38,7 @@ public class EroticCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -49,7 +49,7 @@ public class EroticCommand implements Command { @Override public String description() { - return "Shows a random erotic picture."; + return MessageEditor.handle("en", "commands.nsfw.erotic.help.description"); } @Override 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 8f99c18..b35d738 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java @@ -32,7 +32,7 @@ public class FeetCommand implements Command { String url = response1.toString().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Feet") .build()).queue(); @@ -42,7 +42,7 @@ public class FeetCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -53,7 +53,7 @@ public class FeetCommand implements Command { @Override public String description() { - return "Shows a random feet gif."; + return MessageEditor.handle("en", "commands.nsfw.feet.help.description"); } @Override 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 2e7f063..6bf3f5a 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java @@ -32,7 +32,7 @@ public class FingeringCommand implements Command { String url = response1.toString().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Fingering") .build()).queue(); @@ -42,7 +42,7 @@ public class FingeringCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -53,7 +53,7 @@ public class FingeringCommand implements Command { @Override public String description() { - return "Shows a random fingering gif."; + return MessageEditor.handle("en", "commands.nsfw.fingering.help.description"); } @Override 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 439af12..0ac7de6 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java @@ -32,7 +32,7 @@ public class LickingCommand implements Command { String url = response1.toString().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Licking") .build()).queue(); @@ -42,7 +42,7 @@ public class LickingCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -53,7 +53,7 @@ public class LickingCommand implements Command { @Override public String description() { - return "Shows a random licking gif."; + return MessageEditor.handle("en", "commands.nsfw.linking.help.description"); } @Override 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 53faacd..cb9ae94 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java @@ -32,7 +32,7 @@ public class PornCommand implements Command { String url = response1.toString().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Porn") .build()).queue(); @@ -42,7 +42,7 @@ public class PornCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -53,7 +53,7 @@ public class PornCommand implements Command { @Override public String description() { - return "Shows a random porn gif."; + return MessageEditor.handle("en", "commands.nsfw.porn.help.description"); } @Override 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 33f4638..9eefafb 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java @@ -28,7 +28,7 @@ public class PussyCommand implements Command { String url = response.body().string().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Pussy") .build()).queue(); @@ -38,7 +38,7 @@ public class PussyCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -49,7 +49,7 @@ public class PussyCommand implements Command { @Override public String description() { - return "Shows a random pussy gif."; + return MessageEditor.handle("en", "commands.nsfw.pussy.help.description"); } @Override 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 2cad8d7..0bbcccc 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java @@ -32,7 +32,7 @@ public class RandomPornCommand implements Command { String url = response1.toString().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Random Porn") .build()).queue(); @@ -42,7 +42,7 @@ public class RandomPornCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -53,7 +53,7 @@ public class RandomPornCommand implements Command { @Override public String description() { - return "Shows a completely random porn gif."; + return MessageEditor.handle("en", "commands.nsfw.randomporn.help.description"); } @Override 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 acc1b24..7641a83 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java @@ -32,7 +32,7 @@ public class SoloCommand implements Command { String url = response1.toString().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Solo") .build()).queue(); @@ -42,7 +42,7 @@ public class SoloCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -53,7 +53,7 @@ public class SoloCommand implements Command { @Override public String description() { - return "Shows a random solo gif."; + return MessageEditor.handle("en", "commands.nsfw.solo.help.description"); } @Override 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 a9362eb..e70a021 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java @@ -32,7 +32,7 @@ public class SpankCommand implements Command { String url = response1.toString().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("GIF not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Spank") .build()).queue(); @@ -42,7 +42,7 @@ public class SpankCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -53,7 +53,7 @@ public class SpankCommand implements Command { @Override public String description() { - return "Shows a random spank gif."; + return MessageEditor.handle("en", "commands.nsfw.spank.help.description"); } @Override 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 9c2b316..ac2cba3 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java @@ -28,7 +28,7 @@ public class TransCommand implements Command { String url = response.body().string().replace("{\"url\":\"", ""); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("Image not showing? Click here", url.replace("\"}", "")) + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.nsfw.img.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Trans") .build()).queue(); @@ -38,7 +38,7 @@ public class TransCommand implements Command { } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } @@ -49,7 +49,7 @@ public class TransCommand implements Command { @Override public String description() { - return "Shows a random trans picture."; + return MessageEditor.handle("en", "commands.nsfw.trans.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/listener/MentionListener.java b/src/main/java/com/bbn/hadder/listener/MentionListener.java index 3d46a3d..f5089e0 100644 --- a/src/main/java/com/bbn/hadder/listener/MentionListener.java +++ b/src/main/java/com/bbn/hadder/listener/MentionListener.java @@ -7,6 +7,7 @@ import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; import javax.annotation.Nonnull; +import java.util.Random; public class MentionListener extends ListenerAdapter { @@ -27,6 +28,11 @@ public class MentionListener extends ListenerAdapter { .addField("Prefix (User)", rethink.getUserPrefix(event.getAuthor().getId()), false) .addField("Prefix (Guild)", rethink.getGuildPrefix(event.getGuild().getId()), false) .build()).queue(); + } else if (event.getMessage().getContentRaw().equalsIgnoreCase("@someone")) { + int member = new Random().nextInt(event.getGuild().getMembers().size()-1); + if (member>0&&member0&&member