From 6f9854d799ede18cef07d9186acf2b2aef6a4caf Mon Sep 17 00:00:00 2001 From: zekro Date: Sat, 16 Sep 2017 17:57:17 +0200 Subject: [PATCH 01/15] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 3dac107..faf61bd 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,9 @@ So you have some questions or want to join my developer community discord? Take ----- ### 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) + --- From ede05af5add5123d1b1b92758b20e14671d8e096 Mon Sep 17 00:00:00 2001 From: zekro Date: Tue, 19 Sep 2017 19:31:43 +0200 Subject: [PATCH 02/15] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index faf61bd..f4f2e91 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ So you have some questions or want to join my developer community discord? Take [![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 From d06208dfb2f3c04f3cab39fb532f28f6a577ca96 Mon Sep 17 00:00:00 2001 From: zekro Date: Fri, 22 Sep 2017 13:11:10 +0200 Subject: [PATCH 03/15] Update README.md --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f4f2e91..82f988c 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,10 @@ [![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)  - -
+[![Current version running on](https://img.shields.io/badge/currently%20running%20on-1.40.1.0-3cd0d8.svg)](https://discordapp.com/oauth2/authorize?client_id=272336949841362944&scope=bot&permissions=1610083415)  +[![Github All Releases](https://img.shields.io/github/downloads/zekroTJA/DiscordBot/total.svg)](https://github.com/zekroTJA/DiscordBot) +
+ ----- From cef07e43a265571cd035517bd7f835a27797eae2 Mon Sep 17 00:00:00 2001 From: zekro Date: Sat, 23 Sep 2017 20:32:08 +0200 Subject: [PATCH 04/15] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 82f988c..7569f18 100644 --- a/README.md +++ b/README.md @@ -29,10 +29,11 @@ Not long ago, I've moved the host of the bot from my Raspberry Pi to a VPS, wich -๐Ÿ† Goal *(this year payment cicle)* **`$9 / $24`** +๐Ÿ† Goal *(this year payment cicle)* **`$15 / $24`** **List of donators**
Sydrus (Patreon) - $9 +Schlaubi - $6 ----- ### Features From 26ad167b5008abe01234db1d71cd6b8de9e3e7b1 Mon Sep 17 00:00:00 2001 From: zekro Date: Sat, 23 Sep 2017 20:33:08 +0200 Subject: [PATCH 05/15] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7569f18..8838b67 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Not long ago, I've moved the host of the bot from my Raspberry Pi to a VPS, wich ๐Ÿ† Goal *(this year payment cicle)* **`$15 / $24`** **List of donators**
-Sydrus (Patreon) - $9 +Sydrus (Patreon) - $9
Schlaubi - $6 ----- From e58dd09f7588380b091ea3442c50b03d95b5d068 Mon Sep 17 00:00:00 2001 From: zekro Date: Sat, 23 Sep 2017 22:43:54 +0200 Subject: [PATCH 06/15] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8838b67..ad11b0a 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ So you have some questions or want to join my developer community discord? Take 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 - + ๐Ÿ† Goal *(this year payment cicle)* **`$15 / $24`** From e548db1ac94e5a2bb8995c4dc772da65e5c66752 Mon Sep 17 00:00:00 2001 From: zekro Date: Wed, 27 Sep 2017 11:31:37 +0200 Subject: [PATCH 07/15] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index ad11b0a..907e84a 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@ [![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)  -[![Current version running on](https://img.shields.io/badge/currently%20running%20on-1.40.1.0-3cd0d8.svg)](https://discordapp.com/oauth2/authorize?client_id=272336949841362944&scope=bot&permissions=1610083415)  [![Github All Releases](https://img.shields.io/github/downloads/zekroTJA/DiscordBot/total.svg)](https://github.com/zekroTJA/DiscordBot)
From ed897362e383d33edd55ae0e55ea669fb3d66fc8 Mon Sep 17 00:00:00 2001 From: zekro Date: Thu, 28 Sep 2017 10:46:25 +0200 Subject: [PATCH 08/15] Update README.md --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 907e84a..960ddae 100644 --- a/README.md +++ b/README.md @@ -127,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. +Special thanks to [@jagrosh](https://github.com/jagrosh) for helping me fixing the combatibility problems of lava player on linux systems. -Also a special thanks to Sophie, who helped me a lot developing some features of that bot and better performance coding. <3 - -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 From dcdef9de7423e27a39ce17d1faed0e82c50694bd Mon Sep 17 00:00:00 2001 From: zekro Date: Wed, 11 Oct 2017 08:36:58 +0200 Subject: [PATCH 09/15] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 960ddae..0948622 100644 --- a/README.md +++ b/README.md @@ -129,4 +129,4 @@ After that, use the guild settings commands to configure the bot for your guild( ### Mentions Special thanks to [@jagrosh](https://github.com/jagrosh) for helping me fixing the combatibility problems of lava player on linux systems. -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 +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 From bf9389fcbff159dfa324cdbdeca1642a5f7945d8 Mon Sep 17 00:00:00 2001 From: Philip Larsson Date: Sat, 21 Oct 2017 12:31:01 +0200 Subject: [PATCH 10/15] Found some typos in README.md and fixed them --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 0948622..7f7aa3c 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ So you have some questions or want to join my developer community discord? Take --- ### 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 a bit to finance the server for the bot :) <3 @@ -53,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) @@ -77,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) From 6231a34a399bdc5b7ecd1b9dafa81e74774a47f3 Mon Sep 17 00:00:00 2001 From: Aaron Meese Date: Sat, 28 Oct 2017 07:44:17 -0500 Subject: [PATCH 11/15] Update README.md General fixes --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7f7aa3c..9413ad0 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,9 @@ ----- -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! :^)
----- @@ -24,7 +24,7 @@ So you have some questions or want to join my developer community discord? Take --- ### Donate -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 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 From aa725f841a05c174cd2e35de5049318ef13a72f6 Mon Sep 17 00:00:00 2001 From: Aaron Meese Date: Sat, 28 Oct 2017 07:50:09 -0500 Subject: [PATCH 12/15] Update README.md More corrections --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9413ad0..68c7344 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Not long ago, I've moved the host of the bot from my Raspberry Pi to a VPS, whic -๐Ÿ† Goal *(this year payment cicle)* **`$15 / $24`** +๐Ÿ† Goal *(this year's payment cicle)* **`$15 / $24`** **List of donators**
Sydrus (Patreon) - $9
@@ -111,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 From 42ecc98c927f0c210e4a3dfcbe73ed66c05dafc8 Mon Sep 17 00:00:00 2001 From: Skillkiller Date: Thu, 2 Nov 2017 23:24:32 +0100 Subject: [PATCH 13/15] BugFix --- src/main/java/core/startArgumentHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/core/startArgumentHandler.java b/src/main/java/core/startArgumentHandler.java index f1cc85e..9abbd47 100644 --- a/src/main/java/core/startArgumentHandler.java +++ b/src/main/java/core/startArgumentHandler.java @@ -5,7 +5,7 @@ * DiscordBot/core * ยฉ zekro 2017 */ -public class StartArgumentHandler { +class StartArgumentHandler { public static String[] args; From e19dcb204ebf199b6cf4375b227f7cb164497e82 Mon Sep 17 00:00:00 2001 From: Skillkiller Date: Thu, 2 Nov 2017 23:40:57 +0100 Subject: [PATCH 14/15] Dateiname nicht gleich mit dem Klassennamen --- .../java/commands/administration/{testCMD.java => TestCMD.java} | 0 src/main/java/core/{coreCommands.java => CoreCommands.java} | 0 .../{startArgumentHandler.java => StartArgumentHandler.java} | 2 +- .../{guildJoinListener.java => GuildJoinListener.java} | 0 ...{privateMessageListener.java => PrivateMessageListener.java} | 0 .../listeners/{reactionListener.java => ReactionListener.java} | 0 .../{reconnectListener.java => ReconnectListener.java} | 0 .../java/listeners/{vkickListener.java => VkickListener.java} | 0 .../{voiceChannelListener.java => VoiceChannelListener.java} | 0 9 files changed, 1 insertion(+), 1 deletion(-) rename src/main/java/commands/administration/{testCMD.java => TestCMD.java} (100%) rename src/main/java/core/{coreCommands.java => CoreCommands.java} (100%) rename src/main/java/core/{startArgumentHandler.java => StartArgumentHandler.java} (79%) rename src/main/java/listeners/{guildJoinListener.java => GuildJoinListener.java} (100%) rename src/main/java/listeners/{privateMessageListener.java => PrivateMessageListener.java} (100%) rename src/main/java/listeners/{reactionListener.java => ReactionListener.java} (100%) rename src/main/java/listeners/{reconnectListener.java => ReconnectListener.java} (100%) rename src/main/java/listeners/{vkickListener.java => VkickListener.java} (100%) rename src/main/java/listeners/{voiceChannelListener.java => VoiceChannelListener.java} (100%) 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/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 79% rename from src/main/java/core/startArgumentHandler.java rename to src/main/java/core/StartArgumentHandler.java index 9abbd47..f1cc85e 100644 --- a/src/main/java/core/startArgumentHandler.java +++ b/src/main/java/core/StartArgumentHandler.java @@ -5,7 +5,7 @@ * DiscordBot/core * ยฉ zekro 2017 */ -class StartArgumentHandler { +public class StartArgumentHandler { public static String[] args; 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 From 5ca750f4174e8761df0494c05f3e9942231c76fd Mon Sep 17 00:00:00 2001 From: Skillkiller Date: Thu, 2 Nov 2017 23:44:45 +0100 Subject: [PATCH 15/15] Vote Emojis durch Zahlen ersetzt --- src/main/java/commands/chat/Vote3.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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);