diff --git a/README.md b/README.md index b7cfdc4..11518a2 100644 --- a/README.md +++ b/README.md @@ -22,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. | diff --git a/src/main/java/com/bbn/hadder/core/Config.java b/src/main/java/com/bbn/hadder/core/Config.java index 6123713..942c382 100644 --- a/src/main/java/com/bbn/hadder/core/Config.java +++ b/src/main/java/com/bbn/hadder/core/Config.java @@ -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"); } @@ -147,6 +143,10 @@ public class Config { return config.getJSONObject("Tokens").getString("DiscordBots2"); } + public String getCloudListToken() { + return config.getJSONObject("Tokens").getString("CloudList"); + } + public String getClydeName() { return config.getString("Clyde"); } diff --git a/src/main/java/com/bbn/hadder/utils/BotList.java b/src/main/java/com/bbn/hadder/utils/BotList.java index 462f823..6200c4e 100644 --- a/src/main/java/com/bbn/hadder/utils/BotList.java +++ b/src/main/java/com/bbn/hadder/utils/BotList.java @@ -21,7 +21,6 @@ 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"; @@ -29,6 +28,7 @@ public class BotList { 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; @@ -93,21 +93,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() @@ -212,6 +197,21 @@ public class BotList { } 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(); + } } } } diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index b499a8e..d4f0582 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -153,7 +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.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 @@ -176,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% @@ -193,22 +193,22 @@ 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