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

Merge branch 'master' into i18n

Browse source
This commit is contained in:
Skidder 2019-12-31 13:52:33 +01:00 • committed by GitHub
commit 3fd5b0535c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
61 changed files with 465 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -10,7 +10,7 @@ Hadder Discord is a multi-purpose Discord bot with 100% uptime.
[![GitHub issues](https://img.shields.io/github/issues/BigBotNetwork/Hadder)](https://github.com/BigBotNetwork/Hadder/issues)
[![GitHub license](https://img.shields.io/github/license/BigBotNetwork/Hadder)](https://github.com/BigBotNetwork/Hadder/blob/master/LICENSE)
<a href="https://discordextremelist.xyz/bots/Hadder"><img src="https://discordextremelist.xyz/api/bot/637002314162372639/widget"/></a>
[![Discord Extreme List](https://api.discordextremelist.xyz/v1/bot/637002314162372639/widget)](https://discordextremelist.xyz/bots/Hadder)
[![Discord Bots](https://top.gg/api/widget/637002314162372639.svg)](https://top.gg/bot/637002314162372639)
[![Hadder's Widget](https://api.botlist.space/widget/637002314162372639/2 "Hadder's Widget")](https://botlist.space/bot/637002314162372639?utm_source=bls&utm_medium=widget&utm_campaign=637002314162372639)

18
pom.xml
View file

@ -19,7 +19,7 @@
<dependency>
<groupId>net.dv8tion</groupId>
<artifactId>JDA</artifactId>
<version>4.1.0_87</version>
<version>4.1.0_88</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
@ -31,16 +31,6 @@
<artifactId>rethinkdb-driver</artifactId>
<version>2.3.3</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.30</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
@ -61,7 +51,6 @@
<artifactId>lavaplayer</artifactId>
<version>1.3.32</version>
</dependency>
</dependencies>
<repositories>
@ -83,10 +72,6 @@
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
@ -125,6 +110,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>13</source>
<target>13</target>

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

@ -97,6 +97,7 @@ public class Hadder {
new InfoCommand(),
new SkipCommand(),
new EditRulesCommand(),
new VolumeCommand(),
new StopCommand()), config, helpCommand);
builder.addEventListeners(

17
src/main/java/com/bbn/hadder/audio/AudioManager.java
View file

@ -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,27 +25,17 @@ import java.util.concurrent.TimeUnit;
public class AudioManager {
public Map<String, Map.Entry<AudioPlayer, TrackManager>> players = new HashMap<>();
private final AudioPlayerManager myManager = new DefaultAudioPlayerManager();
public AudioManager() {
AudioSourceManagers.registerRemoteSources(myManager);
}
public Map<String, Map.Entry<AudioPlayer, TrackManager>> players = new HashMap<>();
private final AudioPlayerManager myManager = new DefaultAudioPlayerManager();
public boolean hasPlayer(Guild guild) {
return players.containsKey(guild.getId());
}
public void removePlayer(Guild g) {
System.out.println(players.toString());
players.remove(g.getId());
System.out.println(players.toString());
}
public Map<String, Map.Entry<AudioPlayer, TrackManager>> getPlayers () {
return players;
}
public AudioPlayer getPlayer(Guild guild) {
AudioPlayer p;
if (hasPlayer(guild)) {

5
src/main/java/com/bbn/hadder/commands/Command.java
View file

@ -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();
}

1
src/main/java/com/bbn/hadder/commands/CommandEvent.java
View file

@ -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;

7
src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java
View file

@ -66,6 +66,11 @@ public class AvatarCommand implements Command {
@Override
public String usage() {
return "user/id";
return "[User]";
}
@Override
public String example() {
return "@Skidder";
}
}

8
src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java
View file

@ -53,6 +53,7 @@ public class ClydeCommand implements Command {
e.printStackTrace();
}
webhook.delete().queue();
event.getMessage().delete().queue();
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
}
@ -72,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";
}
}

7
src/main/java/com/bbn/hadder/commands/fun/GifCommand.java
View file

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

7
src/main/java/com/bbn/hadder/commands/fun/MemeCommand.java
View file

@ -57,6 +57,11 @@ public class MemeCommand implements Command {
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

7
src/main/java/com/bbn/hadder/commands/general/AboutCommand.java
View file

@ -34,6 +34,11 @@ public class AboutCommand implements Command {
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

7
src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java
View file

@ -50,6 +50,11 @@ public class EqualsCommand implements Command {
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

26
src/main/java/com/bbn/hadder/commands/general/HelpCommand.java
View file

@ -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";
}
}

7
src/main/java/com/bbn/hadder/commands/general/InviteCommand.java
View file

@ -37,6 +37,11 @@ public class InviteCommand implements Command {
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

7
src/main/java/com/bbn/hadder/commands/general/PingCommand.java
View file

@ -31,6 +31,11 @@ public class PingCommand implements Command {
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

7
src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java
View file

@ -65,6 +65,11 @@ public class FeedbackCommand implements Command {
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

14
src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java
View file

@ -67,12 +67,15 @@ public class GitHubCommand implements Command {
event.getTextChannel().sendMessage(
event.getMessageEditor().getMessage(
MessageEditor.MessageType.ERROR,
"",
"commands.misc.github.api.error.title",
"commands.misc.github.api.error.description")
.build()
).queue();
} catch (JSONException e) {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "","commands.misc.github.user.error.description").build()).queue();
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
MessageEditor.MessageType.ERROR,
"commands.misc.github.user.error.title",
"commands.misc.github.user.error.description").build()).queue();
}
}
} else {
@ -99,6 +102,11 @@ public class GitHubCommand implements Command {
@Override
public String usage() {
return "username";
return "[GH name]";
}
@Override
public String example() {
return "GregTCLTK";
}
}

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

@ -16,31 +16,25 @@ 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])) {
if (args[0].matches("[0-9]*") && args.length==1 && args[0].length() == 18) {
if (event.getGuild().getVoiceChannelById(args[0]) != null) {
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) {
.setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + args[0] + "/").build()).queue();
} else {
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");
EmbedBuilder eb = event.getMessageEditor().getMessage(MessageType.WARNING, "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();
event.getChannel().sendMessage(eb.build()).queue();
new EventWaiter().newOnMessageEventWaiter(msgevent -> {
try {
int i = Integer.parseInt(msgevent.getMessage().getContentRaw());
@ -48,7 +42,6 @@ public class ScreenShareCommand implements Command {
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);
}
@ -82,6 +75,11 @@ public class ScreenShareCommand implements Command {
@Override
public String usage() {
return "vc-name/id";
return "[Channel]";
}
@Override
public String example() {
return "Gaming-Lounge";
}
}

15
src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java
View file

@ -35,14 +35,14 @@ public class BanCommand implements Command {
} else {
event.getTextChannel().sendMessage(
event.getMessageEditor().getMessage(
MessageEditor.MessageType.WARNING,
MessageEditor.MessageType.ERROR,
"commands.moderation.ban.error.title",
"commands.moderation.ban.myself.error.description").build()).queue();
}
} else {
event.getTextChannel().sendMessage
(event.getMessageEditor().getMessage(
MessageEditor.MessageType.WARNING,
MessageEditor.MessageType.ERROR,
"commands.moderation.ban.error.title",
"commands.moderation.ban.yourself.error.description").build()).queue();
}
@ -61,13 +61,13 @@ public class BanCommand implements Command {
} else {
event.getTextChannel().sendMessage(
event.getMessageEditor().getMessage(
MessageEditor.MessageType.WARNING,
MessageEditor.MessageType.ERROR,
"commands.moderation.ban.error.title",
"commands.moderation.ban.myself.error.description").build()).queue();
}
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
MessageEditor.MessageType.WARNING,
MessageEditor.MessageType.ERROR,
"commands.moderation.ban.error.title",
"commands.moderation.ban.yourself.error.description").build()).queue();
}
@ -92,6 +92,11 @@ public class BanCommand implements Command {
@Override
public String usage() {
return "user";
return "[User(s)]";
}
@Override
public String example() {
return "@Skidder";
}
}

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

@ -45,7 +45,7 @@ public class ClearCommand implements Command {
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();
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.clear.number.error.title", "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);
@ -73,7 +73,7 @@ public class ClearCommand implements Command {
} 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")
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.clear.message.error.title", "commands.moderation.clear.message.error.description")
.build()).queue();
}
}
@ -97,6 +97,11 @@ public class ClearCommand implements Command {
@Override
public String usage() {
return "number";
return "[Amount]";
}
@Override
public String example() {
return "69";
}
}

7
src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java
View file

@ -93,6 +93,11 @@ public class EditRulesCommand implements Command {
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

13
src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java
View file

@ -29,7 +29,7 @@ public class InviteDetectCommand implements Command {
.build()).queue();
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
MessageEditor.MessageType.WARNING,
MessageEditor.MessageType.ERROR,
"commands.moderation.invitedetect.activate.error.title",
"commands.moderation.invitedetect.activate.error.description")
.build()).queue();
@ -46,12 +46,14 @@ public class InviteDetectCommand implements Command {
.build()).queue();
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
MessageEditor.MessageType.WARNING,
MessageEditor.MessageType.ERROR,
"commands.moderation.invitedetect.deactivate.error.title",
"commands.moderation.invitedetect.deactivate.error.description")
.build()).queue();
}
break;
default:
event.getHelpCommand().sendHelp(this, event);
}
} else {
event.getHelpCommand().sendHelp(this, event);
@ -70,6 +72,11 @@ public class InviteDetectCommand implements Command {
@Override
public String usage() {
return "<on/off>";
return "[on/off]";
}
@Override
public String example() {
return "on";
}
}

15
src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java
View file

@ -35,12 +35,12 @@ public class KickCommand implements Command {
} else {
event.getTextChannel().sendMessage(
event.getMessageEditor().getMessage(
MessageEditor.MessageType.WARNING,
MessageEditor.MessageType.ERROR,
"commands.moderation.kick.error.title",
"commands.moderation.kick.myself.error.description").build()).queue();
}
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "commands.moderation.kick.error.title", "commands.moderation.kick.yourself.error.description").build()).queue();
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.kick.error.title", "commands.moderation.kick.yourself.error.description").build()).queue();
}
} else if (event.getMessage().getMentionedMembers().size() == 0) {
event.getHelpCommand().sendHelp(this, event);
@ -55,10 +55,10 @@ public class KickCommand implements Command {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
}
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "commands.moderation.kick.error.title", "commands.moderation.kick.myself.error.description").build()).queue();
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.kick.error.title", "commands.moderation.kick.myself.error.description").build()).queue();
}
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "commands.moderation.kick.error.title", "commands.moderation.kick.yourself.error.description").build()).queue();
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.kick.error.title", "commands.moderation.kick.yourself.error.description").build()).queue();
}
}
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.kick.success.title", "✅", "commands.moderation.kick.masskick.success.description", String.valueOf(event.getMessage().getMentionedMembers().size())).build()).queue();
@ -77,6 +77,11 @@ public class KickCommand implements Command {
@Override
public String usage() {
return "user";
return "[User(s)]";
}
@Override
public String example() {
return "@Skidder";
}
}

7
src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java
View file

@ -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";
}
}

8
src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java
View file

@ -13,7 +13,6 @@ public class PrefixCommand implements Command {
public void executed(String[] args, CommandEvent event) {
if (args.length == 1) {
if (!args[0].contains("\"")) {
event.getRethink().setGuildPrefix(args[0], event.getGuild().getId());
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
MessageEditor.MessageType.INFO,
@ -46,6 +45,11 @@ public class PrefixCommand implements Command {
@Override
public String usage() {
return "prefix";
return "[New Prefix]";
}
@Override
public String example() {
return "!";
}
}

11
src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java
View file

@ -18,7 +18,7 @@ public class RegionChangeCommand implements Command {
@Override
public void executed(String[] args, CommandEvent event) {
if (args.length == 1) {
if (event.getMember().hasPermission(Permission.MANAGE_SERVER) || event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) {
if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_SERVER)) {
switch (args[0].toLowerCase()) {
case "amsterdam":
setRegion(Region.AMSTERDAM, "Amsterdam", event);
@ -74,7 +74,7 @@ public class RegionChangeCommand implements Command {
case "us-south":
setRegion(Region.US_SOUTH, "US South", event);
break;
case "list":
default:
event.getTextChannel().sendMessage(
event.getMessageEditor().getMessage(
MessageEditor.MessageType.INFO,
@ -117,6 +117,11 @@ public class RegionChangeCommand implements Command {
@Override
public String usage() {
return "region";
return "[New region]";
}
@Override
public String example() {
return "frankfurt";
}
}

18
src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java
View file

@ -15,10 +15,8 @@ public class RoleCommand implements Command {
@Override
public void executed(String[] args, CommandEvent event) {
if (args.length > 0) {
if (event.getMember().hasPermission(Permission.MANAGE_ROLES)) {
String action = args[0].toLowerCase();
switch (action) {
if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_ROLES)) {
switch (args[0].toLowerCase()) {
case "add":
if (event.getMessage().getMentionedMembers().size() > 0 && event.getMessage().getMentionedRoles().size() > 0) {
for (Member member : event.getMessage().getMentionedMembers()) {
@ -66,7 +64,7 @@ public class RoleCommand implements Command {
event.getMessageEditor().getMessage(
MessageEditor.MessageType.INFO,
"commands.moderation.role.remove.success.title",
"✅",
"",
"",
"commands.moderation.role.remove.success.description",
String.valueOf(event.getMessage().getMentionedRoles().size()),
@ -74,6 +72,9 @@ public class RoleCommand implements Command {
.build()).queue();
}
break;
default:
event.getHelpCommand().sendHelp(this, event);
break;
}
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
@ -95,6 +96,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";
}
}

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

@ -88,7 +88,7 @@ public class RulesCommand implements Command {
} else {
event3.getChannel().sendMessage(
event.getMessageEditor().getMessage(
MessageEditor.MessageType.WARNING,
MessageEditor.MessageType.ERROR,
"commands.moderation.rules.role.error.title",
"commands.moderation.rules.role.error.description")
.build()).queue();
@ -104,7 +104,7 @@ public class RulesCommand implements Command {
} else {
event.getTextChannel().sendMessage(
event.getMessageEditor().getMessage(
MessageEditor.MessageType.WARNING,
MessageEditor.MessageType.ERROR,
"commands.moderation.rules.guild.error.title",
"commands.moderation.rules.guild.error.description")
.build()).queue();
@ -160,7 +160,7 @@ public class RulesCommand implements Command {
} else {
event.getTextChannel().sendMessage(
event.getMessageEditor().getMessage(
MessageEditor.MessageType.WARNING,
MessageEditor.MessageType.ERROR,
"commands.moderation.rules.emote.error.equal.title",
"commands.moderation.rules.emote.error.equal.description")
.build()).queue();
@ -205,7 +205,7 @@ public class RulesCommand implements Command {
} else {
event.getTextChannel().sendMessage(
event.getMessageEditor().getMessage(
MessageEditor.MessageType.WARNING,
MessageEditor.MessageType.ERROR,
"commands.moderation.rules.emote.error.equal.title",
"commands.moderation.rules.emote.error.equal.description")
.build()).queue();
@ -230,6 +230,11 @@ public class RulesCommand implements Command {
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

7
src/main/java/com/bbn/hadder/commands/moderation/StarBoardCommand.java
View file

@ -45,6 +45,11 @@ public class StarBoardCommand implements Command {
@Override
public String usage() {
return "<Channel id or channel mention> [Needed stars]";
return "[Channel] [Needed stars]";
}
@Override
public String example() {
return "#starboard 4";
}
}

7
src/main/java/com/bbn/hadder/commands/music/InfoCommand.java
View file

@ -40,6 +40,11 @@ public class InfoCommand implements Command {
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

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

@ -55,7 +55,7 @@ public class JoinCommand implements Command {
}
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
MessageEditor.MessageType.WARNING,
MessageEditor.MessageType.ERROR,
"commands.music.join.error.channel.title",
"commands.music.join.error.channel.description")
.build()).queue();
@ -74,6 +74,11 @@ public class JoinCommand implements Command {
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

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

@ -21,7 +21,7 @@ public class LeaveCommand implements Command {
.build()).queue();
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
MessageEditor.MessageType.WARNING,
MessageEditor.MessageType.ERROR,
"commands.music.leave.error.tile",
"commands.music.leave.error.description")
.build()).queue();
@ -40,6 +40,11 @@ public class LeaveCommand implements Command {
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

9
src/main/java/com/bbn/hadder/commands/music/PlayCommand.java
View file

@ -32,7 +32,7 @@ public class PlayCommand implements Command {
}
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
MessageEditor.MessageType.WARNING,
MessageEditor.MessageType.ERROR,
"commands.music.join.error.channel.title",
"commands.music.join.error.channel.description")
.build()).queue();
@ -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";
}
}

12
src/main/java/com/bbn/hadder/commands/music/QueueCommand.java
View file

@ -16,7 +16,7 @@ public class QueueCommand implements Command {
@Override
public void executed(String[] args, CommandEvent event) {
if (!event.getAudioManager().hasPlayer(event.getGuild()) || event.getAudioManager().getTrackManager(event.getGuild()).getQueuedTracks().isEmpty()) {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING,
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
"commands.music.queue.error.title",
"commands.music.queue.error.description"
).build()).queue();
@ -28,7 +28,8 @@ public class QueueCommand implements Command {
}
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
"commands.music.queue.success.title", "",
"commands.music.queue.success.description", builder.toString()).build()).queue();
"commands.music.queue.success.description", builder.toString())
.build()).queue();
}
}
@ -44,6 +45,11 @@ public class QueueCommand implements Command {
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

7
src/main/java/com/bbn/hadder/commands/music/SkipCommand.java
View file

@ -36,6 +36,11 @@ public class SkipCommand implements Command {
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

7
src/main/java/com/bbn/hadder/commands/music/StopCommand.java
View file

@ -39,6 +39,11 @@ public class StopCommand implements Command {
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

61
src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java Normal file
View file

@ -0,0 +1,61 @@
package com.bbn.hadder.commands.music;
import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.utils.MessageEditor;
/**
* @author Skidder / GregTCLTK
*/
public class VolumeCommand implements Command {
@Override
public void executed(String[] args, CommandEvent event) {
if (args.length > 0) {
if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) {
try {
int volume = Integer.parseInt(args[0]);
if (volume < 200 && volume > 0 || event.getConfig().getOwners().contains(event.getAuthor().getId())) {
event.getAudioManager().getPlayer(event.getGuild()).setVolume(volume);
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
"commands.music.volume.success.title", "",
"commands.music.volume.success.description", String.valueOf(volume)).build()).queue();
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
"commands.music.volume.error.int.title",
"commands.music.volume.error.int.description").build()).queue();
}
} catch (NumberFormatException e) {
event.getHelpCommand().sendHelp(this, event);
} catch (Exception e) {
e.printStackTrace();
}
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
"commands.music.info.error.title",
"commands.music.info.error.description").build()).queue();
}
} else event.getHelpCommand().sendHelp(this, event);
}
@Override
public String[] labels() {
return new String[]{"volume"};
}
@Override
public String description() {
return "Change the volume of the music.";
}
@Override
public String usage() {
return "[New volume]";
}
@Override
public String example() {
return "100";
}
}

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

@ -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;
}
}

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

@ -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;
}
}

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

@ -54,6 +54,11 @@ public class BlowjobCommand implements Command {
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

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

@ -58,6 +58,11 @@ public class BoobsCommand implements Command {
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

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

@ -58,6 +58,11 @@ public class CumCommand implements Command {
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

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

@ -54,6 +54,11 @@ public class EroticCommand implements Command {
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

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

@ -58,6 +58,11 @@ public class FeetCommand implements Command {
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

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

@ -58,6 +58,11 @@ public class FingeringCommand implements Command {
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

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

@ -58,6 +58,11 @@ public class LickingCommand implements Command {
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

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

@ -58,6 +58,11 @@ public class PornCommand implements Command {
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

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

@ -54,6 +54,11 @@ public class PussyCommand implements Command {
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

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

@ -62,6 +62,11 @@ public class RandomPornCommand implements Command {
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

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

@ -58,6 +58,11 @@ event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEd
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

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

@ -59,6 +59,11 @@ public class SpankCommand implements Command {
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

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

@ -55,6 +55,11 @@ public class TransCommand implements Command {
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

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

@ -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\")";
}
}

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

@ -27,7 +27,7 @@ public class GuildLeaveCommand implements Command {
.build())
.queue();
} catch (Exception e) {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "commands.owner.guildleave.error.title", "", "commands.owner.guildleave.help.description", guild.getName()).build()).queue();
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.owner.guildleave.error.title", "", "commands.owner.guildleave.help.description", guild.getName()).build()).queue();
}
} else {
event.getHelpCommand().sendHelp(this, event);
@ -46,6 +46,11 @@ public class GuildLeaveCommand implements Command {
@Override
public String usage() {
return "guildid";
return "[Guild-ID]";
}
@Override
public String example() {
return "366971954244354048";
}
}

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

@ -29,6 +29,11 @@ public class RebootCommand implements Command {
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

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

@ -33,6 +33,11 @@ public class ShutdownCommand implements Command {
@Override
public String usage() {
return "";
return null;
}
@Override
public String example() {
return null;
}
}

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

@ -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;
}
}

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

@ -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";
}
}

7
src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java
View file

@ -36,6 +36,11 @@ public class UserPrefixCommand implements Command {
@Override
public String usage() {
return "userprefix";
return "[New Prefix]";
}
@Override
public String example() {
return "!";
}
}

2
src/main/java/com/bbn/hadder/utils/BotList.java
View file

@ -24,7 +24,7 @@ public class BotList {
private static String DiscordBestBots = "https://discordsbestbots.xyz/api/bots/637002314162372639/stats";
private static String DiscordBoats = "https://discord.boats/api/bot/637002314162372639";
private static String YetAnotherBotList = "https://yabl.xyz/api/bot/637002314162372639/stats";
private static String DiscordExtremeList = "https://discordextremelist.xyz/api/bot/637002314162372639";
private static String DiscordExtremeList = "https://api.discordextremelist.xyz/v1/bot/637002314162372639";
private static String DiscordBotReviews = "https://discordbotreviews.xyz/api/bot/637002314162372639/stats";
private static String DiscordBots = "https://top.gg/api/bots/637002314162372639/stats";
private static String BotListSpace = "https://api.botlist.space/v1/bots/637002314162372639";

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

@ -113,11 +113,6 @@ 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);
ResourceBundle resourceBundle = ResourceBundle.getBundle("Translations/Translations", locale);