diff --git a/README.md b/README.md index 3dac107..68c7344 100644 --- a/README.md +++ b/README.md @@ -3,31 +3,36 @@ [![GitHub release](https://img.shields.io/github/release/zekrotja/DiscordBot.svg)](https://github.com/zekroTJA/DiscordBot/releases)  [![GitHub (pre-)release](https://img.shields.io/github/release/zekrotja/DiscordBot/all.svg)](https://github.com/zekroTJA/DiscordBot/releases)  - -
+[![Github All Releases](https://img.shields.io/github/downloads/zekroTJA/DiscordBot/total.svg)](https://github.com/zekroTJA/DiscordBot) +
+ ----- -If you want to use the code of this project for your own ones, please read **[this](http://s.zekro.de/codepolicy)** before! +If you want to reuse the code of this project, please read **[this](http://s.zekro.de/codepolicy)** before doing so! -So you have some questions or want to join my developer community discord? Take a look! :^) +Have some questions or want to join my developer community discord? Take a look! :^)
----- ### Get it! - +[![Uptime Robot status](https://img.shields.io/uptimerobot/status/m779430970-e7fbeac99e0f5b24c277880c.svg)](https://stats.uptimerobot.com/WPBJjHp26)   +[![Uptime Robot ratio](https://img.shields.io/uptimerobot/ratio/m779430970-e7fbeac99e0f5b24c277880c.svg)](https://stats.uptimerobot.com/WPBJjHp26) + + --- ### Donate -Not long ago, I've moved the host of the bot from my Raspberry Pi to a VPS, wich costs around €20 per year. This bot will be still completely free to use, but I would really appreciate it if you could help a a bit to finance the server for the bot :) <3 +Not long ago, I've moved the host of the bot from my Raspberry Pi to a VPS, which costs around €20 per year. This bot will be still completely free to use, but I would really appreciate it if you could help a bit to finance the server for the bot :) <3 - + -🏆 Goal *(this year payment cicle)* **`$9 / $24`** +🏆 Goal *(this year's payment cicle)* **`$15 / $24`** **List of donators**
-Sydrus (Patreon) - $9 +Sydrus (Patreon) - $9
+Schlaubi - $6 ----- ### Features @@ -48,17 +53,17 @@ Here are just listed some of the various functions and >64 commands of the bot. - `-stups` - nudge someone on the guild - `-vote` - create polls
 ![](https://image.prntscr.com/image/5_avzZNQRUijY2rUgc1XgQ.png) - - + + - **Server administration** - `-kick` - kick someone from the server - `-vkick` - kick someone out of the voice channel, also for a specific time period - `-mute` - mute members in text channels - `-blacklist` - disallow users to use the bot - + - **Other functions** - `-music` - Music player with many functions - - `-scpacer` - Create spacer voice channels wich can not be joined + - `-scpacer` - Create spacer voice channels which can not be joined - `-rand6` - Random operators for rainbow six
 ![](https://image.prntscr.com/image/WHZh5l76TKupvWUmoIQBpA.png) @@ -72,7 +77,7 @@ First start the JAR file with: java -jar DiscordBot.jar ``` The bot will create a `SETTINGS.txt` file. Open it and enter your settings. -The most important is to set first the API token you'll get from [this page](https://discordapp.com/developers/applications/me) *(if you just created an bot account there).* Also its realy important to set yout Discord account ID as `BOT_OWNER_ID`! You can get your client id by right-clicking on your name in discord and select `Copy ID` *(for that, you need to enable developer mode in Discord!)* +The most important is to set first the API token you'll get from [this page](https://discordapp.com/developers/applications/me) *(if you just created an bot account there).* Also its really important to set your Discord account ID as `BOT_OWNER_ID`! You can get your client id by right-clicking on your name in discord and select `Copy ID` *(for that, you need to enable developer mode in Discord!)* ![img](https://image.prntscr.com/image/Jmf2FssPSdKEb9jNOTra-g.png) ![img](https://image.prntscr.com/image/UrxT_eI7SbqmZIcbQs1QvQ.png) @@ -106,9 +111,9 @@ After that, use the guild settings commands to configure the bot for your guild( **PLEASE LOOK IN RELEASES TO SEE LATEST CHANGE LOGS.** ----- -### Future Intends +### Future Intent -**SEE CURRENT TODO-LIST HERE** +**SEE CURRENT TO-DO LIST HERE** ----- ### Used libraries @@ -122,8 +127,6 @@ After that, use the guild settings commands to configure the bot for your guild( ----- ### Mentions -Special thanks to @jagrosh for helping me with fixing the combatibility bug of lava player on linux system. - -Also a special thanks to Sophie, who helped me a lot developing some features of that bot and better performance coding. <3 +Special thanks to [@jagrosh](https://github.com/jagrosh) for helping me fixing the combatibility problems of lava player on linux systems. -Another lovely thanks to all of our "Trupp Lätzl"-Discord members and team for testing the bot and using it and also a special lovley thanks to all members on my Dev Discord helping me a lot with new experiences and a lot of helpful hints. :) +Also a very lovely thanks to everyone helping me on my [Development Discord](http://discord.zekro.de) testing the lastest zekroBot features and reporting bugs or suggesting improvements! <3 diff --git a/src/main/java/commands/administration/testCMD.java b/src/main/java/commands/administration/TestCMD.java similarity index 100% rename from src/main/java/commands/administration/testCMD.java rename to src/main/java/commands/administration/TestCMD.java diff --git a/src/main/java/commands/chat/Vote3.java b/src/main/java/commands/chat/Vote3.java index b8ae0b1..8637f26 100644 --- a/src/main/java/commands/chat/Vote3.java +++ b/src/main/java/commands/chat/Vote3.java @@ -32,12 +32,15 @@ public class Vote3 implements Command, Serializable { private static TextChannel channel; public static HashMap polls = new HashMap<>(); - private static final String[] EMOTI = ( "\uD83C\uDF4F \uD83C\uDF4E \uD83C\uDF50 \uD83C\uDF4A \uD83C\uDF4B \uD83C\uDF4C \uD83C\uDF49 \uD83C\uDF47 \uD83C\uDF53 \uD83C\uDF48 \uD83C\uDF52 \uD83C\uDF51 \uD83C\uDF4D \uD83E\uDD5D " + + /*private static final String[] EMOTI = ( "\uD83C\uDF4F \uD83C\uDF4E \uD83C\uDF50 \uD83C\uDF4A \uD83C\uDF4B \uD83C\uDF4C \uD83C\uDF49 \uD83C\uDF47 \uD83C\uDF53 \uD83C\uDF48 \uD83C\uDF52 \uD83C\uDF51 \uD83C\uDF4D \uD83E\uDD5D " + "\uD83E\uDD51 \uD83C\uDF45 \uD83C\uDF46 \uD83E\uDD52 \uD83E\uDD55 \uD83C\uDF3D \uD83C\uDF36 \uD83E\uDD54 \uD83C\uDF60 \uD83C\uDF30 \uD83E\uDD5C \uD83C\uDF6F \uD83E\uDD50 \uD83C\uDF5E " + "\uD83E\uDD56 \uD83E\uDDC0 \uD83E\uDD5A \uD83C\uDF73 \uD83E\uDD53 \uD83E\uDD5E \uD83C\uDF64 \uD83C\uDF57 \uD83C\uDF56 \uD83C\uDF55 \uD83C\uDF2D \uD83C\uDF54 \uD83C\uDF5F \uD83E\uDD59 " + "\uD83C\uDF2E \uD83C\uDF2F \uD83E\uDD57 \uD83E\uDD58 \uD83C\uDF5D \uD83C\uDF5C \uD83C\uDF72 \uD83C\uDF65 \uD83C\uDF63 \uD83C\uDF71 \uD83C\uDF5B \uD83C\uDF5A \uD83C\uDF59 \uD83C\uDF58 " + "\uD83C\uDF62 \uD83C\uDF61 \uD83C\uDF67 \uD83C\uDF68 \uD83C\uDF66 \uD83C\uDF70 \uD83C\uDF82 \uD83C\uDF6E \uD83C\uDF6D \uD83C\uDF6C \uD83C\uDF6B \uD83C\uDF7F \uD83C\uDF69 \uD83C\uDF6A \uD83E\uDD5B " + - "\uD83C\uDF75 \uD83C\uDF76 \uD83C\uDF7A \uD83C\uDF7B \uD83E\uDD42 \uD83C\uDF77 \uD83E\uDD43 \uD83C\uDF78 \uD83C\uDF79 \uD83C\uDF7E \uD83E\uDD44 \uD83C\uDF74 \uD83C\uDF7D").split(" "); + "\uD83C\uDF75 \uD83C\uDF76 \uD83C\uDF7A \uD83C\uDF7B \uD83E\uDD42 \uD83C\uDF77 \uD83E\uDD43 \uD83C\uDF78 \uD83C\uDF79 \uD83C\uDF7E \uD83E\uDD44 \uD83C\uDF74 \uD83C\uDF7D").split(" ");*/ + + private static final String[] EMOTI = ( "\u0031\u20E3 \u0032\u20E3 \u0033\u20E3 \u0034\u20E3 \u0035\u20E3 \u0036\u20E3 \u0037\u20E3 \u0038\u20E3 \u0039\u20E3 \u0030\u20E3" ).split(" "); + public class Poll implements Serializable { @@ -122,10 +125,9 @@ private void createPoll(String[] args, MessageReceivedEvent event, boolean secre List emotis = new ArrayList<>(Arrays.asList(EMOTI)); List toAddEmotis = new ArrayList<>(); answers.forEach(a -> { - int rand = new Random().nextInt(emotis.size() - 1); - String randEmoti = emotis.get(rand); - emotis.remove(rand); - toAddEmotis.add(randEmoti); + String emoti = emotis.get(0); + emotis.remove(0); + toAddEmotis.add(emoti); }); Poll poll = new Poll(event.getMember(), heading, answers, toAddEmotis, msg, secret); diff --git a/src/main/java/core/coreCommands.java b/src/main/java/core/CoreCommands.java similarity index 100% rename from src/main/java/core/coreCommands.java rename to src/main/java/core/CoreCommands.java diff --git a/src/main/java/core/startArgumentHandler.java b/src/main/java/core/StartArgumentHandler.java similarity index 100% rename from src/main/java/core/startArgumentHandler.java rename to src/main/java/core/StartArgumentHandler.java diff --git a/src/main/java/listeners/guildJoinListener.java b/src/main/java/listeners/GuildJoinListener.java similarity index 100% rename from src/main/java/listeners/guildJoinListener.java rename to src/main/java/listeners/GuildJoinListener.java diff --git a/src/main/java/listeners/privateMessageListener.java b/src/main/java/listeners/PrivateMessageListener.java similarity index 100% rename from src/main/java/listeners/privateMessageListener.java rename to src/main/java/listeners/PrivateMessageListener.java diff --git a/src/main/java/listeners/reactionListener.java b/src/main/java/listeners/ReactionListener.java similarity index 100% rename from src/main/java/listeners/reactionListener.java rename to src/main/java/listeners/ReactionListener.java diff --git a/src/main/java/listeners/reconnectListener.java b/src/main/java/listeners/ReconnectListener.java similarity index 100% rename from src/main/java/listeners/reconnectListener.java rename to src/main/java/listeners/ReconnectListener.java diff --git a/src/main/java/listeners/vkickListener.java b/src/main/java/listeners/VkickListener.java similarity index 100% rename from src/main/java/listeners/vkickListener.java rename to src/main/java/listeners/VkickListener.java diff --git a/src/main/java/listeners/voiceChannelListener.java b/src/main/java/listeners/VoiceChannelListener.java similarity index 100% rename from src/main/java/listeners/voiceChannelListener.java rename to src/main/java/listeners/VoiceChannelListener.java