Merge remote-tracking branch 'origin/greg-dev' into hax-dev

This commit is contained in:
Hax 2020-01-03 14:46:32 +01:00
commit be29fe5575
22 changed files with 206 additions and 175 deletions

View file

@ -9,6 +9,7 @@ Hadder Discord is a multi-purpose Discord bot with 100% uptime.
[![Crowdin](https://badges.crowdin.net/e/bc0babde730eb3eada34778502a31b03/localized.svg)](https://bbn.crowdin.com/hadder)
[![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)
[![time tracker](https://wakatime.com/badge/github/BigBotNetwork/Hadder.svg)](https://wakatime.com/badge/github/BigBotNetwork/Hadder)
[![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)
@ -21,3 +22,38 @@ Hax#6775
### Designer
TopComp#1288
## A few commands
| **Command** | **Description** |
|----------------|---------------------------------------------------------------|
| h.help | Shows each command and explains its usage. |
| h.about | Shows information about Hadder. |
| h.equals | Checks if two strings are the same. |
| h.invite | Shows the invitation link to invite Hadder to your server. |
| h.ping | Shows the ping to the Discord API. |
| h.avatar | Sends the avatar of the specified member. |
| h.gif | Looks for a GIF on Giphy. |
| h.meme | Sends you a random meme. |
| h.clyde | Sends a message as a webhook named Clyde. |
| h.feedback | Sends feedback directly to the developers. |
| h.github | Displays information about a GitHub user profile. |
| h.screenshare | Shows you the link to share your screen. |
| h.ban | Bans one or more users from the server. |
| h.clear | Deletes the specified number of messages. |
| h.prefix | Sets the Guild-Prefix. |
| h.invitedetect | Activate or deactivate the Discord invite link detection. |
| h.kick | Kicks one or more user from the server. |
| h.nick | Rename a one or more user. |
| h.regionchange | Changes the server region to locked regions. |
| h.role | Adds and removes one or more role(s) from one or more user(s) |
| h.rules | Setup the rules on your Discord server |
| h.starboard | Sets the starboard channel. |
| h.editrules | Edits the rules message. |
| h.join | Joins your voice channel. |
| h.leave | Leaves your voice channel. |
| h.play | Plays the specified song. |
| h.stop | Stops the song. |
| h.info | Shows information about the playing song. |
| h.queue | Shows the music queue. |
| h.skip | Skips the currently playing song. |
| h.volume | Change the volume of the music. |

View file

@ -19,7 +19,8 @@
"DiscordExtremeList": "",
"DiscordBotReviews": "",
"DiscordBots": "",
"BotListSpace": ""
"BotListSpace": "",
"DiscordBots2": ""
},
"Clyde": ""
}

View file

@ -19,7 +19,7 @@
<dependency>
<groupId>net.dv8tion</groupId>
<artifactId>JDA</artifactId>
<version>4.1.0_88</version>
<version>4.1.0_90</version>
</dependency>
<dependency>
<groupId>org.json</groupId>

View file

@ -92,14 +92,14 @@ public class Hadder {
new LanguageCommand(),
new ClydeCommand(),
new PlayCommand(),
new StarBoardCommand(),
new StarboardCommand(),
new QueueCommand(),
new InfoCommand(),
new SkipCommand(),
new EditRulesCommand(),
new VolumeCommand(),
new StopCommand(),
new BlackListCommand()), config, helpCommand);
new BlacklistCommand()), config, helpCommand);
builder.addEventListeners(
new MentionListener(rethink),

View file

@ -144,11 +144,11 @@ public class Rethink {
return (String) this.get("user", "id", id, "blacklisted");
}
public void setNeededstars(String stars, String guild_id) {
public void setNeededStars(String stars, String guild_id) {
this.update("server", guild_id, "neededstars", stars);
}
public String getNeededstars(String guild_id) {
public String getNeededStars(String guild_id) {
return (String) this.get("server", "id", guild_id, "neededstars");
}
@ -164,8 +164,8 @@ public class Rethink {
return !this.get("server", "id", guild_id, "starboard").equals("");
}
public void insertStarboardMessage(String message_id, String guild_id, String starboardmessageid) {
this.insert("stars", r.hashMap("id", message_id).with("guild", guild_id).with("starboardmsg", starboardmessageid));
public void insertStarboardMessage(String message_id, String guild_id, String starboard_message_id) {
this.insert("stars", r.hashMap("id", message_id).with("guild", guild_id).with("starboardmsg", starboard_message_id));
}
public String getStarboardMessage(String message_id) {

View file

@ -30,9 +30,9 @@ public class ClearCommand implements Command {
}
Message message = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
MessageEditor.MessageType.INFO,
"commands.moderation.lear.all.success.title",
"commands.moderation.clear.all.success.title",
"",
"commands.moderation.lear.all.success.description",
"commands.moderation.clear.all.success.description",
String.valueOf(msg.size()))
.build()).complete();
try {

View file

@ -5,7 +5,7 @@ import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.entities.TextChannel;
public class StarBoardCommand implements Command {
public class StarboardCommand implements Command {
@Override
public void executed(String[] args, CommandEvent event) {
@ -29,7 +29,7 @@ public class StarBoardCommand implements Command {
}
if (args.length==2) {
event.getRethink().setNeededstars(args[1], event.getGuild().getId());
event.getRethink().setNeededStars(args[1], event.getGuild().getId());
}
}
@ -40,7 +40,7 @@ public class StarBoardCommand implements Command {
@Override
public String description() {
return "Sets the starboard channel";
return "commands.moderation.starboard.help.description";
}
@Override

View file

@ -16,7 +16,7 @@ public class VolumeCommand implements Command {
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())) {
if (volume < 201 && volume > 0 || event.getConfig().getOwners().contains(event.getAuthor().getIdLong())) {
event.getAudioManager().getPlayer(event.getGuild()).setVolume(volume);
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
"commands.music.volume.success.title", "",
@ -46,7 +46,7 @@ public class VolumeCommand implements Command {
@Override
public String description() {
return "Change the volume of the music.";
return "commands.music.volume.help.description";
}
@Override

View file

@ -1,15 +1,14 @@
package com.bbn.hadder.commands.owner;
/*
* @author Hax / Hax6775 / Schlauer_Hax
*/
package com.bbn.hadder.commands.owner;
import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.core.Perm;
import com.bbn.hadder.core.Perms;
import com.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.User;
@ -19,7 +18,7 @@ import java.util.LinkedHashSet;
import java.util.List;
@Perms(Perm.BOT_OWNER)
public class BlackListCommand implements Command {
public class BlacklistCommand implements Command {
@Override
public void executed(String[] args, CommandEvent event) {
@ -32,7 +31,7 @@ public class BlackListCommand implements Command {
Member member = event.getMessage().getMentionedMembers().get(0);
String blacklisted = event.getRethink().getBlackListed(member.getId());
List<String> commands = new ArrayList<>();
if (!blacklisted.equals("none")) commands.addAll(Arrays.asList(blacklisted.split(",")));
if (!"none".equals(blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(",")));
commands.addAll(Arrays.asList(args[1].split(",")));
LinkedHashSet<String> hashSet = new LinkedHashSet<>(commands);
@ -46,12 +45,13 @@ public class BlackListCommand implements Command {
.build()).queue();
}
break;
case "remove":
if (args.length == 3) {
Member member = event.getMessage().getMentionedMembers().get(0);
String blacklisted = event.getRethink().getBlackListed(member.getId());
List<String> commands = new ArrayList<>();
if (!blacklisted.equals("none")) commands.addAll(Arrays.asList(blacklisted.split(",")));
if (!"none".equals(blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(",")));
commands.removeAll(Arrays.asList(args[1].split(",")));
LinkedHashSet<String> hashSet = new LinkedHashSet<>(commands);
@ -65,13 +65,14 @@ public class BlackListCommand implements Command {
.build()).queue();
}
break;
case "list":
StringBuilder stringBuilder = new StringBuilder();
for (User user : event.getJDA().getUsers()) {
if (!user.getId().equals(event.getJDA().getSelfUser().getId())) {
String blacklisted = event.getRethink().getBlackListed(user.getId());
if (!blacklisted.equals("none")) {
stringBuilder.append(user.getAsTag() + " (" + user.getId() + ") - " + blacklisted + "\n");
if (!"none".equals(blacklisted)) {
stringBuilder.append(user.getAsTag()).append(" (").append(user.getId()).append(") - ").append(blacklisted).append("\n");
}
}
}
@ -81,6 +82,10 @@ public class BlackListCommand implements Command {
.setDescription((stringBuilder.length()!=0) ? ("``" + stringBuilder.toString() + "``") : "No blacklisted Users")
.build()).queue();
break;
default:
event.getHelpCommand().sendHelp(this, event);
break;
}
}
}
@ -92,16 +97,16 @@ public class BlackListCommand implements Command {
@Override
public String description() {
return null;
return "commands.owner.blacklist.help.description";
}
@Override
public String usage() {
return "add|remove|list Commands @Skidder#6775";
return "add|remove|list command @User";
}
@Override
public String example() {
return null;
return "add solo @Skidder";
}
}

View file

@ -50,7 +50,7 @@ public class CommandHandler {
boolean run = true;
String blacklisted = rethink.getBlackListed(event.getAuthor().getId());
if (!blacklisted.equals("none")) {
if (!"none".equals(blacklisted)) {
for (String blacklistedlabel : blacklisted.split(",")) {
if (Arrays.asList(cmd.labels()).contains(blacklistedlabel)) {
run = false;

View file

@ -115,10 +115,6 @@ public class Config {
return config.getJSONObject("Tokens").getString("DiscordBotList");
}
public String getDiscordBestBotsToken() {
return config.getJSONObject("Tokens").getString("DiscordBestBots");
}
public String getDiscordBoatsToken() {
return config.getJSONObject("Tokens").getString("DiscordBoats");
}
@ -143,6 +139,14 @@ public class Config {
return config.getJSONObject("Tokens").getString("BotListSpace");
}
public String getDiscordBots2Token() {
return config.getJSONObject("Tokens").getString("DiscordBots2");
}
public String getCloudListToken() {
return config.getJSONObject("Tokens").getString("CloudList");
}
public String getClydeName() {
return config.getString("Clyde");
}

View file

@ -43,7 +43,7 @@ public class StarboardListener extends ListenerAdapter {
}
}
if (Integer.parseInt(rethink.getNeededstars(event.getGuild().getId())) <= stars) {
if (Integer.parseInt(rethink.getNeededStars(event.getGuild().getId())) <= stars) {
event.getGuild().getTextChannelById(rethink.getStarboardChannel(event.getGuild().getId()))
.sendMessage(new MessageBuilder()
.setContent("⭐ 1" + " " + event.getTextChannel().getAsMention())
@ -77,7 +77,7 @@ public class StarboardListener extends ListenerAdapter {
.retrieveMessageById(rethink.getStarboardMessage(event.getMessageId())).queue(
msg2 -> {
if (Integer.parseInt(rethink.getNeededstars(event.getGuild().getId())) <= finalStars) {
if (Integer.parseInt(rethink.getNeededStars(event.getGuild().getId())) <= finalStars) {
msg2.editMessage(new MessageBuilder()
.setContent("" + finalStars + " " + event.getTextChannel().getAsMention())
.setEmbed(

View file

@ -18,7 +18,7 @@ public class VoiceLeaveListener extends ListenerAdapter {
@Override
public void onGuildVoiceLeave(GuildVoiceLeaveEvent event) {
if (new AudioManager().hasPlayer(event.getGuild()) && event.getChannelLeft().getMembers().equals(event.getGuild().getSelfMember())) {
if (audioManager.hasPlayer(event.getGuild()) && event.getChannelLeft().getMembers().equals(event.getGuild().getSelfMember())) {
audioManager.players.remove(event.getGuild().getId());
audioManager.getPlayer(event.getGuild()).destroy();
audioManager.getTrackManager(event.getGuild()).purgeQueue();

View file

@ -21,13 +21,14 @@ public class BotList {
private static String MythicalBotList = "https://mythicalbots.xyz/api/bot/637002314162372639";
private static String BotsForDiscord = "https://botsfordiscord.com/api/bot/637002314162372639";
private static String DiscordBotList = "https://discordbotlist.com/api/bots/637002314162372639/stats";
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://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";
private static String DiscordBots2 = "https://discord.bots.gg/api/v1/bots/637002314162372639/stats";
private static String CloudList = "https://www.cloudlist.xyz/api/stats/637002314162372639";
private Config config;
@ -41,8 +42,10 @@ public class BotList {
json.put("server_count", Hadder.shardManager.getGuilds().size());
json.put("guildCount", Hadder.shardManager.getGuilds().size());
json.put("guilds", Hadder.shardManager.getGuilds().size());
json.put("count", Hadder.shardManager.getGuilds().size());
json.put("users", Hadder.shardManager.getUsers().size());
json.put("shard_count", Hadder.shardManager.getShards().size());
json.put("shardCount", Hadder.shardManager.getShards().size());
RequestBody body = RequestBody.create(MediaType.parse("application/json"), json.toString());
@ -91,21 +94,6 @@ public class BotList {
e.printStackTrace();
}
// Discord Best Bots
Request discordbestbots = new Request.Builder()
.url(DiscordBestBots)
.post(body)
.addHeader("Authorization", config.getDiscordBestBotsToken())
.build();
try {
new OkHttpClient().newCall(discordbestbots).execute().close();
System.out.println("Successfully posted count to Discord Best Bots!");
} catch (IOException e) {
e.printStackTrace();
}
// Discord Boats
Request discordboats = new Request.Builder()
@ -195,6 +183,36 @@ public class BotList {
} catch (IOException e) {
e.printStackTrace();
}
// Discord Bots 2
Request discordbots2 = new Request.Builder()
.url(DiscordBots2)
.post(body)
.addHeader("Authorization", config.getDiscordBots2Token())
.build();
try {
new OkHttpClient().newCall(discordbots2).execute().close();
System.out.println("Successfully posted count to discord.bots.gg!");
} catch (IOException e) {
e.printStackTrace();
}
// CloudList
Request cloudlist = new Request.Builder()
.url(CloudList)
.post(body)
.addHeader("Authorization", config.getCloudListToken())
.build();
try {
new OkHttpClient().newCall(cloudlist).execute().close();
System.out.println("Successfully posted count to the CloudList!");
} catch (IOException e) {
e.printStackTrace();
}
}
}
}

View file

@ -36,8 +36,8 @@ public class MessageEditor {
String description, String description_extra, String description_extra_two) {
String language = (this.user!=null) ? rethink.getLanguage(this.user.getId()) : null;
EmbedBuilder eb = this.getDefaultSettings(type);
if (!title.equals("")) eb.setTitle(this.handle(language, title, title_extra, title_extra_two));
if (!description.equals("")) eb.setDescription(this.handle(language, description, description_extra, description_extra_two));
if (!"".equals(title)) eb.setTitle(this.handle(language, title, title_extra, title_extra_two));
if (!"".equals(description)) eb.setDescription(this.handle(language, description, description_extra, description_extra_two));
return eb;
}

View file

@ -4,20 +4,6 @@
Hadder = Hadder
user = <@Benutzer>
searchterm = <Suchbegriff>
username = <Benutzername>
number = <Nummer>/all
prefix = <Neuer Prefix>
userprefix = <Neuer Benutzer-Prefix>
vc-name/id = <Sprachkanal ID|Sprachkanalname>
user+nickname = <@Benutzer> <Neuer Spitzname>
region = <Region>
guildid = <Guild-ID>
content = <Nachrichten-Inhalt>
song = <Song>
user/id= [@Benutzer]/[ID]
error = Fehler
none = Nicht angegeben
success\! = Erfolgreich\!
@ -44,7 +30,9 @@ commands.general.equals.string.first = Erster String\:
commands.general.equals.string.second = Zweiter String\:
commands.general.equals.string.result = Ergebnis\:
commands.general.equals.help.description = Checks if two strings are the same.
commands.general.help.field.usage = Benutzung\:
commands.general.help.description = **Description\:**
commands.general.help.usage = **Benutzung\:**
commands.general.help.example = **Example\:**
commands.general.help.error.description = Ich brauche die Links Einbetten Berechtigung, um das Hilfe-Menü zu senden\!
commands.general.help.help.description = Zeigt jeden Befehl an und erklärt seine Verwendung.
commands.general.help.help.label = [Name des Commands]
@ -68,8 +56,10 @@ commands.misc.github.success.repositories = Öffentliche Repositories
commands.misc.github.success.gists = Öffentliche Gists
commands.misc.github.success.followers = Abonnenten
commands.misc.github.success.following = Folgt
commands.misc.github.api.error.title = API error
commands.misc.github.api.error.description = Die GitHub API könnte im Moment nicht verfügbar sein\!
commands.misc.github.user.error.description = Dieser Benutzer existiert nicht\!
commands.misc.github.user.error.title = User doesn't exist
commands.misc.github.user.error.description = I can not find a user named like this\!
commands.misc.github.connect.title = Verbinde dein GH Konto
commands.misc.github.connect.description = [Bitte verbinde dein GitHub-Konto hier]%extra%
commands.misc.github.help.description = Zeigt Informationen über ein GitHub Benutzerprofil an.
@ -93,6 +83,7 @@ commands.moderation.ban.massban.success.description = I successfully banned %ext
commands.moderation.ban.help.description = Bans one or more users from the server.
commands.moderation.lear.all.success.title = Erfolgreich gelöscht
commands.moderation.lear.all.success.description = Ich habe erfolgreich %extra% Nachrichten gelöscht.
commands.moderation.clear.number.error.title = Invalid number
commands.moderation.clear.number.error.description = Sie müssen eine Zahl zwischen 1 und 99 wählen\!
commands.moderation.clear.success.title = Erfolgreich gelöscht
commands.moderation.clear.success.description.singular = Nachricht erfolgreich gelöscht.
@ -131,9 +122,9 @@ commands.moderation.regionchange.success.title = Region erfolgreich gesetzt
commands.moderation.regionchange.success.description = Ich habe die neue Serverregion erfolgreich zu %extra% geändert.
commands.moderation.regionchange.help.description = Changes the server region to locked regions.
commands.moderation.role.add.success.title = Rolle(n) Erfolgreich hinzugefügt
commands.moderation.role.add.success.description = I successfully added %extra% roles to %extra_two% members.
commands.moderation.role.remove.success.title = %extra% Successfully removed role(s) %extra%
commands.moderation.role.remove.success.description = I successfully removed %extra% roles from %extra_two% members.
commands.moderation.role.add.success.description = Ich habe %extra% Rollen zu %extra_two% Mitgliedern hinzugefügt.
commands.moderation.role.remove.success.title = Rolle(n) erfolgreich entfernt
commands.moderation.role.remove.success.description = Ich habe %extra% Rollen von %extra_two% Mitgliedern entfernt.
commands.moderation.role.help.description = Adds and removes one or more role(s) from one or more user(s)
commands.moderation.rules.setup.title = Set up rules
commands.moderation.rules.setup.description = Welcome to the Hadder rules setup. Please mention the channel in which I should send the rules. Your message should look like\: \#rules or \#verify.
@ -217,6 +208,11 @@ commands.music.queue.help.description = Shows the music queue
commands.music.skip.success.title = Successfully skipped
commands.music.skip.success.description = I successfully skipped to the next song
commands.music.skip.help.description = Skips the currently playing song
commands.music.volume.success.title = Successfully set
commands.music.volume.success.description = I successfully set the new volume to %extra%
commands.music.volume.error.int.title = Invalid number
commands.music.volume.error.int.description = The volume have to be between 1 and 200
commands.music.volume.help.description = Change the volume of the music.
commands.nsfw.gif.error.title = GIF wird nicht angezeigt? Klicke hier
commands.nsfw.img.error.title = Bild wird nicht angezeigt? Klicke hier
@ -241,7 +237,6 @@ commands.owner.eval.success.input = Eingabe
commands.owner.eval.success.output = Ausgabe
commands.owner.eval.success.timing = Timing
commands.owner.eval.help.description = Führt den angegebenen Code aus
commands.owner.eval.help.usage = <Code to execute>
commands.owner.guildleave.success.title = Erfolgreich verlassen
commands.owner.guildleave.success.description = Ich habe %extra% erfolgreich verlassen.
commands.owner.guildleave.error.title = Verlassen nicht möglich
@ -256,7 +251,6 @@ 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 = Führt den angegebenen Code aus.
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.

View file

@ -30,9 +30,9 @@ commands.general.equals.string.first = First string\:
commands.general.equals.string.second = Second string\:
commands.general.equals.string.result = Result\:
commands.general.equals.help.description = Checks if two strings are the same.
commands.general.help.description = **Description:**
commands.general.help.description = **Description\:**
commands.general.help.usage = **Usage\:**
commands.general.help.example = **Example:**
commands.general.help.example = **Example\:**
commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\!
commands.general.help.help.description = Shows each command and explains its usage.
commands.general.help.help.label = [CommandName]
@ -45,8 +45,8 @@ commands.misc.feedback.title.request.title = Feedback Topic
commands.misc.feedback.title.request.description = Please send me the feedback topic.
commands.misc.feedback.description.request.title = Feedback Description
commands.misc.feedback.description.request.description = Please send me the feedback description now.
commands.misc.feedback.help.description = Sends feedback directly to the developers.
commands.misc.feedback.success.title = Feedback successfully sent\!
commands.misc.feedback.help.description = Sends feedback directly to the developers.
commands.misc.github.link.title = Link your GitHub Account
commands.misc.github.success.title = Information about %extra%
commands.misc.github.success.bio = User bio
@ -81,8 +81,8 @@ 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 banned %extra% members\!
commands.moderation.ban.help.description = Bans one or more users 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.all.success.title = Successfully deleted
commands.moderation.clear.all.success.description = I successfully deleted %extra% messages.
commands.moderation.clear.number.error.title = Invalid number
commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\!
commands.moderation.clear.success.title = Successfully cleared
@ -153,6 +153,7 @@ commands.moderation.rules.error.message.title = Can't write messages
commands.moderation.rules.error.message.description = I can not write messages in the specified channel
commands.moderation.rules.help.description = Setup the rules on your Discord server
commands.moderation.starboard.success.title = Successfully set the Channel\!
commands.moderation.starboard.help.description = Sets the starboard channel.
commands.moderation.editrules.channel.title = Rules channel
commands.moderation.editrules.channel.description = Please send me the channel with the rules as mention
commands.moderation.editrules.channel.found.error.title = Channel not found
@ -175,12 +176,12 @@ 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.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.music.leave.help.description = Leaves your voice channel.
commands.music.play.load.title = %extra% Now loading %extra%
commands.music.play.load.description = Trying to load the song...
commands.music.play.success.loading.title = %extra% Now playing %extra%
@ -192,26 +193,27 @@ commands.music.play.error.load.title = %extra% Load failed %extra%
commands.music.play.error.load.description = Unfortunately I can not load the given song
commands.music.play.error.match.title = %extra% No matches %extra%
commands.music.play.error.match.description = I can not find a song named this on YouTube
commands.music.play.help.description = Plays a song
commands.music.play.help.description = Plays the specified song.
commands.music.stop.success.title = Successfully stopped
commands.music.stop.success.description = I successfully stopped the song.
commands.music.stop.help.description = Stops the song.
commands.music.info.success.title = Track info
commands.music.info.error.title = No playing track
commands.music.info.error.description = I am not playing anything at the moment
commands.music.info.help.description = Shows information about the playing song
commands.music.stop.help.description = Stops the song
commands.music.info.help.description = Shows information about the playing song.
commands.music.queue.error.title = No queue
commands.music.queue.error.description = There are no queued songs at the moment
commands.music.queue.success.title = Queue
commands.music.queue.success.description = This is the queue\: \n %extra%
commands.music.queue.help.description = Shows the music queue
commands.music.queue.help.description = Shows the music queue.
commands.music.skip.success.title = Successfully skipped
commands.music.skip.success.description = I successfully skipped to the next song
commands.music.skip.help.description = Skips the currently playing song
commands.music.skip.help.description = Skips the currently playing song.
commands.music.volume.success.title = Successfully set
commands.music.volume.success.description = I successfully set the new volume to %extra%
commands.music.volume.error.int.title = Invalid number
commands.music.volume.error.int.description = The volume have to be between 1 and 200
commands.music.volume.help.description = Change the volume of the music.
commands.nsfw.gif.error.title = GIF not showing? Click here
commands.nsfw.img.error.title = Image not showing? Click here
@ -246,6 +248,7 @@ 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.owner.blacklist.help.description = Blacklist a user for specific commands
commands.settings.language.success.title = Language set
commands.settings.language.success.description = `%extra%` is your new language now.

View file

@ -4,20 +4,6 @@
Hadder = Hadder
user = <@User>
searchterm = <SearchTerm>
username = <Username>
number = <Number>/all
prefix = <New Prefix>
userprefix = <New User-Prefix>
vc-name/id = <VoiceChannelID|VoiceChannelName>
user+nickname = <@user> <New Nickname>
region = <region>
guildid = <Guild-ID>
content = <Message-content>
song = <Song>
user/id= [@User]/[ID]
error = Error
none = None
success\! = Success\!
@ -44,7 +30,9 @@ commands.general.equals.string.first = First string\:
commands.general.equals.string.second = Second string\:
commands.general.equals.string.result = Result\:
commands.general.equals.help.description = Checks if two strings are the same.
commands.general.help.field.usage = Usage\:
commands.general.help.description = **Description\:**
commands.general.help.usage = **Usage\:**
commands.general.help.example = **Example\:**
commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\!
commands.general.help.help.description = Shows each command and explains its usage.
commands.general.help.help.label = [CommandName]
@ -68,8 +56,10 @@ commands.misc.github.success.repositories = Public repositories
commands.misc.github.success.gists = Public gists
commands.misc.github.success.followers = Followers
commands.misc.github.success.following = Following
commands.misc.github.api.error.title = API error
commands.misc.github.api.error.description = The GitHub API might be down at the moment\!
commands.misc.github.user.error.description = This user does not exist\!
commands.misc.github.user.error.title = User doesn't exist
commands.misc.github.user.error.description = I can not find a user named like this\!
commands.misc.github.connect.title = Connect your GH account
commands.misc.github.connect.description = [Please connect your GitHub account here]%extra%
commands.misc.github.help.description = Displays information about a GitHub user profile.
@ -93,6 +83,7 @@ commands.moderation.ban.massban.success.description = I successfully banned %ext
commands.moderation.ban.help.description = Bans one or more users 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.title = Invalid number
commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\!
commands.moderation.clear.success.title = Successfully cleared
commands.moderation.clear.success.description.singular = Successfully deleted one message.
@ -217,6 +208,11 @@ commands.music.queue.help.description = Shows the music queue
commands.music.skip.success.title = Successfully skipped
commands.music.skip.success.description = I successfully skipped to the next song
commands.music.skip.help.description = Skips the currently playing song
commands.music.volume.success.title = Successfully set
commands.music.volume.success.description = I successfully set the new volume to %extra%
commands.music.volume.error.int.title = Invalid number
commands.music.volume.error.int.description = The volume have to be between 1 and 200
commands.music.volume.help.description = Change the volume of the music.
commands.nsfw.gif.error.title = GIF not showing? Click here
commands.nsfw.img.error.title = Image not showing? Click here
@ -241,7 +237,6 @@ 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.error.title = Can not leave
@ -256,7 +251,6 @@ 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.

View file

@ -4,20 +4,6 @@
Hadder = Hadder
user = <@User>
searchterm = <SearchTerm>
username = <Username>
number = <Number>/all
prefix = <New Prefix>
userprefix = <New User-Prefix>
vc-name/id = <VoiceChannelID|VoiceChannelName>
user+nickname = <@user> <New Nickname>
region = <region>
guildid = <Guild-ID>
content = <Message-content>
song = <Song>
user/id= [@User]/[ID]
error = Error
none = None
success\! = Success\!
@ -44,7 +30,9 @@ commands.general.equals.string.first = First string\:
commands.general.equals.string.second = Second string\:
commands.general.equals.string.result = Result\:
commands.general.equals.help.description = Checks if two strings are the same.
commands.general.help.field.usage = Usage\:
commands.general.help.description = **Description\:**
commands.general.help.usage = **Usage\:**
commands.general.help.example = **Example\:**
commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\!
commands.general.help.help.description = Shows each command and explains its usage.
commands.general.help.help.label = [CommandName]
@ -68,8 +56,10 @@ commands.misc.github.success.repositories = Public repositories
commands.misc.github.success.gists = Public gists
commands.misc.github.success.followers = Followers
commands.misc.github.success.following = Following
commands.misc.github.api.error.title = API error
commands.misc.github.api.error.description = The GitHub API might be down at the moment\!
commands.misc.github.user.error.description = This user does not exist\!
commands.misc.github.user.error.title = User doesn't exist
commands.misc.github.user.error.description = I can not find a user named like this\!
commands.misc.github.connect.title = Connect your GH account
commands.misc.github.connect.description = [Please connect your GitHub account here]%extra%
commands.misc.github.help.description = Displays information about a GitHub user profile.
@ -93,6 +83,7 @@ commands.moderation.ban.massban.success.description = I successfully banned %ext
commands.moderation.ban.help.description = Bans one or more users 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.title = Invalid number
commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\!
commands.moderation.clear.success.title = Successfully cleared
commands.moderation.clear.success.description.singular = Successfully deleted one message.
@ -217,6 +208,11 @@ commands.music.queue.help.description = Shows the music queue
commands.music.skip.success.title = Successfully skipped
commands.music.skip.success.description = I successfully skipped to the next song
commands.music.skip.help.description = Skips the currently playing song
commands.music.volume.success.title = Successfully set
commands.music.volume.success.description = I successfully set the new volume to %extra%
commands.music.volume.error.int.title = Invalid number
commands.music.volume.error.int.description = The volume have to be between 1 and 200
commands.music.volume.help.description = Change the volume of the music.
commands.nsfw.gif.error.title = GIF not showing? Click here
commands.nsfw.img.error.title = Image not showing? Click here
@ -241,7 +237,6 @@ 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.error.title = Can not leave
@ -256,7 +251,6 @@ 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.

View file

@ -4,20 +4,6 @@
Hadder = Hadder
user = <@User>
searchterm = <SearchTerm>
username = <Username>
number = <Number>/all
prefix = <New Prefix>
userprefix = <New User-Prefix>
vc-name/id = <VoiceChannelID|VoiceChannelName>
user+nickname = <@user> <New Nickname>
region = <region>
guildid = <Guild-ID>
content = <Message-content>
song = <Song>
user/id= [@User]/[ID]
error = Error
none = None
success\! = Success\!
@ -44,7 +30,9 @@ commands.general.equals.string.first = First string\:
commands.general.equals.string.second = Second string\:
commands.general.equals.string.result = Result\:
commands.general.equals.help.description = Checks if two strings are the same.
commands.general.help.field.usage = Usage\:
commands.general.help.description = **Description\:**
commands.general.help.usage = **Usage\:**
commands.general.help.example = **Example\:**
commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\!
commands.general.help.help.description = Shows each command and explains its usage.
commands.general.help.help.label = [CommandName]
@ -68,8 +56,10 @@ commands.misc.github.success.repositories = Public repositories
commands.misc.github.success.gists = Public gists
commands.misc.github.success.followers = Followers
commands.misc.github.success.following = Following
commands.misc.github.api.error.title = API error
commands.misc.github.api.error.description = The GitHub API might be down at the moment\!
commands.misc.github.user.error.description = This user does not exist\!
commands.misc.github.user.error.title = User doesn't exist
commands.misc.github.user.error.description = I can not find a user named like this\!
commands.misc.github.connect.title = Connect your GH account
commands.misc.github.connect.description = [Please connect your GitHub account here]%extra%
commands.misc.github.help.description = Displays information about a GitHub user profile.
@ -93,6 +83,7 @@ commands.moderation.ban.massban.success.description = I successfully banned %ext
commands.moderation.ban.help.description = Bans one or more users 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.title = Invalid number
commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\!
commands.moderation.clear.success.title = Successfully cleared
commands.moderation.clear.success.description.singular = Successfully deleted one message.
@ -217,6 +208,11 @@ commands.music.queue.help.description = Shows the music queue
commands.music.skip.success.title = Successfully skipped
commands.music.skip.success.description = I successfully skipped to the next song
commands.music.skip.help.description = Skips the currently playing song
commands.music.volume.success.title = Successfully set
commands.music.volume.success.description = I successfully set the new volume to %extra%
commands.music.volume.error.int.title = Invalid number
commands.music.volume.error.int.description = The volume have to be between 1 and 200
commands.music.volume.help.description = Change the volume of the music.
commands.nsfw.gif.error.title = GIF not showing? Click here
commands.nsfw.img.error.title = Image not showing? Click here
@ -241,7 +237,6 @@ 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.error.title = Can not leave
@ -256,7 +251,6 @@ 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.

View file

@ -4,20 +4,6 @@
Hadder = Hadder
user = <@User>
searchterm = <SearchTerm>
username = <Username>
number = <Number>/all
prefix = <New Prefix>
userprefix = <New User-Prefix>
vc-name/id = <VoiceChannelID|VoiceChannelName>
user+nickname = <@user> <New Nickname>
region = <region>
guildid = <Guild-ID>
content = <Message-content>
song = <Song>
user/id= [@User]/[ID]
error = Error
none = None
success\! = Success\!
@ -44,7 +30,9 @@ commands.general.equals.string.first = First string\:
commands.general.equals.string.second = Second string\:
commands.general.equals.string.result = Result\:
commands.general.equals.help.description = Checks if two strings are the same.
commands.general.help.field.usage = Usage\:
commands.general.help.description = **Description\:**
commands.general.help.usage = **Usage\:**
commands.general.help.example = **Example\:**
commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\!
commands.general.help.help.description = Shows each command and explains its usage.
commands.general.help.help.label = [CommandName]
@ -68,8 +56,10 @@ commands.misc.github.success.repositories = Public repositories
commands.misc.github.success.gists = Public gists
commands.misc.github.success.followers = Followers
commands.misc.github.success.following = Following
commands.misc.github.api.error.title = API error
commands.misc.github.api.error.description = The GitHub API might be down at the moment\!
commands.misc.github.user.error.description = This user does not exist\!
commands.misc.github.user.error.title = User doesn't exist
commands.misc.github.user.error.description = I can not find a user named like this\!
commands.misc.github.connect.title = Connect your GH account
commands.misc.github.connect.description = [Please connect your GitHub account here]%extra%
commands.misc.github.help.description = Displays information about a GitHub user profile.
@ -93,6 +83,7 @@ commands.moderation.ban.massban.success.description = I successfully banned %ext
commands.moderation.ban.help.description = Bans one or more users 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.title = Invalid number
commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\!
commands.moderation.clear.success.title = Successfully cleared
commands.moderation.clear.success.description.singular = Successfully deleted one message.
@ -217,6 +208,11 @@ commands.music.queue.help.description = Shows the music queue
commands.music.skip.success.title = Successfully skipped
commands.music.skip.success.description = I successfully skipped to the next song
commands.music.skip.help.description = Skips the currently playing song
commands.music.volume.success.title = Successfully set
commands.music.volume.success.description = I successfully set the new volume to %extra%
commands.music.volume.error.int.title = Invalid number
commands.music.volume.error.int.description = The volume have to be between 1 and 200
commands.music.volume.help.description = Change the volume of the music.
commands.nsfw.gif.error.title = GIF not showing? Click here
commands.nsfw.img.error.title = Image not showing? Click here
@ -241,7 +237,6 @@ 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.error.title = Can not leave
@ -256,7 +251,6 @@ 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.

View file

@ -4,20 +4,6 @@
Hadder = Hadder
user = <@User>
searchterm = <SearchTerm>
username = <Username>
number = <Number>/all
prefix = <New Prefix>
userprefix = <New User-Prefix>
vc-name/id = <VoiceChannelID|VoiceChannelName>
user+nickname = <@user> <New Nickname>
region = <region>
guildid = <Guild-ID>
content = <Message-content>
song = <Song>
user/id= [@User]/[ID]
error = Error
none = None
success\! = Success\!
@ -44,7 +30,9 @@ commands.general.equals.string.first = First string\:
commands.general.equals.string.second = Second string\:
commands.general.equals.string.result = Result\:
commands.general.equals.help.description = Checks if two strings are the same.
commands.general.help.field.usage = Usage\:
commands.general.help.description = **Description\:**
commands.general.help.usage = **Usage\:**
commands.general.help.example = **Example\:**
commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu\!
commands.general.help.help.description = Shows each command and explains its usage.
commands.general.help.help.label = [CommandName]
@ -68,8 +56,10 @@ commands.misc.github.success.repositories = Public repositories
commands.misc.github.success.gists = Public gists
commands.misc.github.success.followers = Followers
commands.misc.github.success.following = Following
commands.misc.github.api.error.title = API error
commands.misc.github.api.error.description = The GitHub API might be down at the moment\!
commands.misc.github.user.error.description = This user does not exist\!
commands.misc.github.user.error.title = User doesn't exist
commands.misc.github.user.error.description = I can not find a user named like this\!
commands.misc.github.connect.title = Connect your GH account
commands.misc.github.connect.description = [Please connect your GitHub account here]%extra%
commands.misc.github.help.description = Displays information about a GitHub user profile.
@ -93,6 +83,7 @@ commands.moderation.ban.massban.success.description = I successfully banned %ext
commands.moderation.ban.help.description = Bans one or more users 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.title = Invalid number
commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\!
commands.moderation.clear.success.title = Successfully cleared
commands.moderation.clear.success.description.singular = Successfully deleted one message.
@ -217,6 +208,11 @@ commands.music.queue.help.description = Shows the music queue
commands.music.skip.success.title = Successfully skipped
commands.music.skip.success.description = I successfully skipped to the next song
commands.music.skip.help.description = Skips the currently playing song
commands.music.volume.success.title = Successfully set
commands.music.volume.success.description = I successfully set the new volume to %extra%
commands.music.volume.error.int.title = Invalid number
commands.music.volume.error.int.description = The volume have to be between 1 and 200
commands.music.volume.help.description = Change the volume of the music.
commands.nsfw.gif.error.title = GIF not showing? Click here
commands.nsfw.img.error.title = Image not showing? Click here
@ -241,7 +237,6 @@ 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.error.title = Can not leave
@ -256,7 +251,6 @@ 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.