greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

Merge pull request #218 from BigBotNetwork/master

Browse source 
Joo
This commit is contained in:
Skidder 2019-12-18 17:27:59 +01:00 • committed by GitHub
commit 11422d6498
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 382 additions and 200 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pom.xml
View file

@ -25,7 +25,7 @@
<dependency>
<groupId>net.dv8tion</groupId>
<artifactId>JDA</artifactId>
<version>4.0.0_73</version>
<version>4.0.0_79</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
@ -45,12 +45,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.29</version>
<version>1.7.30</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.29</version>
<version>1.7.30</version>
</dependency>
<dependency>
<groupId>club.minnced</groupId>

1
src/main/java/com/bbn/hadder/Hadder.java
View file

@ -97,7 +97,6 @@ public class Hadder {
new ReadyListener(rethink, config),
new InviteLinkListener(rethink),
new RulesListener(rethink),
new SomeoneListener(),
new StarboardListener(rethink));
try {

87
src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java Normal file
View file

@ -0,0 +1,87 @@
package com.bbn.hadder.commands.misc;
import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.utils.EventWaiter;
import com.bbn.hadder.utils.MessageEditor;
import com.bbn.hadder.utils.MessageEditor.MessageType;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.VoiceChannel;
import java.util.List;
public class ScreenShareCommand implements Command {
@Override
public void executed(String[] args, CommandEvent event) {
if (args.length>0) {
if (args[0].matches("[0-9]*")&&args.length==1) {
for (VoiceChannel vc : event.getGuild().getVoiceChannels()) {
try {
if (vc.getIdLong() == Long.parseLong(args[0])) {
event.getChannel().sendMessage(event.getMessageEditor().getMessage(
MessageEditor.MessageType.INFO,
"commands.misc.screenshare.success.title", "")
.setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vc.getId() + "/").build()).queue();
return;
}
} catch (NumberFormatException e) {
event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.id.error.title", "commands.misc.screenshare.id.error.description").build()).queue();
event.getHelpCommand().sendHelp(this, event);
return;
}
}
} else {
List<VoiceChannel> vcs = event.getGuild().getVoiceChannelsByName(String.join(" ", args), true);
if (vcs.size() > 1) {
EmbedBuilder eb = event.getMessageEditor().getMessage(MessageType.ERROR, "commands.misc.screenshare.channel.error.title", "commands.misc.screenshare.channel.error.description");
for (int i = 0; i < vcs.size(); i++) {
VoiceChannel voiceChannel = vcs.get(i);
eb.addField(i + ": " + voiceChannel.getName(), voiceChannel.getId(), false);
}
event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).build()).queue();
new EventWaiter().newOnMessageEventWaiter(msgevent -> {
try {
int i = Integer.parseInt(msgevent.getMessage().getContentRaw());
if (vcs.size() > i) {
event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.misc.screenshare.success.title", "")
.setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vcs.get(i).getId() + "/").build()).queue();
} else {
event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.number.error.title", "").build()).queue();
event.getHelpCommand().sendHelp(this, event);
}
} catch (NumberFormatException e) {
event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.id.error.title", "commands.misc.screenshare.number.error.description").build()).queue();
event.getHelpCommand().sendHelp(this, event);
}
}, event.getJDA(), event.getAuthor());
} else if (vcs.size()==0) {
event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.channel.existing.error", "commands.misc.screenshare.channel.existing.description").build()).queue();
event.getHelpCommand().sendHelp(this, event);
} else {
event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.misc.screenshare.success.title", "")
.setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vcs.get(0).getId() + "/").build()).queue();
}
}
} else {
event.getHelpCommand().sendHelp(this, event);
}
}
@Override
public String[] labels() {
return new String[]{"screenshare"};
}
@Override
public String description() {
return "commands.misc.screenshare.help.description";
}
@Override
public String usage() {
return "vc-name/id";
}
}

48
src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java
View file

@ -22,35 +22,47 @@ public class ClearCommand implements Command {
if (args.length > 0) {
if (event.getGuild().getMemberById(event.getAuthor().getId()).hasPermission(Permission.MESSAGE_MANAGE) || event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) {
if (event.getGuild().getMemberById(event.getJDA().getSelfUser().getId()).hasPermission(Permission.MESSAGE_MANAGE)) {
if (args[0].equals("all")) {
List<Message> msg = event.getTextChannel().getIterableHistory().complete();
for (Message message : msg) {
message.delete().queue();
}
Message message = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
MessageEditor.MessageType.INFO,
"commands.moderation.lear.all.success.title",
"",
"commands.moderation.lear.all.success.description",
String.valueOf(msg.size()))
.build()).complete();
try {
TimeUnit.SECONDS.sleep(3);
} catch (InterruptedException e) {
e.printStackTrace();
}
message.delete().queue();
} else {
try {
int nbToDelete = Integer.parseInt(args[0]);
if(nbToDelete < 1 || nbToDelete > 99) {
event.getTextChannel().sendMessage(
event.getMessageEditor().getMessage(
MessageEditor.MessageType.WARNING,
"",
"commands.moderation.clear.number.error.description").build()).queue();
return;
}
List<Message> history = event.getTextChannel().getHistory().retrievePast(nbToDelete +1).complete();
List<Message> msgToDelete = new ArrayList<>();
msgToDelete.addAll(history);
if (nbToDelete < 1 || nbToDelete > 99) {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "", "commands.moderation.clear.number.error.description").build()).queue();
} else {
List<Message> history = event.getTextChannel().getHistory().retrievePast(nbToDelete + 1).complete();
List<Message> msgToDelete = new ArrayList<>(history);
event.getTextChannel().deleteMessages(msgToDelete).queue();
Message msg = event.getTextChannel().sendMessage(
event.getMessageEditor().getMessage(
MessageEditor.MessageType.INFO,
"",
"",
"commands.moderation.clear.success.description",
String.valueOf(nbToDelete)).build()).complete();
Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "", "", "commands.moderation.clear.success.description", String.valueOf(nbToDelete)).build()).complete();
try {
TimeUnit.SECONDS.sleep(2);
} catch (InterruptedException e) {
e.printStackTrace();
}
msg.delete().queue();
}
} catch (NumberFormatException e) {
event.getHelpCommand().sendHelp(this, event);
} catch (IllegalArgumentException e) {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "commands.moderation.clear.message.error.title", "commands.moderation.clear.message.error.description")
.build()).queue();
}
}
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();

2
src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java
View file

@ -68,7 +68,7 @@ public class RulesCommand implements Command {
MessageEditor.MessageType.INFO,
"commands.moderation.rules.rules.title",
"",
"commands.moderation.rules.rules.title",
"commands.moderation.rules.rules.description",
channel.getName())
.build()).queue();
new EventWaiter().newOnMessageEventWaiter(event2 -> {

33
src/main/java/com/bbn/hadder/commands/music/JoinCommand.java
View file

@ -31,28 +31,35 @@ public class JoinCommand implements Command {
vc.getName())
.build()).queue();
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING)
.setTitle("Already connected")
.setDescription("I am already connected to your voice channel.")
event.getTextChannel().sendMessage(
event.getMessageEditor().getMessage(
MessageEditor.MessageType.WARNING,
"commands.music.join.error.connecting.already.title",
"commands.music.join.error.connecting.already.description")
.build()).queue();
}
} else {
event.getGuild().getAudioManager().openAudioConnection(vc);
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
.setTitle("Successfully connected")
.setDescription("I successfully connected to " + vc.getName() + ".")
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
MessageEditor.MessageType.INFO,
"commands.music.join.success.title",
"",
"commands.music.join.success.description",
vc.getName())
.build()).queue();
}
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING)
.setTitle("Already trying to connect")
.setDescription("Hadder is already trying to connect. Please wait a moment.")
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
MessageEditor.MessageType.WARNING,
"commands.music.join.error.connecting.trying.title",
"commands.music.join.error.connecting.trying.description")
.build()).queue();
}
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING)
.setTitle("No Voice Channel")
.setDescription("You aren't in a Voice Channel.")
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
MessageEditor.MessageType.WARNING,
"commands.music.join.error.channel.title",
"commands.music.join.error.channel.description")
.build()).queue();
}
}
@ -64,7 +71,7 @@ public class JoinCommand implements Command {
@Override
public String description() {
return "Joins your voice channel";
return "commands.music.join.help.description";
}
@Override

16
src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java
View file

@ -14,14 +14,16 @@ public class LeaveCommand implements Command {
public void executed(String[] args, CommandEvent event) {
if (event.getGuild().getSelfMember().getVoiceState().inVoiceChannel()) {
event.getGuild().getAudioManager().closeAudioConnection();
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
.setTitle("Successfully disconnected")
.setDescription("I successfully disconnected from the Voice Channel")
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
MessageEditor.MessageType.INFO,
"commands.music.leave.success.title",
"commands.music.leave.success.description")
.build()).queue();
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING)
.setTitle("Not connected")
.setDescription("I'm currently in no Voice Channel on this Guild")
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
MessageEditor.MessageType.WARNING,
"commands.music.leave.error.tile",
"commands.music.leave.error.description")
.build()).queue();
}
}
@ -33,7 +35,7 @@ public class LeaveCommand implements Command {
@Override
public String description() {
return "Leaves a voice channel";
return "commands.music.leave.help.description";
}
@Override

6
src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java
View file

@ -32,7 +32,7 @@ public class AnalCommand implements Command {
String url = response1.toString().replace("{\"url\":\"", "");
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
.setAuthor("GIF not showing? Click here", url.replace("\"}", ""))
.setAuthor(event.getMessageEditor().getTerm("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(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue();
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(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 "commands.nsfw.anal.help.description";
}
@Override

8
src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java
View file

@ -32,7 +32,7 @@ public class BDSMCommand implements Command {
String url = response1.toString().replace("{\"url\":\"", "");
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
.setAuthor("Image not showing? Click here", url.replace("\"}", ""))
.setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
.setImage(url.replace("\"}", ""))
.setFooter("BDSM")
.build()).queue();
@ -42,18 +42,18 @@ public class BDSMCommand implements Command {
}
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue();
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
}
}
@Override
public String[] labels() {
return new String[]{"bdsm"};
return new String[] { "bdsm" };
}
@Override
public String description() {
return "Shows a random bdsm picture.";
return "commands.nsfw.bdsm.help.description";
}
@Override

6
src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java
View file

@ -28,7 +28,7 @@ public class BlowjobCommand implements Command {
String url = response.body().string().replace("{\"url\":\"", "");
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
.setAuthor("Image not showing? Click here", url.replace("\"}", ""))
.setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
.setImage(url.replace("\"}", ""))
.setFooter("Blowjob")
.build()).queue();
@ -38,7 +38,7 @@ public class BlowjobCommand implements Command {
}
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue();
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(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 "commands.nsfw.blowjob.help.description";
}
@Override

6
src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java
View file

@ -32,7 +32,7 @@ public class BoobsCommand implements Command {
String url = response1.toString().replace("{\"url\":\"", "");
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
.setAuthor("GIF not showing? Click here", url.replace("\"}", ""))
.setAuthor(event.getMessageEditor().getTerm("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(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue();
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(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 "commands.nsfw.boobs.help.description";
}
@Override

6
src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java
View file

@ -32,7 +32,7 @@ public class CumCommand implements Command {
String url = response1.toString().replace("{\"url\":\"", "");
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
.setAuthor("GIF not showing? Click here", url.replace("\"}", ""))
.setAuthor(event.getMessageEditor().getTerm("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(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue();
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(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 "commands.nsfw.cum.help.description";
}
@Override

6
src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java
View file

@ -28,7 +28,7 @@ public class EroticCommand implements Command {
String url = response.body().string().replace("{\"url\":\"", "");
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
.setAuthor("Image not showing? Click here", url.replace("\"}", ""))
.setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
.setImage(url.replace("\"}", ""))
.setFooter("Erotic")
.build()).queue();
@ -38,7 +38,7 @@ public class EroticCommand implements Command {
}
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue();
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(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 "commands.nsfw.erotic.help.description";
}
@Override

6
src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java
View file

@ -32,7 +32,7 @@ public class FeetCommand implements Command {
String url = response1.toString().replace("{\"url\":\"", "");
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
.setAuthor("GIF not showing? Click here", url.replace("\"}", ""))
.setAuthor(event.getMessageEditor().getTerm("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(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue();
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(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 "commands.nsfw.feet.help.description";
}
@Override

6
src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java
View file

@ -32,7 +32,7 @@ public class FingeringCommand implements Command {
String url = response1.toString().replace("{\"url\":\"", "");
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
.setAuthor("GIF not showing? Click here", url.replace("\"}", ""))
.setAuthor(event.getMessageEditor().getTerm("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(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue();
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(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 "commands.nsfw.fingering.help.description";
}
@Override

6
src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java
View file

@ -32,7 +32,7 @@ public class LickingCommand implements Command {
String url = response1.toString().replace("{\"url\":\"", "");
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
.setAuthor("GIF not showing? Click here", url.replace("\"}", ""))
.setAuthor(event.getMessageEditor().getTerm("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(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue();
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(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 "commands.nsfw.linking.help.description";
}
@Override

6
src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java
View file

@ -32,7 +32,7 @@ public class PornCommand implements Command {
String url = response1.toString().replace("{\"url\":\"", "");
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
.setAuthor("GIF not showing? Click here", url.replace("\"}", ""))
.setAuthor(event.getMessageEditor().getTerm("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(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue();
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(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 "commands.nsfw.porn.help.description";
}
@Override

6
src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java
View file

@ -28,7 +28,7 @@ public class PussyCommand implements Command {
String url = response.body().string().replace("{\"url\":\"", "");
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
.setAuthor("GIF not showing? Click here", url.replace("\"}", ""))
.setAuthor(event.getMessageEditor().getTerm("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(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue();
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(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 "commands.nsfw.pussy.help.description";
}
@Override

22
src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java
View file

@ -21,7 +21,8 @@ public class RandomPornCommand implements Command {
if (event.getTextChannel().isNSFW()) {
OkHttpClient caller = new OkHttpClient();
Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/all_tags/").build();
Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/all_tags/")
.build();
try {
@ -31,29 +32,32 @@ public class RandomPornCommand implements Command {
JSONObject response1 = data.getJSONObject("response");
String url = response1.toString().replace("{\"url\":\"", "");
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
.setAuthor("GIF not showing? Click here", url.replace("\"}", ""))
.setImage(url.replace("\"}", ""))
.setFooter("Random Porn")
.build()).queue();
event.getTextChannel()
.sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
.setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"),
url.replace("\"}", ""))
.setImage(url.replace("\"}", "")).setFooter("Random Porn").build())
.queue();
} catch (IOException e) {
e.printStackTrace();
}
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue();
event.getTextChannel()
.sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build())
.queue();
}
}
@Override
public String[] labels() {
return new String[]{"randomporn", "pornrandom"};
return new String[] { "randomporn", "pornrandom" };
}
@Override
public String description() {
return "Shows a completely random porn gif.";
return "commands.nsfw.randomporn.help.description";
}
@Override

8
src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java
View file

@ -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("GIF not showing? Click here", 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();
@ -42,7 +42,7 @@ public class SoloCommand implements Command {
}
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue();
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(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 "commands.nsfw.solo.help.description";
}
@Override

15
src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java
View file

@ -32,28 +32,29 @@ public class SpankCommand implements Command {
String url = response1.toString().replace("{\"url\":\"", "");
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
.setAuthor("GIF not showing? Click here", url.replace("\"}", ""))
.setImage(url.replace("\"}", ""))
.setFooter("Spank")
.build()).queue();
.setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"),
url.replace("\"}", ""))
.setImage(url.replace("\"}", "")).setFooter("Spank").build()).queue();
} catch (IOException e) {
e.printStackTrace();
}
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue();
event.getTextChannel()
.sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build())
.queue();
}
}
@Override
public String[] labels() {
return new String[]{"spank", "beat", "hit"};
return new String[] { "spank", "beat", "hit" };
}
@Override
public String description() {
return "Shows a random spank gif.";
return "commands.nsfw.spank.help.description";
}
@Override

15
src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java
View file

@ -28,28 +28,29 @@ public class TransCommand implements Command {
String url = response.body().string().replace("{\"url\":\"", "");
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
.setAuthor("Image not showing? Click here", url.replace("\"}", ""))
.setImage(url.replace("\"}", ""))
.setFooter("Trans")
.build()).queue();
.setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"),
url.replace("\"}", ""))
.setImage(url.replace("\"}", "")).setFooter("Trans").build()).queue();
} catch (IOException e) {
e.printStackTrace();
}
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING).setTitle("No NSFW").setDescription("You can only execute this command in NSFW channels!").build()).queue();
event.getTextChannel()
.sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build())
.queue();
}
}
@Override
public String[] labels() {
return new String[]{"trans"};
return new String[] { "trans" };
}
@Override
public String description() {
return "Shows a random trans picture.";
return "commands.nsfw.trans.help.description";
}
@Override

36
src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java
View file

@ -41,7 +41,6 @@ public class EvalCommand implements Command {
engine.put("author", event.getAuthor());
engine.put("member", event.getMember());
engine.put("self", event.getGuild().getSelfMember());
engine.put("System.out", System.out);
ScheduledExecutorService service = Executors.newScheduledThreadPool(1);
@ -54,21 +53,26 @@ public class EvalCommand implements Command {
String script = "";
for (int i = 0; i < args.length; i++) {
args[i] = args[i].replace("```java", "").replace("```", "");
script += i == args.length-1 ? args[i]:args[i]+" ";
script += i == args.length - 1 ? args[i] : args[i] + " ";
}
out = engine.eval(script);
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
.setTitle("Eval Command")
.addField("Input", "```java\n\n" + script + "```", false)
.addField("Output", "```java\n\n" + out.toString() + "```", false)
.addField("Timing", System.currentTimeMillis()-startExec + " milliseconds", false)
event.getTextChannel().sendMessage(event.getMessageEditor()
.getMessage(MessageEditor.MessageType.INFO, "commands.owner.eval.success.title", "")
.addField(event.getMessageEditor().getTerm("commands.owner.eval.success.input"),
"```java\n\n" + script + "```", false)
.addField(event.getMessageEditor().getTerm("commands.owner.eval.success.output"),
"```java\n\n" + out.toString() + "```", false)
.addField(event.getMessageEditor().getTerm("commands.owner.eval.success.timing"),
System.currentTimeMillis() - startExec + " milliseconds", false)
.build()).queue();
} catch (Exception ex) {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
.setTitle("Eval Command")
.addField("Error", "```java\n\n" + ex.getMessage() + "```", false)
.addField("Timing", System.currentTimeMillis()-startExec + " milliseconds", false)
event.getTextChannel().sendMessage(event.getMessageEditor()
.getMessage(MessageEditor.MessageType.INFO, "commands.owner.eval.success.title", "")
.addField(event.getMessageEditor().getTerm("error"),
"```java\n\n" + ex.getMessage() + "```", false)
.addField(event.getMessageEditor().getTerm("commands.owner.eval.success.timing"),
System.currentTimeMillis() - startExec + " milliseconds", false)
.build()).queue();
}
@ -81,22 +85,24 @@ public class EvalCommand implements Command {
event.getHelpCommand().sendHelp(this, event);
}
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
event.getTextChannel()
.sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build())
.queue();
}
}
@Override
public String[] labels() {
return new String[]{"eval"};
return new String[] { "eval" };
}
@Override
public String description() {
return "Execute the given code";
return "commands.owner.eval.help.description";
}
@Override
public String usage() {
return "<Code to execute>";
return "commands.owner.eval.help.usage";
}
}

20
src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java
View file

@ -17,30 +17,34 @@ public class GuildLeaveCommand implements Command {
if (args.length > 0) {
Guild guild = event.getJDA().getGuildById(args[0]);
guild.leave().queue();
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
.setTitle("Successfully left")
.setDescription("I successfully left " + guild.getName())
.build()).queue();
event.getTextChannel()
.sendMessage(event.getMessageEditor()
.getMessage(MessageEditor.MessageType.INFO, "commands.owner.guildleave.success.title",
"", "commands.owner.guildleave.success.description", guild.getName())
.build())
.queue();
} else {
event.getHelpCommand().sendHelp(this, event);
}
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
event.getTextChannel()
.sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build())
.queue();
}
}
@Override
public String[] labels() {
return new String[]{"guildleave"};
return new String[] { "guildleave" };
}
@Override
public String description() {
return "Quit from a guild";
return "commands.owner.guildleave.help.description";
}
@Override
public String usage() {
return "<Guild-ID>";
return "guildid";
}
}

2
src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java
View file

@ -27,7 +27,7 @@ public class RebootCommand implements Command {
@Override
public String description() {
return "Restart the bot";
return "commands.owner.reboot.help.description";
}
@Override

2
src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java
View file

@ -29,7 +29,7 @@ public class ShutdownCommand implements Command {
@Override
public String description() {
return "Shuts the Bot down";
return "commands.owner.shutdown.help.description";
}
@Override

6
src/main/java/com/bbn/hadder/commands/owner/TestCommand.java
View file

@ -2,6 +2,8 @@ package com.bbn.hadder.commands.owner;
import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.utils.MessageEditor;
import com.bbn.hadder.utils.MessageEditor.MessageType;
/*
* @author Skidder / GregTCLTK
@ -11,7 +13,7 @@ public class TestCommand implements Command {
@Override
public void executed(String[] args, CommandEvent event) {
event.getTextChannel().sendMessage("TEST my friends").queue();
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageType.INFO, "commands.owner.test.success", "").build()).queue();
}
@Override
@ -21,7 +23,7 @@ public class TestCommand implements Command {
@Override
public String description() {
return "Just a little Test Command";
return "commands.owner.test.help.description";
}
@Override

19
src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java
View file

@ -41,26 +41,29 @@ public class LanguageCommand implements Command {
}
}
public void setLanguage(String language_code, String language , CommandEvent event) {
public void setLanguage(String language_code, String language, CommandEvent event) {
event.getRethink().setLanguage(event.getAuthor().getId(), language_code);
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
.setTitle("Language set")
.setDescription(language + " is your new language now.")
.build()).queue();
event.getTextChannel()
.sendMessage(
event.getMessageEditor()
.getMessage(MessageEditor.MessageType.INFO, "commands.settings.language.success.title",
"", "commands.settings.language.success.description", language)
.build())
.queue();
}
@Override
public String[] labels() {
return new String[]{"language"};
return new String[] { "language" };
}
@Override
public String description() {
return "Sets the new primary language for a user.";
return "commands.settings.language.help.description";
}
@Override
public String usage() {
return "<Language code>";
return "commands.settings.language.help.usage";
}
}

14
src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java
View file

@ -8,13 +8,17 @@ import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.utils.MessageEditor;
public class PrefixCommand implements Command {
public void executed(String[] args, CommandEvent event) {
if (args.length == 1) {
event.getRethink().setUserPrefix(args[0], event.getAuthor().getId());
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO).setTitle("✅ Successfully set ✅").setDescription("I successfully set the new prefix for you to " + args[0]).build()).queue();
event.getTextChannel()
.sendMessage(event.getMessageEditor()
.getMessage(MessageEditor.MessageType.INFO, "commands.settings.prefix.success.title", "",
"commands.settings.prefix.success.description", args[0])
.build())
.queue();
} else {
event.getHelpCommand().sendHelp(this, event);
}
@ -22,16 +26,16 @@ public class PrefixCommand implements Command {
@Override
public String[] labels() {
return new String[]{"prefix"};
return new String[] { "prefix" };
}
@Override
public String description() {
return "Sets a new Prefix";
return "commands.settings.prefix.help.description";
}
@Override
public String usage() {
return "<New Prefix>";
return "prefix";
}
}

5
src/main/java/com/bbn/hadder/listener/MentionListener.java
View file

@ -30,6 +30,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&&member<event.getGuild().getMembers().size()) {
event.getChannel().sendMessage(event.getGuild().getMembers().get(member).getAsMention()+ " (Executed by: "+event.getAuthor().getAsTag()+")").queue();
}
}
}
}

24
src/main/java/com/bbn/hadder/listener/SomeoneListener.java
View file

@ -1,24 +0,0 @@
/*
* @author Hax / Hax6775 / Schlauer_Hax
*/
package com.bbn.hadder.listener;
import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import javax.annotation.Nonnull;
import java.util.Random;
public class SomeoneListener extends ListenerAdapter {
@Override
public void onGuildMessageReceived(@Nonnull GuildMessageReceivedEvent event) {
if (event.getMessage().getContentRaw().equalsIgnoreCase("@someone")) {
int member = new Random().nextInt(event.getGuild().getMembers().size()-1);
if (member>0&&member<event.getGuild().getMembers().size()) {
event.getChannel().sendMessage(event.getGuild().getMembers().get(member).getAsMention()+ " (Executed by: "+event.getAuthor().getAsTag()+")").queue();
}
}
}
}

12
src/main/java/com/bbn/hadder/utils/MessageEditor.java
View file

@ -47,7 +47,8 @@ public class MessageEditor {
WARNING,
INFO,
NO_PERMISSION,
NO_SELF_PERMISSION
NO_SELF_PERMISSION,
NO_NSFW
}
private EmbedBuilder getDefaultSettings(MessageType type) {
@ -91,6 +92,15 @@ public class MessageEditor {
.setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png")
.setTimestamp(Instant.now());
break;
case NO_NSFW:
builder
.setTitle("⛔ No NSFW ⛔")
.setDescription("You can only execute this command in NSFW channels!")
.setColor(Color.RED)
.setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png")
.setTimestamp(Instant.now());
break;
}
return builder;
}

63
src/main/resources/Translations/Translations_en.properties
View file

@ -10,11 +10,13 @@ Hadder = Hadder
searchterm = <SearchTerm>
username = <Username>
number = <Number>
number = <Number>/all
guildprefix = <New Guild-Prefix>
prefix = <New Prefix>
vc-name/id = <VoiceChannelID|VoiceChannelName>
user+nickname = <@user> <New Nickname>
region = <region>
guildid = <Guild-ID>
error = Error
none = None
@ -88,8 +90,12 @@ commands.moderation.ban.myself.error.description = I can not ban myself!
commands.moderation.ban.yourself.error.description = You can not ban yourself!
commands.moderation.ban.massban.success.description = I successfully baned %extra% Members!
commands.moderation.ban.help.description = Bans one ore more user from the server
commands.moderation.lear.all.success.title = Successfully deleted
commands.moderation.lear.all.success.description = I successfully deleted %extra% messages.
commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99!
commands.moderation.clear.success.description = Successfully deleted %extra% messages.
commands.moderation.clear.message.error.title = No messages!
commands.moderation.clear.message.error.description = There are no messages in this channel.
commands.moderation.clear.help.description = Deletes the specified number of messages.
commands.moderation.prefix.success.title = %extra% Successfully set %extra%
commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to %extra%
@ -157,7 +163,60 @@ commands.moderation.rules.emote.error.equal.description = The 1st and 2nd emote
commands.moderation.rules.emoji.decline.description = The first emote has been successfully set. Please send me now the decline emote.
commands.moderation.rules.emoji.error.description = The given emote can't be used.
commands.moderation.rules.help.description = Setup the rules on your Discord server
commands.moderation.starboard.successchannel=Successfully set the Channel!
commands.music.join.success.title = Successfully connected
commands.music.join.success.description = I successfully connected to %extra%.
commands.moderation.starboard.successchannel=Successfully set the Channel!
commands.music.join.error.connecting.already.title = Already connected
commands.music.join.error.connecting.already.description = I am already connected to your voice channel.
commands.music.join.error.connecting.trying.title = Already trying to connect
commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment.
commands.music.join.error.channel.title = No Voice Channel
commands.music.join.error.channel.description = You aren't in a Voice Channel.
commands.music.join.help.description = Joins your voice channel
commands.music.leave.success.title = = Successfully disconnected
commands.music.leave.success.description = I successfully disconnected from the Voice Channel
commands.music.leave.error.tile = Not connected
commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild
commands.music.leave.help.description = Leaves a voice channel
commands.nsfw.gif.error.title = GIF not showing? Click here
commands.nsfw.img.error.title = Image not showing? Click here
commands.nsfw.anal.help.description = Shows a random anal gif.
commands.nsfw.bdsm.help.description = Shows a random BDSM picture.
commands.nsfw.blowjob.help.description = Shows a random Blowjob picture.
commands.nsfw.boobs.help.description = Shows a random boob gif.
commands.nsfw.cum.help.description = Shows a random cum gif.
commands.nsfw.erotic.help.description = Shows a random erotic picture.
commands.nsfw.feet.help.description = Shows a random feet gif.
commands.nsfw.fingering.help.description = Shows a random fingering gif.
commands.nsfw.linking.help.description = Shows a random licking gif.
commands.nsfw.porn.help.description = Shows a random porn gif.
commands.nsfw.pussy.help.description = Shows a random pussy gif.
commands.nsfw.randomporn.help.description = Shows a completely random porn gif.
commands.nsfw.solo.help.description = Shows a random solo gif.
commands.nsfw.spank.help.description = Shows a random spank gif.
commands.nsfw.trans.help.description = Shows a random trans picture.
commands.owner.eval.success.title = Eval Command
commands.owner.eval.success.input = Input
commands.owner.eval.success.output = Output
commands.owner.eval.success.timing = Timing
commands.owner.eval.help.description = Execute the given code
commands.owner.eval.help.usage = <Code to execute>
commands.owner.guildleave.success.title = Successfully left
commands.owner.guildleave.success.description = I successfully left %extra%.
commands.owner.guildleave.help.description = Quit from a guild
commands.owner.reboot.help.description = Restart the bot
commands.owner.shutdown.success.title = Shutdown
commands.owner.shutdown.help.description = Shuts the Bot down
commands.owner.test.success = TEST my friends
commands.owner.test.help.description = Just a little Test Command
commands.settings.language.success.title = Language set
commands.settings.language.success.description = %extra% is your new language now.
commands.settings.language.help.description = Sets the new primary language for a user.
commands.settings.language.help.usage = <Language code>
commands.settings.prefix.success.title = %extra% Successfully set %extra%
commands.settings.prefix.success.description = I successfully set the new prefix for you to %extra%.
commands.settings.prefix.help.description = Sets a new Prefix