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

merge #169

Merged
greg6775 merged 7 commits from master into greg-dev 2019-12-07 02:16:20 +01:00
Conversation 0 Commits 7 Files changed 2 +254 -20
18 changed files with 254 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b05e5fdd2f - Show all commits

1
crowdin.yml
View file

@ -1,3 +1,4 @@
base_url: https://bigbotnetwork.com
files:
- source: /src/main/Translations/en_us.json
translation: /src/main/Translations/%two_letters_code%/%original_file_name%

116
src/main/Translations/en_us.json
View file

@ -1,3 +1,117 @@
{
"Hadder": "Hadder"
"Hadder": "Hadder",
"<@User>/<ID>": "<@User>/<ID>",
"<SearchTerm>": "<SearchTerm>",
"<Username>": "<Username>",
"<Number>": "<Number>",
"<New Guild-Prefix>": "<New Guild-Prefix>",
"<@User>": "<@User>",
"<on/off>": "<on/off>",
"<VoiceChannelID|VoiceChannelName>": "<VoiceChannelID|VoiceChannelName>",
"<@user> <New Nickname>": "<@user> <New Nickname>",
"error": "Error",
"none": "None",
"success!": "Success!",
"commands.fun.avatar.success.title": "Avatar of",
"commands.fun.avatar.help.description": "Sends the avatar of the specified member.",
"commands.fun.gif.error.description": "Please try again with another term.",
"commands.fun.gif.help.description": "Look for a GIF on Giphy",
"commands.fun.meme.success.title": "Your random meme",
"commands.fun.meme.api.error": "The request to the meme API could not be processed. Please try it again later.",
"commands.fun.meme.help.description": "Sends you a random meme.",
"commands.general.about.success.title": "Hadder - About",
"commands.general.about.success.description": "Hadder is an open source Discord bot.",
"commands.general.about.success.field.one.title": "Support the Developers",
"commands.general.about.success.field.one.description": "Hadder is completely free for everyone. We would appreciate it you donate some money [here]",
"commands.general.about.help.description": "Shows infos about Hadder",
"commands.general.equals.string.first.request": "Please send me the first String",
"commands.general.equals.string.second.request": "Please send me the second String",
"commands.general.equals.string.equals.true": "Yes! The first string equals the second string!",
"commands.general.equals.string.equals.false": "Well yes, but actually No. This isn't the same.",
"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": "Check if two strings are the same",
"commands.general.help.error.description": "I need the Embed Links Permission to send the Help Menu!",
"commands.general.help.help.description": "Shows each command or explains its usage",
"commands.general.help.help.label": "[CommandName]",
"commands.general.invite.success.title": "Invite me!",
"commands.general.invite.success.description": "[Invite me here!]",
"commands.general.invite.help.description": "Shows the invitation to invite Hadder to your server",
"commands.general.ping.help.description": "Shows the ping to the Discord API",
"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.github.link.title": "Link your GitHub Account",
"commands.misc.github.success.title": "Information about",
"commands.misc.github.success.bio": "User bio",
"commands.misc.github.success.location": "Location",
"commands.misc.github.success.website": "Website",
"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.description": "The GitHub API might be down at the moment!",
"commands.misc.github.user.error.description": "This user does not exist!",
"commands.misc.github.connect.title": "Connect you GH account",
"commands.misc.github.connect.description": "Please connect your GitHub account here",
"commands.misc.github.help.description": "Displays information about a GitHub user profile.",
"commands.misc.screenshare.success.title": "Here's your Url to share your Screen",
"commands.misc.screenshare.id.error.title": "Wait, that's illegal",
"commands.misc.screenshare.id.error.description": "This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote: Make sure the Voice Channel is on this Guild.",
"commands.misc.screenshare.channel.error.title": "Please Choose a Voice Channel",
"commands.misc.screenshare.channel.error.description": "There is more than one channel with this name",
"commands.misc.screenshare.number.error.title": "You specified a wrong number!",
"commands.misc.screenshare.number.error.description": "This isn't a Number.",
"commands.misc.screenshare.channel.existing.error": "Hol' up",
"commands.misc.screenshare.channel.existing.description": "There is no Voice Channel named like this. \n\nNote: Make sure the Voice Channel is on this Guild.",
"commands.misc.screenshare.help.description": "Shows you the link to share your screen.",
"commands.moderation.ban.success.title": "Successfully banned",
"commands.moderation.ban.success.description": "I successfully baned",
"commands.moderation.ban.error.title": "Not possible",
"commands.moderation.ban.myself.error.description": "I can not ban myself!",
"commands.moderation.ban.yourself.error.description": "You can't ban yourself!",
"commands.moderation.ban.help.description": "Bans one ore more user from the server",
"commands.moderation.clear.number.error.description": "You have to choose a number between 1 and 200!",
"commands.moderation.clear.success.description": "Successfully deleted 69 messages.",
"commands.moderation.clear.help.description": "Deletes the specified number of messages.",
"commands.moderation.prefix.success.title": "Successfully set",
"commands.moderation.prefix.success.description": "I successfully set the new prefix for the guild to",
"commands.moderation.prefix.error.description": "The prefix must not contain **\"**",
"commands.moderation.prefix.help.description": "Sets the Guild-Prefix.",
"commands.moderation.invitedetect.activate.success.title": "Successfully activated",
"commands.moderation.invitedetect.activate.success.description": "I successfully activated the invite link detection for this guild.",
"commands.moderation.invitedetect.activate.error.title": "Already activated",
"commands.moderation.invitedetect.activate.error.description": "The invite link detection is already activated on this guild.",
"commands.moderation.invitedetect.deactivate.success.title": "Successfully deactivated",
"commands.moderation.invitedetect.deactivate.success.description": "I successfully deactivated the invite link detection for this guild.",
"commands.moderation.invitedetect.deactivate.error.title": "Already deactivated",
"commands.moderation.invitedetect.deactivate.error.description": "The invite link detection is already deactivated on this guild.",
"commands.moderation.invitedetect.help.description": "Activate or deactivate the Discord invite link detection.",
"commands.moderation.kick.success.title": "Successfully kicked",
"commands.moderation.kick.success.description": "I successfully kicked",
"commands.moderation.kick.myself.error.description": "I can not kick myself!",
"commands.moderation.kick.yourself.error.description": "You can't kick yourself.",
"commands.moderation.kick.mass.success.description": "I successfully kicked 69 Members!",
"commands.moderation.kick.help.description": "Kicks one or more user from the server.",
"commands.moderation.link.request.success.description": "If i'm on this guild i sent a message to accept the link.",
"commands.moderation.link.error.title": "Wait that's illegal.",
"commands.moderation.link.request.error.description": "You specified the same guild as the guild on which you're reading this",
"commands.moderation.link.request.accept.title": "Skidder wants to link guilds!",
"commands.moderation.link.request.accept.description": "React with the reactions to accept or decline it",
"commands.moderation.link.set.title": "Set the thing boi",
"commands.moderation.link.help.description": "Links two or more servers.",
"commands.moderation.nick.success.title": "Successfully nicked",
"commands.moderation.nick.success.description": "I successfully nicked",
"commands.moderation.nick.myself.success.description": "I successfully changed my nickname.",
"commands.moderation.nick.mass.success.description": "I successfully nicked 69 Members!",
"commands.moderation.nick.help.description": "Rename a one or more user."
}

119
src/main/Translations/en_us.properties Normal file
View file

@ -0,0 +1,119 @@
#
# @author Skidder / GregTCLTK
#
Hadder = Hadder
user/id= <@User>/<ID>
searchterm = <SearchTerm>
username = <Username>
number = <Number>
guildprefix = <New Guild-Prefix>
<@User> = <@User>
on/off = <on/off>
vc-name/id = <VoiceChannelID|VoiceChannelName>
user+nickname = <@user> <New Nickname>
error = Error
none = None
success! = Success!
commands.fun.avatar.success.title = Avatar of
commands.fun.avatar.help.description = Sends the avatar of the specified member.
commands.fun.gif.error.description = Please try again with another term.
commands.fun.gif.help.description = Look for a GIF on Giphy
commands.fun.meme.success.title = Your random meme
commands.fun.meme.api.error = The request to the meme API could not be processed. Please try it again later.
commands.fun.meme.help.description = Sends you a random meme.
commands.general.about.success.title = Hadder - About
commands.general.about.success.description = Hadder is an open source Discord bot.
commands.general.about.success.field.one.title = Support the Developers
commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here]
commands.general.about.help.description = Shows infos about Hadder
commands.general.equals.string.first.request = Please send me the first String
commands.general.equals.string.second.request = Please send me the second String
commands.general.equals.string.equals.true = Yes! The first string equals the second string!
commands.general.equals.string.equals.false = Well yes but actually No. This isn't the same.
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 = Check if two strings are the same
commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu!
commands.general.help.help.description = Shows each command or explains its usage
commands.general.help.help.label = [CommandName]
commands.general.invite.success.title = Invite me!
commands.general.invite.success.description = [Invite me here!]
commands.general.invite.help.description = Shows the invitation to invite Hadder to your server
commands.general.ping.help.description = Shows the ping to the Discord API
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.github.link.title = Link your GitHub Account
commands.misc.github.success.title = Information about
commands.misc.github.success.bio = User bio
commands.misc.github.success.location = Location
commands.misc.github.success.website = Website
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.description = The GitHub API might be down at the moment!
commands.misc.github.user.error.description = This user does not exist!
commands.misc.github.connect.title = Connect you GH account
commands.misc.github.connect.description = Please connect your GitHub account here
commands.misc.github.help.description = Displays information about a GitHub user profile.
commands.misc.screenshare.success.title = Here's your Url to share your Screen
commands.misc.screenshare.id.error.title = Wait that's illegal
commands.misc.screenshare.id.error.description = This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote: Make sure the Voice Channel is on this Guild.
commands.misc.screenshare.channel.error.title = Please Choose a Voice Channel
commands.misc.screenshare.channel.error.description = There is more than one channel with this name
commands.misc.screenshare.number.error.title = You specified a wrong number!
commands.misc.screenshare.number.error.description = This isn't a Number.
commands.misc.screenshare.channel.existing.error = Hol' up
commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote: Make sure the Voice Channel is on this Guild.
commands.misc.screenshare.help.description = Shows you the link to share your screen.
commands.moderation.ban.success.title = Successfully banned
commands.moderation.ban.success.description = I successfully baned
commands.moderation.ban.error.title = Not possible
commands.moderation.ban.myself.error.description = I can not ban myself!
commands.moderation.ban.yourself.error.description = You can't ban yourself!
commands.moderation.ban.help.description = Bans one ore more user from the server
commands.moderation.clear.number.error.description = You have to choose a number between 1 and 200!
commands.moderation.clear.success.description = Successfully deleted 69 messages.
commands.moderation.clear.help.description = Deletes the specified number of messages.
commands.moderation.prefix.success.title = Successfully set
commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to
commands.moderation.prefix.error.description = The prefix must not contain **\**
commands.moderation.prefix.help.description = Sets the Guild-Prefix.
commands.moderation.invitedetect.activate.success.title = Successfully activated
commands.moderation.invitedetect.activate.success.description = I successfully activated the invite link detection for this guild.
commands.moderation.invitedetect.activate.error.title = Already activated
commands.moderation.invitedetect.activate.error.description = The invite link detection is already activated on this guild.
commands.moderation.invitedetect.deactivate.success.title = Successfully deactivated
commands.moderation.invitedetect.deactivate.success.description = I successfully deactivated the invite link detection for this guild.
commands.moderation.invitedetect.deactivate.error.title = Already deactivated
commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this guild.
commands.moderation.invitedetect.help.description = Activate or deactivate the Discord invite link detection.
commands.moderation.kick.success.title = Successfully kicked
commands.moderation.kick.success.description = I successfully kicked
commands.moderation.kick.myself.error.description = I can not kick myself!
commands.moderation.kick.yourself.error.description = You can't kick yourself.
commands.moderation.kick.mass.success.description = I successfully kicked 69 Members!
commands.moderation.kick.help.description = Kicks one or more user from the server.
commands.moderation.link.request.success.description = If i'm on this guild i sent a message to accept the link.
commands.moderation.link.error.title = Wait that's illegal.
commands.moderation.link.request.error.description = You specified the same guild as the guild on which you're reading this
commands.moderation.link.request.accept.title = Skidder wants to link guilds!
commands.moderation.link.request.accept.description = React with the reactions to accept or decline it
commands.moderation.link.set.title = Set the thing boi
commands.moderation.link.help.description = Links two or more servers.
commands.moderation.nick.success.title = Successfully nicked
commands.moderation.nick.success.description = I successfully nicked
commands.moderation.nick.myself.success.description = I successfully changed my nickname.
commands.moderation.nick.mass.success.description = I successfully nicked 69 Members!
commands.moderation.nick.help.description = Rename a one or more user.

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

@ -34,7 +34,7 @@ public class MemeCommand implements Command {
} catch (IOException e) {
e.printStackTrace();
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR)
.setTitle("Error!")
.setTitle("Error")
.setDescription("The request to the meme API could not be processed. Please try it again later.")
.setColor(Color.RED)
.build()).queue();

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

@ -27,7 +27,7 @@ public class AboutCommand implements Command {
@Override
public String description() {
return "Shows infos about Hadder";
return "Shows infos about Hadder.";
}
@Override

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

@ -44,7 +44,7 @@ public class EqualsCommand implements Command {
@Override
public String description() {
return "Check if two strings are the same";
return "Check if two strings are the same.";
}
@Override

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

@ -77,7 +77,7 @@ public class HelpCommand implements Command {
@Override
public String description() {
return "Shows each command or explains its usage";
return "Shows each command or explains its usage.";
}
@Override

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

@ -30,7 +30,7 @@ public class InviteCommand implements Command {
@Override
public String description() {
return "Shows the invitation to invite Hadder to your server";
return "Shows the invitation to invite Hadder to your server.";
}
@Override

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

@ -22,7 +22,7 @@ public class PingCommand implements Command {
@Override
public String description() {
return "Shows the ping to the Discord API";
return "Shows the ping to the Discord API.";
}
@Override

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

@ -31,7 +31,7 @@ public class GitHubCommand implements Command {
String nickname = json.getString("name");
String bio = "None";
String location = "Unknown";
String location = "None";
String website = "None";
try {
bio = json.getString("bio");
@ -77,7 +77,7 @@ public class GitHubCommand implements Command {
@Override
public String description() {
return "Displays information about a GitHub user profile";
return "Displays information about a GitHub user profile.";
}
@Override

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

@ -85,7 +85,7 @@ public class ScreenShareCommand implements Command {
@Override
public String description() {
return "Shows you the link to share your screen";
return "Shows you the link to share your screen.";
}
@Override

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

@ -26,10 +26,10 @@ public class BanCommand implements Command {
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
}
} else {
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription("I can not ban myself").build()).queue();
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("Not possible").setDescription("I can not ban myself!").build()).queue();
}
} else {
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("Not possible").setDescription("You can't ban yourself.").build()).queue();
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("Not possible").setDescription("You can't ban yourself!").build()).queue();
}
} else if (event.getMessage().getMentionedMembers().size() == 0) {
event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
@ -47,7 +47,7 @@ public class BanCommand implements Command {
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription("I can not ban myself!").build()).queue();
}
} else {
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription("You can't ban yourself.").build()).queue();
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription("You can't ban yourself!").build()).queue();
}
}
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("✅ Successfully banned ✅").setDescription("I successfully banned " + event.getMessage().getMentionedMembers().size() + " Members!").build()).queue();
@ -64,7 +64,7 @@ public class BanCommand implements Command {
@Override
public String description() {
return "Bans one ore more user from the server";
return "Bans one ore more user from the server.";
}
@Override

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

@ -53,7 +53,7 @@ public class ClearCommand implements Command {
@Override
public String description() {
return "Deletes the specified number of messages";
return "Deletes the specified number of messages.";
}
@Override

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

@ -33,7 +33,7 @@ public class GuildPrefixCommand implements Command {
@Override
public String description() {
return "Sets the Guild-Prefix";
return "Sets the Guild-Prefix.";
}
@Override

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

@ -63,7 +63,7 @@ public class KickCommand implements Command {
@Override
public String description() {
return "Kicks one or more user from the server";
return "Kicks one or more user from the server.";
}
@Override

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

@ -36,7 +36,7 @@ public class LinkCommand implements Command {
if (event.getGuild().getId().equals(args[1])) {
event.getChannel().sendMessage(
new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR)
.setTitle("Wait thats illegal.").setDescription("You specified the same guild as the guild on which you're reading this").build()).queue();
.setTitle("Wait that's illegal.").setDescription("You specified the same guild as the guild on which you're reading this").build()).queue();
return;
}

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

@ -70,7 +70,7 @@ public class NickCommand implements Command {
@Override
public String description() {
return "Rename a one or more user";
return "Rename a one or more user.";
}
@Override

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

@ -43,7 +43,7 @@ public class MessageEditor {
case NO_SELF_PERMISSION:
builder
.setTitle("⛔ No Permission ⛔")
.setDescription("Unfortunately, I do not have the required rights to perform this action")
.setDescription("Unfortunately, I do not have the required rights to perform this action!")
.setColor(Color.RED)
.setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png")
.setTimestamp(Instant.now());