[RELEASE] 2.0.0-alpha.3 (#192)

* [No Ticket] Added new mysql preparation script and updated setup_db script (#181)

* Added new mysql preparation script and updated setup_db script

* Added some explanation to the mysql prep script

* Changed some sql files so that they wont always cause merge conflicts (#182)

* Added MessageSender class and refactored application to use it (#187)

* Delete LICENSE (#188)

* [#183] optional parameters (#189)

* possible to specify optional params. this breaks help command

* Some progress

* some stuff

* Reworked help so it has 1 optional parameter which shows you the help for a specific command

Co-authored-by: Aaron Kromer <[email protected]>

* [#186] Vote command (#190)

* Initial vote command commit

* actually works now pog

* stuff

* Added localisation and some fixes

* Added some fixes

* changed help message to default type. updated version (#191)

Co-authored-by: Aaron Kromer <[email protected]>

core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>hera</artifactId>
         <groupId>hera</groupId>
-        <version>2.0.0-alpha.2</version>
+        <version>2.0.0-alpha.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -44,12 +44,12 @@
         <dependency>
             <groupId>hera</groupId>
             <artifactId>data</artifactId>
-            <version>2.0.0-alpha.2</version>
+            <version>2.0.0-alpha.3</version>
         </dependency>
         <dependency>
             <groupId>hera</groupId>
             <artifactId>metrics</artifactId>
-            <version>2.0.0-alpha.2</version>
+            <version>2.0.0-alpha.3</version>
         </dependency>
     </dependencies>
 </project>

core/src/main/java/hera/core/Core.java

@@ -12,6 +12,7 @@
 import hera.core.api.handlers.YouTubeApiHandler;
 import hera.core.commands.Commands;
 import hera.core.commands.Queue;
+import hera.core.commands.Vote;
 import hera.core.music.HeraAudioManager;
 import hera.database.entities.Guild;
 import hera.database.entities.Token;
@@ -139,21 +140,40 @@ public static void main(String[] args) {
 		// Reaction emoji event stream
 		client.getEventDispatcher().on(ReactionAddEvent.class)
 				.flatMap(event -> Mono.justOrEmpty(client.getSelfId())
-					.filter(selfId -> event.getUserId().asLong() != selfId.asLong())
-					.flatMap(selfId -> event.getGuild()
-						.filter(guild -> event.getMessageId().asLong() == HeraAudioManager.getScheduler(guild).getCurrentQueueMessageId())
-						.flatMap(guild -> event.getChannel()
-								.flatMap(channel -> event.getMessage()
-										.flatMap(message -> Mono.justOrEmpty(message.getEmbeds().get(0).getFooter())
-												.flatMap(footer -> Mono.justOrEmpty(event.getEmoji().asUnicodeEmoji())
-														.flatMap(unicode -> message.delete()
-															.then(Queue.executeFromReaction(event, channel, footer.getText(), unicode.getRaw(), guild))
+						.filter(selfId -> event.getUserId().asLong() != selfId.asLong())
+						.flatMap(selfId -> event.getGuild()
+								.filter(guild -> event.getMessageId().asLong() == HeraAudioManager.getScheduler(guild).getCurrentQueueMessageId())
+								.flatMap(guild -> event.getChannel()
+										.flatMap(channel -> event.getMessage()
+												.flatMap(message -> Mono.justOrEmpty(message.getEmbeds().get(0).getFooter())
+														.flatMap(footer -> Mono.justOrEmpty(event.getEmoji().asUnicodeEmoji())
+																.flatMap(unicode -> message.delete()
+																	.then(Queue.executeFromReaction(event, channel, footer.getText(), unicode.getRaw(), guild))
+																)
+														)
+												)
+										)
+								)
+								.switchIfEmpty(Mono.just(Vote.ACTIVE_VOTE_MESSAGE_IDS)
+										.filter(activeVotes -> activeVotes.keySet().contains(event.getMessageId().asLong()))
+										.flatMap(activeVotes -> event.getGuild()
+												.flatMap(guild -> event.getChannel()
+														.flatMap(channel -> event.getUser()
+																.flatMap(user -> user.asMember(guild.getId())
+																		.flatMap(member -> event.getMessage()
+																				.flatMap(message -> Mono.justOrEmpty(message.getEmbeds().get(0).getDescription())
+																						.flatMap(description -> Mono.justOrEmpty(event.getEmoji().asUnicodeEmoji())
+																								.flatMap(unicode -> Vote.executeFromReaction(event, channel, message.getReactions(), description, unicode.getRaw(), member, guild))
+																								.then()
+																						)
+																				)
+																		)
+																)
 														)
 												)
 										)
 								)
 						)
-					)
 				)
 				.subscribe();