[maven-release-plugin] prepare release abstracto-application-1.2.5

adding Instant handling to GSON

abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>assignable-roles</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/assignable-roles/assignable-roles-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>assignable-roles</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>assignable-roles-int</artifactId>

abstracto-application/abstracto-modules/assignable-roles/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/entertainment/entertainment-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>entertainment</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/entertainment/entertainment-impl/src/main/java/dev/sheldan/abstracto/entertainment/command/LoveCalc.java

@@ -49,8 +49,8 @@ public class LoveCalc extends AbstractConditionableCommand {
     @Override
     public CommandConfiguration getConfiguration() {
         List<Parameter> parameters = new ArrayList<>();
-        parameters.add(Parameter.builder().name("firstSubject").type(String.class).templated(true).optional(true).build());
-        parameters.add(Parameter.builder().name("secondSubject").type(String.class).templated(true).optional(true).build());
+        parameters.add(Parameter.builder().name("firstSubject").type(String.class).templated(true).build());
+        parameters.add(Parameter.builder().name("secondSubject").type(String.class).templated(true).build());
         HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
         return CommandConfiguration.builder()
                 .name("loveCalc")

abstracto-application/abstracto-modules/entertainment/entertainment-impl/src/test/java/dev/sheldan/abstracto/entertainment/command/RollTest.java

@@ -49,7 +49,7 @@ public class RollTest {
         Long serverId = 3L;
         Integer max = 10;
         when(noParameters.getGuild().getIdLong()).thenReturn(serverId);
-        when(configService.getLongValue(ROLL_DEFAULT_HIGH_KEY, serverId)).thenReturn(max.longValue());
+        when(configService.getLongValueOrConfigDefault(ROLL_DEFAULT_HIGH_KEY, serverId)).thenReturn(max.longValue());
         when(entertainmentService.calculateRollResult(1, max)).thenReturn(result);
         when(channelService.sendEmbedTemplateInTextChannelList(eq(Roll.ROLL_RESPONSE_TEMPLATE_KEY), responseModelArgumentCaptor.capture(), eq(noParameters.getChannel()))).thenReturn(CommandTestUtilities.messageFutureList());
         CompletableFuture<CommandResult> futureResult = testUnit.executeAsync(noParameters);

abstracto-application/abstracto-modules/entertainment/entertainment-impl/src/test/java/dev/sheldan/abstracto/entertainment/service/EntertainmentServiceBeanTest.java

@@ -79,7 +79,7 @@ public class EntertainmentServiceBeanTest {
         when(guild.getIdLong()).thenReturn(serverId);
         when(member.getGuild()).thenReturn(guild);
         Long sides = 6L;
-        when(configService.getLongValue(EntertainmentFeatureConfig.ROULETTE_BULLETS_CONFIG_KEY, serverId)).thenReturn(sides);
+        when(configService.getLongValueOrConfigDefault(EntertainmentFeatureConfig.ROULETTE_BULLETS_CONFIG_KEY, serverId)).thenReturn(sides);
         when(secureRandom.nextInt(sides.intValue())).thenReturn(randomValue);
         boolean shot = testUnit.executeRoulette(member);
         Assert.assertEquals(randomValue == 0, shot);

abstracto-application/abstracto-modules/entertainment/entertainment-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>entertainment</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/entertainment/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>experience-tracking</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/listener/JoiningUserRoleListener.java

@@ -37,11 +37,10 @@ public class JoiningUserRoleListener implements AsyncJoinListener {
     public DefaultListenerResult execute(MemberJoinModel model) {
         AUserInAServer userInAServer = userInServerManagementService.loadOrCreateUser(model.getServerId(), model.getJoiningUser().getUserId());
         AUserExperience userExperience = userExperienceManagementService.findUserInServer(userInAServer);
-        Long userInServerId = userInAServer.getUserInServerId();
         if(userExperience != null) {
             log.info("User {} joined {} with previous experience. Setting up experience role again (if necessary).", model.getJoiningUser().getUserId(), model.getServerId());
             userExperienceService.syncForSingleUser(userExperience).thenAccept(result ->
-                log.info("Finished re-assigning experience for re-joining user {} in server {}.", userInServerId, model.getServerId())
+                log.info("Finished re-assigning experience for re-joining user {} in server {}.", model.getJoiningUser().getUserId(), model.getServerId())
             );
         } else {
             log.info("Joined user {} in server {} does not have any previous experience. Not setting up anything.", model.getJoiningUser().getUserId(), model.getServerId());

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/test/java/dev/sheldan/abstracto/experience/listener/JoiningUserRoleListenerTest.java

@@ -1,5 +1,7 @@
 package dev.sheldan.abstracto.experience.listener;
 
+import dev.sheldan.abstracto.core.listener.DefaultListenerResult;
+import dev.sheldan.abstracto.core.listener.ListenerExecutionResult;
 import dev.sheldan.abstracto.core.models.ServerUser;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.models.listener.MemberJoinModel;
@@ -7,6 +9,7 @@ import dev.sheldan.abstracto.core.service.management.UserInServerManagementServi
 import dev.sheldan.abstracto.experience.model.database.AUserExperience;
 import dev.sheldan.abstracto.experience.service.AUserExperienceService;
 import dev.sheldan.abstracto.experience.service.management.UserExperienceManagementService;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -48,9 +51,9 @@ public class JoiningUserRoleListenerTest {
 
     @Before
     public void setup() {
-        when(serverUser.getServerId()).thenReturn(SERVER_ID);
         when(serverUser.getUserId()).thenReturn(USER_ID);
         when(model.getJoiningUser()).thenReturn(serverUser);
+        when(model.getServerId()).thenReturn(SERVER_ID);
         when(userInServerManagementService.loadOrCreateUser(SERVER_ID, USER_ID)).thenReturn(aUserInAServer);
     }
 
@@ -59,7 +62,8 @@ public class JoiningUserRoleListenerTest {
         AUserExperience experience = Mockito.mock(AUserExperience.class);
         when(userExperienceManagementService.findUserInServer(aUserInAServer)).thenReturn(experience);
         when(userExperienceService.syncForSingleUser(experience)).thenReturn(CompletableFuture.completedFuture(null));
-        testUnit.execute(model);
+        DefaultListenerResult result = testUnit.execute(model);
+        Assert.assertEquals(DefaultListenerResult.PROCESSED, result);
     }
 
     @Test

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>experience-tracking</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/experience-tracking/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/link-embed/link-embed-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>link-embed</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/link-embed/link-embed-impl/src/main/java/dev/sheldan/abstracto/linkembed/service/MessageEmbedServiceBean.java

@@ -30,7 +30,7 @@ import java.util.regex.Pattern;
 @Slf4j
 public class MessageEmbedServiceBean implements MessageEmbedService {
 
-    private Pattern messageRegex = Pattern.compile("(?<whole>https://discord(?:app)?.com/channels/(?<server>\\d+)/(?<channel>\\d+)/(?<message>\\d+)(?:.*?))+");
+    private final Pattern messageRegex = Pattern.compile("(?<whole>(?:https?://)?(?:\\w+\\.)?discord(?:app)?\\.com/channels/(?<server>\\d+)/(?<channel>\\d+)/(?<message>\\d+)(?:.*?))+");
 
     public static final String MESSAGE_EMBED_TEMPLATE = "message_embed";
     public static final String REMOVAL_EMOTE = "removeEmbed";

abstracto-application/abstracto-modules/link-embed/link-embed-impl/src/test/java/dev/sheldan/abstracto/linkembed/service/management/MessageEmbedPostManagementServiceBeanTest.java

@@ -59,7 +59,6 @@ public class MessageEmbedPostManagementServiceBeanTest {
         AUserInAServer embeddedUser = Mockito.mock(AUserInAServer.class);
         AChannel channel = Mockito.mock(AChannel.class);
         AServer server = Mockito.mock(AServer.class);
-        when(server.getId()).thenReturn(SERVER_ID);
         when(serverManagementService.loadOrCreate(SERVER_ID)).thenReturn(server);
         when(channelManagementService.loadChannel(EMBEDDING_CHANNEL_ID)).thenReturn(channel);
         CachedMessage cachedMessage = Mockito.mock(CachedMessage.class);
@@ -69,7 +68,6 @@ public class MessageEmbedPostManagementServiceBeanTest {
         CachedAuthor cachedAuthor = Mockito.mock(CachedAuthor.class);
         when(cachedAuthor.getAuthorId()).thenReturn(EMBEDDED_USER_ID);
         when(cachedMessage.getAuthor()).thenReturn(cachedAuthor);
-        when(cachedMessage.getServerId()).thenReturn(SERVER_ID);
         Message embeddingMessage = Mockito.mock(Message.class);
         MessageChannel embeddingChannel = Mockito.mock(MessageChannel.class);
         when(embeddingChannel.getIdLong()).thenReturn(EMBEDDING_CHANNEL_ID);
@@ -99,7 +97,6 @@ public class MessageEmbedPostManagementServiceBeanTest {
     public void testToCreateEmbedForDifferentServers() {
         Long originServerId = 4L;
         AServer originalServer = Mockito.mock(AServer.class);
-        when(originalServer.getId()).thenReturn(originServerId);
         AServer embeddingServer = Mockito.mock(AServer.class);
         when(embeddingServer.getId()).thenReturn(SERVER_ID);
         AUserInAServer embeddingUser = Mockito.mock(AUserInAServer.class);

abstracto-application/abstracto-modules/link-embed/link-embed-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>link-embed</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/link-embed/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/moderation/moderation-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>moderation</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/LeaveLogger.java

@@ -51,7 +51,7 @@ public class LeaveLogger implements AsyncLeaveListener {
 
     @Override
     public DefaultListenerResult execute(MemberLeaveModel model) {
-        String text = templateService.renderTemplateWithMap(USER_LEAVE_TEMPLATE, getUserParameter(model.getMember().getUser()), model.getLeavingUser().getServerId());
+        String text = templateService.renderTemplateWithMap(USER_LEAVE_TEMPLATE, getUserParameter(model.getMember().getUser()), model.getServerId());
         postTargetService.sendTextInPostTarget(text, LoggingPostTarget.LEAVE_LOG, model.getServerId());
         return DefaultListenerResult.PROCESSED;
     }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageEditedListener.java

@@ -45,7 +45,7 @@ public class MessageEditedListener implements AsyncMessageTextUpdatedListener {
             log.trace("Message content was the same. Possible reason was: message was not in cache.");
             return DefaultListenerResult.IGNORED;
         }
-        log.trace("Message {} in channel {} in guild {} was edited.", messageBefore.getMessageId(), messageBefore.getChannelId(), messageBefore.getServerId());
+        log.trace("Message {} in channel {} in guild {} was edited.", messageBefore.getMessageId(), messageBefore.getChannelId(), model.getServerId());
         TextChannel textChannel = channelService.getTextChannelFromServer(model.getServerId(), messageBefore.getChannelId());
         MessageEditedLog log = MessageEditedLog
                 .builder()
@@ -55,8 +55,8 @@ public class MessageEditedListener implements AsyncMessageTextUpdatedListener {
                 .guild(textChannel.getGuild())
                 .member(messageAfter.getMember())
                 .build();
-        MessageToSend message = templateService.renderEmbedTemplate(MESSAGE_EDITED_TEMPLATE, log, messageBefore.getServerId());
-        postTargetService.sendEmbedInPostTarget(message, LoggingPostTarget.EDIT_LOG, messageBefore.getServerId());
+        MessageToSend message = templateService.renderEmbedTemplate(MESSAGE_EDITED_TEMPLATE, log, model.getServerId());
+        postTargetService.sendEmbedInPostTarget(message, LoggingPostTarget.EDIT_LOG, model.getServerId());
         return DefaultListenerResult.PROCESSED;
     }
 

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/listener/JoinLoggerTest.java

@@ -49,14 +49,11 @@ public class JoinLoggerTest {
 
     @Test
     public void testExecute() {
-        when(serverUser.getUserId()).thenReturn(USER_ID);
-        when(serverUser.getServerId()).thenReturn(SERVER_ID);
         when(model.getMember()).thenReturn(member);
-        when(memberService.getMemberInServerAsync(SERVER_ID, USER_ID)).thenReturn(CompletableFuture.completedFuture(member));
-        testUnit.execute(model);
-        when(serverUser.getServerId()).thenReturn(SERVER_ID);
+        when(model.getServerId()).thenReturn(SERVER_ID);
         String message = "text";
         when(templateService.renderTemplateWithMap(eq(JoinLogger.USER_JOIN_TEMPLATE), any(), eq(SERVER_ID))).thenReturn(message);
+        testUnit.execute(model);
         verify(postTargetService, times(1)).sendTextInPostTarget(message, LoggingPostTarget.JOIN_LOG, SERVER_ID);
     }
 

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/listener/JoinMuteListenerTest.java

@@ -31,12 +31,6 @@ public class JoinMuteListenerTest {
     @Mock
     private UserInServerManagementService userInServerManagementService;
 
-    @Mock
-    private Member member;
-
-    @Mock
-    private Guild guild;
-
     @Mock
     private AUserInAServer joiningUser;
 
@@ -51,22 +45,22 @@ public class JoinMuteListenerTest {
 
     @Test
     public void testNonMutedUserJoins() {
-        when(serverUser.getServerId()).thenReturn(SERVER_ID);
         when(serverUser.getUserId()).thenReturn(USER_ID);
         when(userInServerManagementService.loadOrCreateUser(SERVER_ID, USER_ID)).thenReturn(joiningUser);
         when(muteManagementService.hasActiveMute(joiningUser)).thenReturn(false);
-        when(model.getMember()).thenReturn(member);
+        when(model.getServerId()).thenReturn(SERVER_ID);
+        when(model.getJoiningUser()).thenReturn(serverUser);
         testUnit.execute(model);
         verify(muteService, times(0)).applyMuteRole(joiningUser);
     }
 
     @Test
     public void testMutedUserJoins() {
-        when(serverUser.getServerId()).thenReturn(SERVER_ID);
+        when(model.getServerId()).thenReturn(SERVER_ID);
         when(serverUser.getUserId()).thenReturn(USER_ID);
         when(userInServerManagementService.loadOrCreateUser(SERVER_ID, USER_ID)).thenReturn(joiningUser);
         when(muteManagementService.hasActiveMute(joiningUser)).thenReturn(true);
-        when(model.getMember()).thenReturn(member);
+        when(model.getJoiningUser()).thenReturn(serverUser);
         testUnit.execute(model);
         verify(muteService, times(1)).applyMuteRole(joiningUser);
     }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/listener/LeaveLoggerTest.java

@@ -51,14 +51,11 @@ public class LeaveLoggerTest {
 
      @Test
      public void testExecute() {
-         when(leavingUser.getUserId()).thenReturn(USER_ID);
-         when(leavingUser.getServerId()).thenReturn(SERVER_ID);
-         when(memberService.getMemberInServerAsync(SERVER_ID, USER_ID)).thenReturn(CompletableFuture.completedFuture(member));
+         when(model.getServerId()).thenReturn(SERVER_ID);
          when(model.getMember()).thenReturn(member);
          User user = Mockito.mock(User.class);
          when(member.getUser()).thenReturn(user);
          String message = "text";
-         when(leavingUser.getServerId()).thenReturn(SERVER_ID);
          when(templateService.renderTemplateWithMap(eq(LeaveLogger.USER_LEAVE_TEMPLATE), any(), eq(SERVER_ID))).thenReturn(message);
          testUnit.execute(model);
          verify(postTargetService, times(1)).sendTextInPostTarget(message, LoggingPostTarget.LEAVE_LOG, SERVER_ID);

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/listener/MessageDeleteLogListenerTest.java

@@ -94,7 +94,6 @@ public class MessageDeleteLogListenerTest {
     public void testExecuteListener() {
         when(deletedMessage.getAuthor()).thenReturn(cachedAuthor);
         when(cachedAuthor.getAuthorId()).thenReturn(AUTHOR_ID);
-        when(deletedMessage.getServerId()).thenReturn(SERVER_ID);
         when(memberService.getMemberInServerAsync(SERVER_ID, AUTHOR_ID)).thenReturn(CompletableFuture.completedFuture(member));
         when(model.getCachedMessage()).thenReturn(deletedMessage);
         when(model.getServerId()).thenReturn(SERVER_ID);

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/listener/MessageEditedListenerTest.java

@@ -51,6 +51,7 @@ public class MessageEditedListenerTest {
     @Mock
     private CachedMessage messageBefore;
 
+    @Mock
     private MessageTextUpdatedModel model;
 
     private static final Long SERVER_ID = 4L;
@@ -77,17 +78,16 @@ public class MessageEditedListenerTest {
         Guild guild = Mockito.mock(Guild.class);
         when(channel.getGuild()).thenReturn(guild);
         Member author = Mockito.mock(Member.class);
-        CachedAuthor cachedAuthor = Mockito.mock(CachedAuthor.class);
-        when(cachedAuthor.getAuthorId()).thenReturn(AUTHOR_ID);
         when(messageBefore.getContent()).thenReturn(content);
-        when(messageBefore.getServerId()).thenReturn(SERVER_ID);
+        when(messageBefore.getChannelId()).thenReturn(CHANNEL_ID);
         MessageToSend messageToSend = Mockito.mock(MessageToSend.class);
         ArgumentCaptor<MessageEditedLog> captor = ArgumentCaptor.forClass(MessageEditedLog.class);
         when(templateService.renderEmbedTemplate(eq(MessageEditedListener.MESSAGE_EDITED_TEMPLATE), captor.capture(), eq(SERVER_ID))).thenReturn(messageToSend);
-        when(memberService.getMemberInServerAsync(SERVER_ID, AUTHOR_ID)).thenReturn(CompletableFuture.completedFuture(author));
         when(channelService.getTextChannelFromServer(SERVER_ID, CHANNEL_ID)).thenReturn(channel);
         when(model.getAfter()).thenReturn(messageAfter);
         when(model.getBefore()).thenReturn(messageBefore);
+        when(messageAfter.getMember()).thenReturn(author);
+        when(model.getServerId()).thenReturn(SERVER_ID);
         testUnit.execute(model);
         verify(postTargetService, times(1)).sendEmbedInPostTarget(messageToSend, LoggingPostTarget.EDIT_LOG, SERVER_ID);
         MessageEditedLog capturedValue = captor.getValue();

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/service/management/MuteRoleManagementServiceBeanTest.java

@@ -7,6 +7,7 @@ import dev.sheldan.abstracto.moderation.repository.MuteRoleRepository;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
@@ -46,8 +47,12 @@ public class MuteRoleManagementServiceBeanTest {
     @Test
     public void testCreateMuteRoleForServer() {
         ARole role = Mockito.mock(ARole.class);
+        ArgumentCaptor<MuteRole> muteRoleCaptor = ArgumentCaptor.forClass(MuteRole.class);
+        MuteRole savedRole = Mockito.mock(MuteRole.class);
+        when(muteRoleRepository.save(muteRoleCaptor.capture())).thenReturn(savedRole);
         MuteRole muteRoleForServer = testUnit.createMuteRoleForServer(server, role);
-        verifyRoleSaved(role, muteRoleForServer, 1);
+        Assert.assertEquals(savedRole, muteRoleForServer);
+        Assert.assertEquals(role, muteRoleCaptor.getValue().getRole());
     }
 
     @Test
@@ -67,8 +72,12 @@ public class MuteRoleManagementServiceBeanTest {
     public void testSetMuteRoleWithoutPrevious() {
         ARole role = Mockito.mock(ARole.class);
         when(muteRoleRepository.existsByRoleServer(server)).thenReturn(false);
+        ArgumentCaptor<MuteRole> muteRoleCaptor = ArgumentCaptor.forClass(MuteRole.class);
+        MuteRole savedRole = Mockito.mock(MuteRole.class);
+        when(muteRoleRepository.save(muteRoleCaptor.capture())).thenReturn(savedRole);
         MuteRole muteRole = testUnit.setMuteRoleForServer(server, role);
-        verifyRoleSaved(role, muteRole, 1);
+        Assert.assertEquals(savedRole, muteRole);
+        Assert.assertEquals(role, muteRoleCaptor.getValue().getRole());
     }
 
     @Test
@@ -76,16 +85,11 @@ public class MuteRoleManagementServiceBeanTest {
         ARole role = Mockito.mock(ARole.class);
         when(muteRoleRepository.existsByRoleServer(server)).thenReturn(true);
         MuteRole existingRole = Mockito.mock(MuteRole.class);
-        when(existingRole.getRole()).thenReturn(role);
         when(muteRoleRepository.findByRoleServer(server)).thenReturn(existingRole);
-        MuteRole muteRole = testUnit.setMuteRoleForServer(server, role);
-        verifyRoleSaved(role, muteRole, 0);
+        testUnit.setMuteRoleForServer(server, role);
+        verify(existingRole, times(1)).setRole(role);
     }
 
-    private void verifyRoleSaved(ARole role, MuteRole muteRoleForServer, Integer saveCount) {
-        Assert.assertEquals(role, muteRoleForServer.getRole());
-        verify(muteRoleRepository, times(saveCount)).save(muteRoleForServer);
-    }
 
 
 }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/service/management/UserNoteManagementServiceBeanTest.java

@@ -9,6 +9,7 @@ import dev.sheldan.abstracto.moderation.repository.UserNoteRepository;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
@@ -46,10 +47,14 @@ public class UserNoteManagementServiceBeanTest {
         AUser user = Mockito.mock(AUser.class);
         when(userInAServer.getUserReference()).thenReturn(user);
         when(userInAServer.getServerReference()).thenReturn(server);
+        UserNote savedNote = Mockito.mock(UserNote.class);
+        ArgumentCaptor<UserNote> noteCaptor = ArgumentCaptor.forClass(UserNote.class);
+        when(userNoteRepository.save(noteCaptor.capture())).thenReturn(savedNote);
         UserNote userNote = testUnit.createUserNote(userInAServer, NOTE_TEXT);
-        verify(userNoteRepository, times(1)).save(userNote);
-        Assert.assertEquals(userInAServer, userNote.getUser());
-        Assert.assertEquals(NOTE_TEXT, userNote.getNote());
+        Assert.assertEquals(savedNote, userNote);
+        UserNote capturedNote = noteCaptor.getValue();
+        Assert.assertEquals(userInAServer, capturedNote.getUser());
+        Assert.assertEquals(NOTE_TEXT, capturedNote.getNote());
     }
 
     @Test

abstracto-application/abstracto-modules/moderation/moderation-impl/src/test/java/dev/sheldan/abstracto/moderation/service/management/WarnManagementServiceBeanTest.java

@@ -9,6 +9,7 @@ import dev.sheldan.abstracto.moderation.repository.WarnRepository;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
@@ -47,12 +48,16 @@ public class WarnManagementServiceBeanTest {
         when(warningUser.getUserReference()).thenReturn(user);
         when(warnedUser.getUserReference()).thenReturn(user);
         String reason = "REASON";
+        ArgumentCaptor<Warning> warningArgumentCaptor = ArgumentCaptor.forClass(Warning.class);
+        Warning savedWarning = Mockito.mock(Warning.class);
+        when(warnRepository.save(warningArgumentCaptor.capture())).thenReturn(savedWarning);
         Warning warning = testUnit.createWarning(warnedUser, warningUser, reason, 8L);
-        Assert.assertEquals(warningUser, warning.getWarningUser());
-        Assert.assertEquals(warnedUser, warning.getWarnedUser());
-        Assert.assertEquals(reason, warning.getReason());
-        Assert.assertFalse(warning.getDecayed());
-        verify(warnRepository, times(1)).save(warning);
+        Assert.assertEquals(savedWarning, warning);
+        Warning capturedWarning = warningArgumentCaptor.getValue();
+        Assert.assertEquals(warningUser, capturedWarning.getWarningUser());
+        Assert.assertEquals(warnedUser, capturedWarning.getWarnedUser());
+        Assert.assertEquals(reason, capturedWarning.getReason());
+        Assert.assertFalse(capturedWarning.getDecayed());
     }
 
     @Test

abstracto-application/abstracto-modules/moderation/moderation-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>moderation</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/moderation/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/modmail/modmail-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>modmail</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/modmail/modmail-impl/src/test/java/dev/sheldan/abstracto/modmail/listener/ModMailMessageDeletedListenerTest.java

@@ -83,7 +83,6 @@ public class ModMailMessageDeletedListenerTest {
     @Test
     public void testDeleteNonDuplicatedMessage() {
         when(deletedMessage.getMessageId()).thenReturn(DELETED_MESSAGE_ID);
-        when(deletedMessage.getServerId()).thenReturn(SERVER_ID);
         when(modMailMessageManagementService.getByMessageIdOptional(DELETED_MESSAGE_ID)).thenReturn(Optional.of(modMailMessage));
         ModMailThread thread = Mockito.mock(ModMailThread.class);
         AUserInAServer targetUsInAServer = Mockito.mock(AUserInAServer.class);
@@ -100,6 +99,7 @@ public class ModMailMessageDeletedListenerTest {
         when(memberService.getMemberInServerAsync(SERVER_ID, USER_ID)).thenReturn(CompletableFuture.completedFuture(targetMember));
         when(messageService.deleteMessageInChannelWithUser(targetUser, CREATED_MESSAGE_ID_2)).thenReturn(CompletableFuture.completedFuture(null));
         when(model.getCachedMessage()).thenReturn(deletedMessage);
+        when(model.getServerId()).thenReturn(SERVER_ID);
         testUnit.execute(model);
         verify(messageService, times(0)).deleteMessageInChannelInServer(eq(SERVER_ID), anyLong(), any());
         verify(self, times(1)).removeMessageFromThread(DELETED_MESSAGE_ID);
@@ -108,7 +108,6 @@ public class ModMailMessageDeletedListenerTest {
     @Test
     public void testDeleteDuplicatedMessage() {
         when(deletedMessage.getMessageId()).thenReturn(DELETED_MESSAGE_ID);
-        when(deletedMessage.getServerId()).thenReturn(SERVER_ID);
         when(modMailMessageManagementService.getByMessageIdOptional(DELETED_MESSAGE_ID)).thenReturn(Optional.of(modMailMessage));
         ModMailThread thread = Mockito.mock(ModMailThread.class);
         AUserInAServer targetUsInAServer = Mockito.mock(AUserInAServer.class);
@@ -127,6 +126,7 @@ public class ModMailMessageDeletedListenerTest {
         when(memberService.getMemberInServerAsync(SERVER_ID, USER_ID)).thenReturn(CompletableFuture.completedFuture(targetMember));
         when(messageService.deleteMessageInChannelWithUser(targetUser, CREATED_MESSAGE_ID_2)).thenReturn(CompletableFuture.completedFuture(null));
         when(messageService.deleteMessageInChannelInServer(SERVER_ID, CHANNEL_ID, CREATED_MESSAGE_ID_1)).thenReturn(CompletableFuture.completedFuture(null));
+        when(model.getServerId()).thenReturn(SERVER_ID);
         when(model.getCachedMessage()).thenReturn(deletedMessage);
         testUnit.execute(model);
         verify(self, times(1)).removeMessageFromThread(DELETED_MESSAGE_ID);

abstracto-application/abstracto-modules/modmail/modmail-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>modmail</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/modmail/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto</groupId>
         <artifactId>abstracto-application</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -23,6 +23,7 @@
         <module>remind</module>
         <module>suggestion</module>
         <module>repost-detection</module>
+        <module>webservices</module>
     </modules>
 
 

abstracto-application/abstracto-modules/remind/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/remind/remind-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>remind</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/remind/remind-impl/src/test/java/dev/sheldan/abstracto/remind/service/management/ReminderManagementServiceBeanTest.java

@@ -10,6 +10,7 @@ import dev.sheldan.abstracto.remind.repository.ReminderRepository;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
@@ -56,15 +57,19 @@ public class ReminderManagementServiceBeanTest {
         String reminderText = "text";
         Instant reminderTargetDate = Instant.ofEpochSecond(1590615937);
         Long messageId = 5L;
+        ArgumentCaptor<Reminder> reminderArgumentCaptor = ArgumentCaptor.forClass(Reminder.class);
+        Reminder savedReminder = Mockito.mock(Reminder.class);
+        when(reminderRepository.save(reminderArgumentCaptor.capture())).thenReturn(savedReminder);
         Reminder createdReminder = testUnit.createReminder(serverAChannelAUser, reminderText, reminderTargetDate, messageId);
-        Assert.assertEquals(messageId, createdReminder.getMessageId());
-        Assert.assertEquals(aUserInAServer, createdReminder.getRemindedUser());
-        Assert.assertEquals(server, createdReminder.getServer());
-        Assert.assertEquals(reminderText, createdReminder.getText());
-        Assert.assertEquals(reminderTargetDate, createdReminder.getTargetDate());
-        Assert.assertEquals(channel, createdReminder.getChannel());
-        Assert.assertFalse(createdReminder.isReminded());
-        verify(reminderRepository, times(1)).save(createdReminder);
+        Assert.assertEquals(savedReminder, createdReminder);
+        Reminder capturedReminder = reminderArgumentCaptor.getValue();
+        Assert.assertEquals(messageId, capturedReminder.getMessageId());
+        Assert.assertEquals(aUserInAServer, capturedReminder.getRemindedUser());
+        Assert.assertEquals(server, capturedReminder.getServer());
+        Assert.assertEquals(reminderText, capturedReminder.getText());
+        Assert.assertEquals(reminderTargetDate, capturedReminder.getTargetDate());
+        Assert.assertEquals(channel, capturedReminder.getChannel());
+        Assert.assertFalse(capturedReminder.isReminded());
     }
 
     @Test

abstracto-application/abstracto-modules/remind/remind-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>remind</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/repost-detection/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/repost-detection/repost-detection-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>repost-detection</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/repost-detection/repost-detection-impl/src/test/java/dev/sheldan/abstracto/repostdetection/service/management/PostedImageManagementBeanTest.java

@@ -12,6 +12,7 @@ import dev.sheldan.abstracto.repostdetection.service.RepostServiceBean;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
@@ -55,11 +56,15 @@ public class PostedImageManagementBeanTest {
         when(serverAChannelAUser.getGuild()).thenReturn(server);
         when(serverAChannelAUser.getChannel()).thenReturn(channel);
         when(serverAChannelAUser.getAUserInAServer()).thenReturn(aUserInAServer);
+        ArgumentCaptor<PostedImage> postedImageArgumentCaptor = ArgumentCaptor.forClass(PostedImage.class);
+        PostedImage savedPost = Mockito.mock(PostedImage.class);
+        when(postedImageRepository.save(postedImageArgumentCaptor.capture())).thenReturn(savedPost);
         PostedImage createdPost = testUnit.createPost(serverAChannelAUser, MESSAGE_ID, HASH, INDEX);
-        Assert.assertEquals(HASH, createdPost.getImageHash());
-        Assert.assertEquals(INDEX, createdPost.getPostId().getPosition());
-        Assert.assertEquals(MESSAGE_ID, createdPost.getPostId().getMessageId());
-        verify(postedImageRepository, times(1)).save(createdPost);
+        Assert.assertEquals(savedPost, createdPost);
+        PostedImage capturedPost = postedImageArgumentCaptor.getValue();
+        Assert.assertEquals(HASH, capturedPost.getImageHash());
+        Assert.assertEquals(INDEX, capturedPost.getPostId().getPosition());
+        Assert.assertEquals(MESSAGE_ID, capturedPost.getPostId().getMessageId());
     }
 
     @Test

abstracto-application/abstracto-modules/repost-detection/repost-detection-impl/src/test/java/dev/sheldan/abstracto/repostdetection/service/management/RepostCheckChannelGroupManagementBeanTest.java

@@ -7,10 +7,7 @@ import dev.sheldan.abstracto.repostdetection.repository.RepostCheckChannelReposi
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
+import org.mockito.*;
 import org.mockito.junit.MockitoJUnitRunner;
 
 import java.util.Optional;
@@ -105,12 +102,14 @@ public class RepostCheckChannelGroupManagementBeanTest {
     @Test
     public void testCreateRepostCheckChannelGroup() {
         when(aChannelGroup.getId()).thenReturn(CHANNEL_GROUP_ID);
+        RepostCheckChannelGroup savedGroup = Mockito.mock(RepostCheckChannelGroup.class);
+        when(repository.save(checkChannelGroupArgumentCaptor.capture())).thenReturn(savedGroup);
         RepostCheckChannelGroup createdCheckChannelGroup = testUnit.createRepostCheckChannelGroup(aChannelGroup);
-        verify(repository, times(1)).save(checkChannelGroupArgumentCaptor.capture());
-        Assert.assertEquals(checkChannelGroupArgumentCaptor.getValue(), createdCheckChannelGroup);
-        Assert.assertTrue(createdCheckChannelGroup.getCheckEnabled());
-        Assert.assertEquals(CHANNEL_GROUP_ID, createdCheckChannelGroup.getId());
-        Assert.assertEquals(aChannelGroup, createdCheckChannelGroup.getChannelGroup());
+        Assert.assertEquals(savedGroup, createdCheckChannelGroup);
+        RepostCheckChannelGroup capturedGroup = checkChannelGroupArgumentCaptor.getValue();
+        Assert.assertTrue(capturedGroup.getCheckEnabled());
+        Assert.assertEquals(CHANNEL_GROUP_ID, capturedGroup.getId());
+        Assert.assertEquals(aChannelGroup, capturedGroup.getChannelGroup());
     }
 
     @Test(expected = RepostCheckChannelGroupNotFoundException.class)

abstracto-application/abstracto-modules/repost-detection/repost-detection-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>repost-detection</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/starboard/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/starboard/starboard-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>starboard</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/repository/StarboardPostReactionRepository.java

@@ -15,6 +15,8 @@ public interface StarboardPostReactionRepository extends JpaRepository<Starboard
 
     void deleteByStarboardPost(StarboardPost post);
 
+    long countByStarboardPost(StarboardPost post);
+
     @Query(value = "SELECT r.reactor_user_in_server_id as userId, COUNT(*) AS starCount \n" +
             "FROM starboard_post_reaction r \n" +
             "INNER JOIN starboard_post p ON p.id = r.post_id\n" +

abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/repository/StarboardPostRepository.java

@@ -18,6 +18,8 @@ public interface StarboardPostRepository extends JpaRepository<StarboardPost, Lo
 
     List<StarboardPost> findByServer_Id(Long serverId);
 
+    Long countByServer_Id(Long serverId);
+
     @Query(value = "SELECT p.id, COUNT(*) AS starCount \n" +
             " FROM starboard_post p \n" +
             " INNER JOIN starboard_post_reaction r ON p.id = r.post_id\n" +
@@ -30,6 +32,16 @@ public interface StarboardPostRepository extends JpaRepository<StarboardPost, Lo
             " LIMIT :count", nativeQuery = true)
     List<Long> getTopStarboardPostsForUser(Long serverId, Long userId, Integer count);
 
+    @Query(value = "SELECT p.id, COUNT(*) AS starCount \n" +
+            " FROM starboard_post p \n" +
+            " INNER JOIN starboard_post_reaction r ON p.id = r.post_id\n" +
+            " WHERE p.server_id = :serverId\n" +
+            " AND p.ignored = false\n" +
+            " GROUP BY p.id \n" +
+            " ORDER BY starCount DESC \n" +
+            " LIMIT :count", nativeQuery = true)
+    List<Long> getTopStarboardPostsForServer(Long serverId, Integer count);
+
     @Query(value = "SELECT COUNT(*) AS starCount\n" +
             "FROM starboard_post_reaction r \n" +
             " INNER JOIN starboard_post p ON p.id = r.post_id \n" +

abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/service/StarboardServiceBean.java

@@ -32,6 +32,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
@@ -195,8 +196,8 @@ public class StarboardServiceBean implements StarboardService {
         allFutures.addAll(topStarReceiverFutures);
         return FutureUtils.toSingleFuture(allFutures).thenApply(aVoid -> {
             List<StarboardPost> starboardPosts = starboardPostManagementService.retrieveTopPosts(serverId, count);
-            List<StarStatsPost> starStatsPosts = starboardPosts.stream().map(this::fromStarboardPost).collect(Collectors.toList());
-            Integer postCount = starboardPostManagementService.getPostCount(serverId);
+            List<StarStatsPost> starStatsPosts = starboardPosts.stream().map(this::fromStarboardPost).sorted(Comparator.comparingLong(StarStatsPost::getStarCount).reversed()).collect(Collectors.toList());
+            Long postCount = starboardPostManagementService.getPostCount(serverId);
             Integer reactionCount = starboardPostReactorManagementService.getStarCount(serverId);
             List<String> emotes = new ArrayList<>();
             for (int i = 1; i < count + 1; i++) {
@@ -223,7 +224,7 @@ public class StarboardServiceBean implements StarboardService {
         Long receivedStars = starboardPostManagementService.retrieveReceivedStarsOfUserInServer(member.getGuild().getIdLong(), member.getIdLong());
         Long givenStars = starboardPostManagementService.retrieveGivenStarsOfUserInServer(member.getGuild().getIdLong(), member.getIdLong());
         List<StarboardPost> topPosts = starboardPostManagementService.retrieveTopPostsForUserInServer(member.getGuild().getIdLong(), member.getIdLong(), count);
-        List<StarStatsPost> starStatsPosts = topPosts.stream().map(this::fromStarboardPost).collect(Collectors.toList());
+        List<StarStatsPost> starStatsPosts = topPosts.stream().map(this::fromStarboardPost).sorted(Comparator.comparingLong(StarStatsPost::getStarCount).reversed()).collect(Collectors.toList());
         List<String> emotes = new ArrayList<>();
         for (int i = 1; i < count + 1; i++) {
             emotes.add(getStarboardRankingEmote(member.getGuild().getIdLong(), i));
@@ -245,7 +246,7 @@ public class StarboardServiceBean implements StarboardService {
                 .serverId(starboardPost.getServer().getId())
                 .channelId(channel.getId())
                 .messageId(starboardPost.getPostMessageId())
-                .starCount(starboardPost.getReactions().size())
+                .starCount(starboardPostReactorManagementService.getReactorCountOfPost(starboardPost))
                 .build();
     }
 

abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/service/management/StarboardPostManagementServiceBean.java

@@ -58,10 +58,8 @@ public class StarboardPostManagementServiceBean implements StarboardPostManageme
 
     @Override
     public List<StarboardPost> retrieveTopPosts(Long serverId, Integer count) {
-        List<StarboardPost> posts = retrieveAllPosts(serverId);
-        posts.sort(Comparator.comparingInt(o -> o.getReactions().size()));
-        Collections.reverse(posts);
-        return posts.subList(0, Math.min(count, posts.size()));
+        List<Long> topPostIds = repository.getTopStarboardPostsForServer(serverId, count);
+        return repository.findAllById(topPostIds);
     }
 
     @Override
@@ -86,8 +84,8 @@ public class StarboardPostManagementServiceBean implements StarboardPostManageme
     }
 
     @Override
-    public Integer getPostCount(Long serverId) {
-        return retrieveAllPosts(serverId).size();
+    public Long getPostCount(Long serverId) {
+        return repository.countByServer_Id(serverId);
     }
 
     @Override

abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/service/management/StarboardPostReactorManagementServiceBean.java

@@ -65,4 +65,9 @@ public class StarboardPostReactorManagementServiceBean implements StarboardPostR
         return converter.convertToStarStatsUser(starReceivers, serverId);
     }
 
+    @Override
+    public Long getReactorCountOfPost(StarboardPost starboardPost) {
+        return repository.countByStarboardPost(starboardPost);
+    }
+
 }

abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/resources/migrations/1.2.3-starboard/collection.xml

@@ -0,0 +1,10 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog ../dbchangelog-3.8.xsd
+    http://www.liquibase.org/xml/ns/dbchangelog-ext ../dbchangelog-3.8.xsd
+    http://www.liquibase.org/xml/ns/pro ../dbchangelog-3.8.xsd" >
+    <include file="starboard-tables/tables.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>

abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/resources/migrations/1.2.3-starboard/starboard-tables/starboard_post.xml

@@ -0,0 +1,15 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog ../../dbchangelog-3.8.xsd
+    http://www.liquibase.org/xml/ns/dbchangelog-ext ../../dbchangelog-3.8.xsd
+    http://www.liquibase.org/xml/ns/pro ../../dbchangelog-3.8.xsd" >
+    <changeSet author="Sheldan" id="additional_starboard_post-index">
+        <createIndex indexName="idx_starboard_author" tableName="starboard_post">
+            <column name="author_user_in_server_id"/>
+        </createIndex>
+    </changeSet>
+
+</databaseChangeLog>

abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/resources/migrations/1.2.3-starboard/starboard-tables/starboard_post_reaction.xml

@@ -0,0 +1,18 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog ../../dbchangelog-3.8.xsd
+    http://www.liquibase.org/xml/ns/dbchangelog-ext ../../dbchangelog-3.8.xsd
+    http://www.liquibase.org/xml/ns/pro ../../dbchangelog-3.8.xsd" >
+    <changeSet author="Sheldan" id="additional_starboard_reaction-index">
+        <createIndex indexName="idx_starboard_reaction_user" tableName="starboard_post_reaction">
+            <column name="reactor_user_in_server_id"/>
+        </createIndex>
+        <createIndex indexName="idx_starboard_reaction_post" tableName="starboard_post_reaction">
+            <column name="post_id"/>
+        </createIndex>
+    </changeSet>
+
+</databaseChangeLog>

abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/resources/migrations/1.2.3-starboard/starboard-tables/tables.xml

@@ -0,0 +1,11 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog ../../dbchangelog-3.8.xsd
+    http://www.liquibase.org/xml/ns/dbchangelog-ext ../../dbchangelog-3.8.xsd
+    http://www.liquibase.org/xml/ns/pro ../../dbchangelog-3.8.xsd" >
+    <include file="starboard_post.xml" relativeToChangelogFile="true"/>
+    <include file="starboard_post_reaction.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>

abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/resources/migrations/starboard-changeLog.xml

@@ -7,4 +7,5 @@
     http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog-3.8.xsd
     http://www.liquibase.org/xml/ns/pro dbchangelog-3.8.xsd" >
     <include file="1.0-starboard/collection.xml" relativeToChangelogFile="true"/>
+    <include file="1.2.3-starboard/collection.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

abstracto-application/abstracto-modules/starboard/starboard-impl/src/test/java/dev/sheldan/abstracto/starboard/listener/StarAddedListenerTest.java

@@ -25,6 +25,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 
 import java.util.Arrays;
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
 
 import static org.mockito.Mockito.*;
 
@@ -149,9 +150,9 @@ public class StarAddedListenerTest {
     public void testAddingEmoteReachingThreshold() {
         Long requiredStars = 1L;
         setupActingAndAuthor();
+        when(starboardService.createStarboardPost(any(CachedMessage.class), anyList(), eq(userInServerActing), eq(userInAServer))).thenReturn(CompletableFuture.completedFuture(null));
         executeAddingTest(requiredStars, null);
         verify(metricService, times(2)).incrementCounter(any());
-        verify(starboardService, times(1)).createStarboardPost(any(CachedMessage.class), anyList(), eq(userInServerActing), eq(userInAServer));
     }
 
     @Test

abstracto-application/abstracto-modules/starboard/starboard-impl/src/test/java/dev/sheldan/abstracto/starboard/service/StarboardServiceBeanTest.java

@@ -117,6 +117,9 @@ public class StarboardServiceBeanTest {
     @Mock
     private AUser aUser;
 
+    @Mock
+    private StarboardPostCreatedListenerManager starboardPostCreatedListenerManager;
+
     private static final Long STARRED_USER_ID = 5L;
     private static final Long STARRED_SERVER_USER_ID = 2L;
     private static final Long SERVER_ID = 6L;
@@ -194,13 +197,10 @@ public class StarboardServiceBeanTest {
         CachedMessage message = Mockito.mock(CachedMessage.class);
         List<Long> userExceptAuthorIds = Arrays.asList(FIRST_USER_IN_SERVER_ID, SECOND_USER_IN_SERVER_ID);
         List<CompletableFuture<Message>> futures = Arrays.asList(CompletableFuture.completedFuture(sendPost));
-        when(sendPost.getGuild()).thenReturn(guild);
-        when(sendPost.getChannel()).thenReturn(mockedTextChannel);
         when(sendPost.getIdLong()).thenReturn(MESSAGE_ID);
         when(userInServerManagementService.loadUserOptional(STARRED_SERVER_USER_ID)).thenReturn(Optional.of(starredUser));
         when(userInServerManagementService.loadUserOptional(FIRST_USER_IN_SERVER_ID)).thenReturn(Optional.of(userReacting));
         when(userReacting.getUserInServerId()).thenReturn(FIRST_USER_IN_SERVER_ID);
-        when(userReacting.getUserReference()).thenReturn(aUser);
         AChannel channel = Mockito.mock(AChannel.class);
         when(channelManagementService.loadChannel(CHANNEL_ID)).thenReturn(channel);
         StarboardPost post = Mockito.mock(StarboardPost.class);
@@ -208,13 +208,13 @@ public class StarboardServiceBeanTest {
         AUserInAServer secondStarrerUserObj = Mockito.mock(AUserInAServer.class);
         when(userInServerManagementService.loadUserOptional(SECOND_USER_IN_SERVER_ID)).thenReturn(Optional.of(secondStarrerUserObj));
         when(secondStarrerUserObj.getUserInServerId()).thenReturn(SECOND_USER_IN_SERVER_ID);
-        when(secondStarrerUserObj.getUserReference()).thenReturn(aUser);
         testUnit.persistPost(message, userExceptAuthorIds, futures, CHANNEL_ID, STARRED_SERVER_USER_ID, STARRING_USER_ID);
         verify(starboardPostReactorManagementService, times(2)).addReactor(eq(post), userInAServerArgumentCaptor.capture());
         List<AUserInAServer> addedReactors = userInAServerArgumentCaptor.getAllValues();
         Assert.assertEquals(FIRST_USER_IN_SERVER_ID, addedReactors.get(0).getUserInServerId());
         Assert.assertEquals(SECOND_USER_IN_SERVER_ID, addedReactors.get(1).getUserInServerId());
         Assert.assertEquals(2, addedReactors.size());
+        verify(starboardPostCreatedListenerManager, times(1)).sendStarboardPostCreatedEvent(STARRING_USER_ID, post);
     }
 
     @Test
@@ -242,7 +242,7 @@ public class StarboardServiceBeanTest {
         when(config.getLongValue()).thenReturn(1L);
         when(defaultConfigManagementService.getDefaultConfig(StarboardFeatureConfig.STAR_LEVELS_CONFIG_KEY)).thenReturn(config);
         when(defaultConfigManagementService.getDefaultConfig(StarboardFeatureConfig.STAR_LVL_CONFIG_PREFIX + 1)).thenReturn(config);
-        when(starboardPostManagementService.findByStarboardPostMessageId(starboardPostId)).thenReturn(Optional.of(post));
+        when(starboardPostManagementService.findByStarboardPostId(starboardPostId)).thenReturn(Optional.of(post));
         when(userService.retrieveUserForId(STARRED_USER_ID)).thenReturn(CompletableFuture.completedFuture(starredJdaUser));
         List<AUserInAServer > userExceptAuthor = new ArrayList<>();
         CompletableFuture<Void> future = testUnit.updateStarboardPost(post, message, userExceptAuthor);
@@ -280,17 +280,16 @@ public class StarboardServiceBeanTest {
         Integer limit = 3;
         AChannel channel = Mockito.mock(AChannel.class);
         when(server.getId()).thenReturn(SERVER_ID);
-        StarboardPostReaction reaction = Mockito.mock(StarboardPostReaction.class);
         StarboardPost post1 = Mockito.mock(StarboardPost.class);
-        when(post1.getReactions()).thenReturn(Arrays.asList(reaction));
         when(post1.getPostMessageId()).thenReturn(MESSAGE_ID);
         when(post1.getServer()).thenReturn(server);
         when(post1.getStarboardChannel()).thenReturn(channel);
         StarboardPost post2 = Mockito.mock(StarboardPost.class);
         when(post2.getPostMessageId()).thenReturn(SECOND_MESSAGE_ID);
-        when(post2.getReactions()).thenReturn(new ArrayList<>());
         when(post2.getServer()).thenReturn(server);
         when(post2.getStarboardChannel()).thenReturn(channel);
+        when(starboardPostReactorManagementService.getReactorCountOfPost(post1)).thenReturn(1L);
+        when(starboardPostReactorManagementService.getReactorCountOfPost(post2)).thenReturn(0L);
         List<StarboardPost> topPosts = Arrays.asList(post1, post2);
         when(starboardPostManagementService.retrieveTopPosts(SERVER_ID, limit)).thenReturn(topPosts);
         CompletableFuture<StarStatsUser> statsUser = CompletableFuture.completedFuture(Mockito.mock(StarStatsUser.class));
@@ -298,7 +297,7 @@ public class StarboardServiceBeanTest {
         List<CompletableFuture<StarStatsUser>> topGiver = Arrays.asList(statsUser, statsUser2);
         when(starboardPostReactorManagementService.retrieveTopStarGiver(SERVER_ID, limit)).thenReturn(topGiver);
         when(starboardPostReactorManagementService.retrieveTopStarReceiver(SERVER_ID, limit)).thenReturn(topGiver);
-        when(starboardPostManagementService.getPostCount(SERVER_ID)).thenReturn(50);
+        when(starboardPostManagementService.getPostCount(SERVER_ID)).thenReturn(50L);
         when(starboardPostReactorManagementService.getStarCount(SERVER_ID)).thenReturn(500);
         when(emoteService.getUsableEmoteOrDefault(SERVER_ID, "starboardBadge1")).thenReturn("1");
         when(emoteService.getUsableEmoteOrDefault(SERVER_ID, "starboardBadge2")).thenReturn("2");
@@ -339,10 +338,9 @@ public class StarboardServiceBeanTest {
         AServer server = Mockito.mock(AServer.class);
         when(server.getId()).thenReturn(SERVER_ID);
         when(post.getServer()).thenReturn(server);
-        StarboardPostReaction reaction = Mockito.mock(StarboardPostReaction.class);
-        when(post.getReactions()).thenReturn(Collections.singletonList(reaction));
         when(starboardChannel.getId()).thenReturn(STARBOARD_CHANNEL_ID);
         when(post.getPostMessageId()).thenReturn(MESSAGE_ID);
+        when(starboardPostReactorManagementService.getReactorCountOfPost(post)).thenReturn(1L);
         when(starboardPostManagementService.retrieveTopPostsForUserInServer(SERVER_ID, STARRED_USER_ID, 3)).thenReturn(Collections.singletonList(post));
         MemberStarStatsModel returnedModel = testUnit.retrieveStarStatsForMember(starredMember);
         Assert.assertEquals(receivedStars, returnedModel.getReceivedStars());

abstracto-application/abstracto-modules/starboard/starboard-impl/src/test/java/dev/sheldan/abstracto/starboard/service/management/StarboardPostManagementServiceBeanTest.java

@@ -13,6 +13,7 @@ import dev.sheldan.abstracto.starboard.repository.StarboardPostRepository;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
@@ -67,14 +68,18 @@ public class StarboardPostManagementServiceBeanTest {
         when(channelManagementService.loadChannel(SOURCE_CHANNEL_ID)).thenReturn(sourceChannel);
         AUser aUser = Mockito.mock(AUser.class);
         when(aUserInAServer.getUserReference()).thenReturn(aUser);
+        ArgumentCaptor<StarboardPost> argumentCaptor = ArgumentCaptor.forClass(StarboardPost.class);
+        StarboardPost savedPost = Mockito.mock(StarboardPost.class);
+        when(repository.save(argumentCaptor.capture())).thenReturn(savedPost);
         StarboardPost createdStarboardPost = testUnit.createStarboardPost(starredMessage, aUserInAServer, postInStarboard);
-        verify(repository, times(1)).save(createdStarboardPost);
-        Assert.assertEquals(starboardChannel, createdStarboardPost.getStarboardChannel());
-        Assert.assertEquals(starboardPostId, createdStarboardPost.getStarboardMessageId());
-        Assert.assertEquals(starredMessageId, createdStarboardPost.getPostMessageId());
-        Assert.assertEquals(aUserInAServer, createdStarboardPost.getAuthor());
-        Assert.assertEquals(sourceChannel, createdStarboardPost.getSourceChannel());
-        Assert.assertFalse(createdStarboardPost.isIgnored());
+        Assert.assertEquals(savedPost, createdStarboardPost);
+        StarboardPost capturedPost = argumentCaptor.getValue();
+        Assert.assertEquals(starboardChannel, capturedPost.getStarboardChannel());
+        Assert.assertEquals(starboardPostId, capturedPost.getStarboardMessageId());
+        Assert.assertEquals(starredMessageId, capturedPost.getPostMessageId());
+        Assert.assertEquals(aUserInAServer, capturedPost.getAuthor());
+        Assert.assertEquals(sourceChannel, capturedPost.getSourceChannel());
+        Assert.assertFalse(capturedPost.isIgnored());
     }
 
     @Test
@@ -83,20 +88,21 @@ public class StarboardPostManagementServiceBeanTest {
         Long messageId = 6L;
         testUnit.setStarboardPostMessageId(post, messageId);
         verify(post, times(1)).setStarboardMessageId(messageId);
-        verify(repository, times(1)).save(post);
     }
 
     @Test
     public void testRetrieveTopPosts() {
         Integer count = 2;
+        Long postId = 1L;
+        Long postId2 = 3L;
         StarboardPost starboardPost1 = Mockito.mock(StarboardPost.class);
         when(starboardPost1.getReactions()).thenReturn(Arrays.asList(Mockito.mock(StarboardPostReaction.class), Mockito.mock(StarboardPostReaction.class)));
         StarboardPost starboardPost2 = Mockito.mock(StarboardPost.class);
         when(starboardPost2.getReactions()).thenReturn(Arrays.asList(Mockito.mock(StarboardPostReaction.class)));
-        StarboardPost starboardPost3 = Mockito.mock(StarboardPost.class);
-        when(starboardPost3.getReactions()).thenReturn(new ArrayList<>());
-        List<StarboardPost> posts = Arrays.asList(starboardPost1, starboardPost2, starboardPost3);
-        when(repository.findByServer_Id(SERVER_ID)).thenReturn(posts);
+        List<StarboardPost> posts = Arrays.asList(starboardPost1, starboardPost2);
+        List<Long> postIds = Arrays.asList(postId, postId2);
+        when(repository.getTopStarboardPostsForServer(SERVER_ID, count)).thenReturn(postIds);
+        when(repository.findAllById(postIds)).thenReturn(posts);
         List<StarboardPost> topPosts = testUnit.retrieveTopPosts(SERVER_ID, count);
         Assert.assertEquals(count.intValue(), topPosts.size());
         StarboardPost topMostPost = topPosts.get(0);
@@ -109,6 +115,9 @@ public class StarboardPostManagementServiceBeanTest {
     @Test
     public void testRetrieveMoreThanAvailable() {
         Integer count = 5;
+        Long postId = 1L;
+        Long postId2 = 2L;
+        Long postId3 = 3L;
         StarboardPost starboardPost1 = Mockito.mock(StarboardPost.class);
         when(starboardPost1.getReactions()).thenReturn(Arrays.asList(Mockito.mock(StarboardPostReaction.class), Mockito.mock(StarboardPostReaction.class)));
         StarboardPost starboardPost2 = Mockito.mock(StarboardPost.class);
@@ -116,7 +125,9 @@ public class StarboardPostManagementServiceBeanTest {
         StarboardPost starboardPost3 = Mockito.mock(StarboardPost.class);
         when(starboardPost3.getReactions()).thenReturn(new ArrayList<>());
         List<StarboardPost> posts = Arrays.asList(starboardPost1, starboardPost2, starboardPost3);
-        when(repository.findByServer_Id(SERVER_ID)).thenReturn(posts);
+        List<Long> postIds = Arrays.asList(postId, postId2, postId3);
+        when(repository.getTopStarboardPostsForServer(SERVER_ID, 5)).thenReturn(postIds);
+        when(repository.findAllById(postIds)).thenReturn(posts);
         List<StarboardPost> topPosts = testUnit.retrieveTopPosts(SERVER_ID, count);
         StarboardPost topMostPost = topPosts.get(0);
         StarboardPost secondTop = topPosts.get(1);
@@ -194,11 +205,9 @@ public class StarboardPostManagementServiceBeanTest {
 
     @Test
     public void testRetrievePostCount() {
-        StarboardPost starboardPost1 = Mockito.mock(StarboardPost.class);
-        StarboardPost starboardPost2 = Mockito.mock(StarboardPost.class);
-        List<StarboardPost> posts = Arrays.asList(starboardPost1, starboardPost2);
-        when(repository.findByServer_Id(SERVER_ID)).thenReturn(posts);
-        Integer retrievedPostCount = testUnit.getPostCount(SERVER_ID);
-        Assert.assertEquals(posts.size(), retrievedPostCount.intValue());
+        Long expectedCount = 2L;
+        when(repository.countByServer_Id(SERVER_ID)).thenReturn(expectedCount);
+        Long retrievedPostCount = testUnit.getPostCount(SERVER_ID);
+        Assert.assertEquals(expectedCount, retrievedPostCount);
     }
 }

abstracto-application/abstracto-modules/starboard/starboard-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>starboard</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/starboard/starboard-int/src/main/java/dev/sheldan/abstracto/starboard/model/template/GuildStarStatsModel.java

@@ -15,5 +15,5 @@ public class GuildStarStatsModel {
     private List<StarStatsUser> starGiver;
     private Integer totalStars;
     private List<String> badgeEmotes;
-    private Integer starredMessages;
+    private Long starredMessages;
 }

abstracto-application/abstracto-modules/starboard/starboard-int/src/main/java/dev/sheldan/abstracto/starboard/model/template/StarStatsPost.java

@@ -12,7 +12,7 @@ public class StarStatsPost {
     private Long serverId;
     private Long channelId;
     private Long messageId;
-    private Integer starCount;
+    private Long starCount;
 
     public String getMessageUrl() {
         return MessageUtils.buildMessageUrl(serverId ,channelId, messageId);

abstracto-application/abstracto-modules/starboard/starboard-int/src/main/java/dev/sheldan/abstracto/starboard/service/management/StarboardPostManagementService.java

@@ -17,7 +17,7 @@ public interface StarboardPostManagementService {
     Long retrieveGivenStarsOfUserInServer(Long serverId, Long userId);
     Long retrieveReceivedStarsOfUserInServer(Long serverId, Long userId);
     List<StarboardPost> retrieveAllPosts(Long serverId);
-    Integer getPostCount(Long serverId);
+    Long getPostCount(Long serverId);
     Optional<StarboardPost> findByMessageId(Long messageId);
     Optional<StarboardPost> findByStarboardPostId(Long postId);
     Optional<StarboardPost> findByStarboardPostMessageId(Long postId);

abstracto-application/abstracto-modules/starboard/starboard-int/src/main/java/dev/sheldan/abstracto/starboard/service/management/StarboardPostReactorManagementService.java

@@ -15,4 +15,5 @@ public interface StarboardPostReactorManagementService {
     Integer getStarCount(Long serverId);
     List<CompletableFuture<StarStatsUser>> retrieveTopStarGiver(Long serverId, Integer count);
     List<CompletableFuture<StarStatsUser>> retrieveTopStarReceiver(Long serverId, Integer count);
+    Long getReactorCountOfPost(StarboardPost starboardPost);
 }

abstracto-application/abstracto-modules/statistic/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/statistic/statistic-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>statistic</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/listener/DeleteTrackedEmoteListenerTest.java

@@ -26,17 +26,12 @@ public class DeleteTrackedEmoteListenerTest {
     @Mock
     private EmoteDeletedModel model;
 
-    private static final Long SERVER_ID = 4L;
-    private static final Long EMOTE_ID = 4L;
-
     @Test
     public void testEmoteDeleted() {
         Emote emote = Mockito.mock(Emote.class);
-        when(emote.getIdLong()).thenReturn(EMOTE_ID);
         when(model.getEmote()).thenReturn(emote);
-        when(model.getServerId()).thenReturn(SERVER_ID);
         testUnit.execute(model);
-        verify(trackedEmoteManagementService, times(1)).markAsDeleted(SERVER_ID, EMOTE_ID);
+        verify(trackedEmoteManagementService, times(1)).markAsDeleted(emote);
     }
 
     @Test

abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/listener/EmoteTrackingListenerTest.java

@@ -8,6 +8,8 @@ import dev.sheldan.abstracto.statistic.emote.service.TrackedEmoteService;
 import net.dv8tion.jda.api.entities.Emote;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Message;
+import org.apache.commons.collections4.Bag;
+import org.apache.commons.collections4.bag.HashBag;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -52,19 +54,19 @@ public class EmoteTrackingListenerTest {
 
     @Test
     public void testExecuteOneEmote() {
-        List<Emote> emotesBag = new ArrayList<>();
+        Bag<Emote> emotesBag = new HashBag<>();
         emotesBag.add(emote1);
         when(guildService.getGuildById(SERVER_ID)).thenReturn(guild);
         when(messageReceivedModel.getMessage()).thenReturn(message);
         when(messageReceivedModel.getServerId()).thenReturn(SERVER_ID);
-        when(message.getEmotes()).thenReturn(emotesBag);
+        when(message.getEmotesBag()).thenReturn(emotesBag);
         testUnit.execute(messageReceivedModel);
         verify(trackedEmoteService, times(1)).addEmoteToRuntimeStorage(emote1, guild, 1L);
     }
 
     @Test
     public void testExecuteOneEmoteMultipleTimes() {
-        List<Emote> emotesBag = new ArrayList<>();
+        Bag<Emote> emotesBag = new HashBag<>();
         when(emote1.getIdLong()).thenReturn(EMOTE_ID);
         when(emote2.getIdLong()).thenReturn(EMOTE_ID);
         emotesBag.add(emote1);
@@ -72,14 +74,14 @@ public class EmoteTrackingListenerTest {
         when(guildService.getGuildById(SERVER_ID)).thenReturn(guild);
         when(messageReceivedModel.getServerId()).thenReturn(SERVER_ID);
         when(messageReceivedModel.getMessage()).thenReturn(message);
-        when(message.getEmotes()).thenReturn(emotesBag);
+        when(message.getEmotesBag()).thenReturn(emotesBag);
         testUnit.execute(messageReceivedModel);
-        verify(trackedEmoteService, times(1)).addEmoteToRuntimeStorage(any(CachedEmote.class), eq(guild), eq(2L));
+        verify(trackedEmoteService, times(1)).addEmoteToRuntimeStorage(any(Emote.class), eq(guild), eq(2L));
     }
 
     @Test
     public void testExecuteMultipleEmotes() {
-        List<Emote> emotesBag = new ArrayList<>();
+        Bag<Emote> emotesBag = new HashBag<>();
         when(emote1.getIdLong()).thenReturn(EMOTE_ID);
         when(emote2.getIdLong()).thenReturn(EMOTE_ID + 1);
         emotesBag.add(emote1);
@@ -87,7 +89,7 @@ public class EmoteTrackingListenerTest {
         when(guildService.getGuildById(SERVER_ID)).thenReturn(guild);
         when(messageReceivedModel.getServerId()).thenReturn(SERVER_ID);
         when(messageReceivedModel.getMessage()).thenReturn(message);
-        when(message.getEmotes()).thenReturn(emotesBag);
+        when(message.getEmotesBag()).thenReturn(emotesBag);
         testUnit.execute(messageReceivedModel);
         verify(trackedEmoteService, times(1)).addEmoteToRuntimeStorage(emote1, guild, 1L);
         verify(trackedEmoteService, times(1)).addEmoteToRuntimeStorage(emote2, guild, 1L);
@@ -95,7 +97,7 @@ public class EmoteTrackingListenerTest {
 
     @Test
     public void testExecuteNoEmote() {
-        when(message.getEmotes()).thenReturn(new ArrayList<>());
+        when(message.getEmotesBag()).thenReturn(new HashBag<>());
         when(messageReceivedModel.getMessage()).thenReturn(message);
         testUnit.execute(messageReceivedModel);
         verify(trackedEmoteService, times(0)).addEmoteToRuntimeStorage(any(Emote.class), any(), anyLong());

abstracto-application/abstracto-modules/statistic/statistic-impl/src/test/java/dev/sheldan/abstracto/statistic/emote/listener/UpdateTrackedEmoteListenerTest.java

@@ -29,12 +29,9 @@ public class UpdateTrackedEmoteListenerTest {
 
     @Test
     public void testEmoteUpdated() {
-        Long serverId = 1L;
-        Long emoteId = 2L;
         Emote changedEmote = Mockito.mock(Emote.class);
-        when(changedEmote.getIdLong()).thenReturn(emoteId);
         TrackedEmote trackedEmote = Mockito.mock(TrackedEmote.class);
-        when(trackedEmoteManagementService.loadByEmoteId(emoteId, serverId)).thenReturn(trackedEmote);
+        when(trackedEmoteManagementService.loadByEmote(changedEmote)).thenReturn(trackedEmote);
         String newValue = "AFTER";
         when(model.getEmote()).thenReturn(changedEmote);
         when(model.getNewValue()).thenReturn(newValue);

abstracto-application/abstracto-modules/statistic/statistic-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>statistic</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/suggestion/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/suggestion/suggestion-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>suggestion</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/test/java/dev/sheldan/abstracto/suggestion/service/management/SuggestionManagementServiceBeanTest.java

@@ -17,6 +17,7 @@ import net.dv8tion.jda.api.entities.MessageChannel;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
@@ -70,11 +71,15 @@ public class SuggestionManagementServiceBeanTest {
         when(message.getGuild()).thenReturn(guild);
         when(guild.getId()).thenReturn("8");
         long suggestionId = 1L;
+        ArgumentCaptor<Suggestion> suggestionArgumentCaptor = ArgumentCaptor.forClass(Suggestion.class);
+        Suggestion savedSuggestion = Mockito.mock(Suggestion.class);
+        when(suggestionRepository.save(suggestionArgumentCaptor.capture())).thenReturn(savedSuggestion);
         Suggestion createdSuggestion = testUnit.createSuggestion(aUserInAServer, text, message, suggestionId);
-        verify(suggestionRepository, times(1)).save(createdSuggestion);
-        Assert.assertEquals(SuggestionState.NEW, createdSuggestion.getState());
-        Assert.assertEquals(aUserInAServer, createdSuggestion.getSuggester());
-        Assert.assertEquals(server, createdSuggestion.getServer());
+        Assert.assertEquals(savedSuggestion, createdSuggestion);
+        Suggestion capturedSuggestion = suggestionArgumentCaptor.getValue();
+        Assert.assertEquals(SuggestionState.NEW, capturedSuggestion.getState());
+        Assert.assertEquals(aUserInAServer, capturedSuggestion.getSuggester());
+        Assert.assertEquals(server, capturedSuggestion.getServer());
     }
 
     @Test
@@ -92,11 +97,15 @@ public class SuggestionManagementServiceBeanTest {
         when(guild.getId()).thenReturn("5");
         when(userInServerManagementService.loadOrCreateUser(member)).thenReturn(aUserInAServer);
         long suggestionId = 1L;
+        ArgumentCaptor<Suggestion> suggestionArgumentCaptor = ArgumentCaptor.forClass(Suggestion.class);
+        Suggestion savedSuggestion = Mockito.mock(Suggestion.class);
+        when(suggestionRepository.save(suggestionArgumentCaptor.capture())).thenReturn(savedSuggestion);
         Suggestion createdSuggestion = testUnit.createSuggestion(member, text, message, suggestionId);
-        verify(suggestionRepository, times(1)).save(createdSuggestion);
-        Assert.assertEquals(SuggestionState.NEW, createdSuggestion.getState());
-        Assert.assertEquals(aUserInAServer, createdSuggestion.getSuggester());
-        Assert.assertEquals(server, createdSuggestion.getServer());
+        Assert.assertEquals(savedSuggestion, createdSuggestion);
+        Suggestion capturedSuggestion = suggestionArgumentCaptor.getValue();
+        Assert.assertEquals(SuggestionState.NEW, capturedSuggestion.getState());
+        Assert.assertEquals(aUserInAServer, capturedSuggestion.getSuggester());
+        Assert.assertEquals(server, capturedSuggestion.getServer());
     }
 
     @Test

abstracto-application/abstracto-modules/suggestion/suggestion-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>suggestion</artifactId>
         <groupId>dev.sheldan.abstracto.modules</groupId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/utility/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/utility/utility-impl/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>utility</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/utility/utility-int/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto.modules</groupId>
         <artifactId>utility</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-application/abstracto-modules/webservices/pom.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>dev.sheldan.abstracto.modules</groupId>
+        <artifactId>abstracto-modules</artifactId>
+        <version>1.2.5</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>webservices</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>webservices-int</module>
+        <module>webservices-impl</module>
+    </modules>
+
+    <dependencies>
+        <dependency>
+            <groupId>dev.sheldan.abstracto.core</groupId>
+            <artifactId>core-int</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+
+</project>

abstracto-application/abstracto-modules/webservices/webservices-impl/pom.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>dev.sheldan.abstracto.modules</groupId>
+        <artifactId>webservices</artifactId>
+        <version>1.2.5</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>webservices-impl</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/main/assembly/liquibase.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>dev.sheldan.abstracto.modules</groupId>
+            <artifactId>webservices-int</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.api-client</groupId>
+            <artifactId>google-api-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.apis</groupId>
+            <artifactId>google-api-services-youtube</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

abstracto-application/abstracto-modules/webservices/webservices-impl/src/main/assembly/liquibase.xml

@@ -0,0 +1,18 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
+    <id>liquibase</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <outputDirectory>.</outputDirectory>
+            <directory>${project.basedir}/src/main/resources/migrations</directory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>

abstracto-application/abstracto-modules/webservices/webservices-impl/src/main/java/dev/sheldan/abstracto/webservices/config/WebServicesConfig.java

@@ -0,0 +1,10 @@
+package dev.sheldan.abstracto.webservices.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+@Configuration
+@PropertySource("classpath:webservices-config.properties")
+public class WebServicesConfig {
+}
+

abstracto-application/abstracto-modules/webservices/webservices-impl/src/main/java/dev/sheldan/abstracto/webservices/urban/command/UrbanDefine.java

@@ -0,0 +1,82 @@
+package dev.sheldan.abstracto.webservices.urban.command;
+
+import dev.sheldan.abstracto.core.command.UtilityModuleDefinition;
+import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
+import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
+import dev.sheldan.abstracto.core.command.config.HelpInfo;
+import dev.sheldan.abstracto.core.command.config.Parameter;
+import dev.sheldan.abstracto.core.command.execution.CommandContext;
+import dev.sheldan.abstracto.core.command.execution.CommandResult;
+import dev.sheldan.abstracto.core.command.execution.ContextConverter;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException;
+import dev.sheldan.abstracto.core.service.ChannelService;
+import dev.sheldan.abstracto.core.templating.model.MessageToSend;
+import dev.sheldan.abstracto.core.templating.service.TemplateService;
+import dev.sheldan.abstracto.core.utils.FutureUtils;
+import dev.sheldan.abstracto.webservices.config.WebserviceFeatureDefinition;
+import dev.sheldan.abstracto.webservices.urban.model.UrbanDefinition;
+import dev.sheldan.abstracto.webservices.urban.model.UrbanResponseModel;
+import dev.sheldan.abstracto.webservices.urban.service.UrbanService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+@Component
+public class UrbanDefine extends AbstractConditionableCommand {
+
+    @Autowired
+    private UrbanService urbanService;
+
+    @Autowired
+    private TemplateService templateService;
+
+    @Autowired
+    private ChannelService channelService;
+
+    private static final String URBAN_DEFINE_RESPONSE_MODEL_TEMPLATE_KEY = "urban_define_response_model";
+
+    @Override
+    public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) {
+        String parameter = (String) commandContext.getParameters().getParameters().get(0);
+        try {
+            UrbanDefinition definition = urbanService.getUrbanDefinition(parameter);
+            UrbanResponseModel model = (UrbanResponseModel) ContextConverter.slimFromCommandContext(commandContext, UrbanResponseModel.class);
+            model.setDefinition(definition);
+            MessageToSend message = templateService.renderEmbedTemplate(URBAN_DEFINE_RESPONSE_MODEL_TEMPLATE_KEY, model);
+            return FutureUtils.toSingleFutureGeneric(channelService.sendMessageToSendToChannel(message, commandContext.getChannel()))
+                    .thenApply(unused -> CommandResult.fromSuccess());
+        } catch (IOException e) {
+            throw new AbstractoRunTimeException(e);
+        }
+    }
+
+    @Override
+    public CommandConfiguration getConfiguration() {
+        List<Parameter> parameters = new ArrayList<>();
+        parameters.add(Parameter.builder().name("searchQuery").type(String.class).remainder(true).templated(true).build());
+        HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
+        List<String> aliases = Arrays.asList("ud");
+        return CommandConfiguration.builder()
+                .name("urbanDefine")
+                .module(UtilityModuleDefinition.UTILITY)
+                .templated(true)
+                .async(true)
+                .aliases(aliases)
+                .supportsEmbedException(true)
+                .causesReaction(false)
+                .parameters(parameters)
+                .help(helpInfo)
+                .build();
+    }
+
+    @Override
+    public FeatureDefinition getFeature() {
+        return WebserviceFeatureDefinition.URBAN_DICTIONARY;
+    }
+}

abstracto-application/abstracto-modules/webservices/webservices-impl/src/main/java/dev/sheldan/abstracto/webservices/urban/model/UrbanResponse.java

@@ -0,0 +1,14 @@
+package dev.sheldan.abstracto.webservices.urban.model;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+@Builder
+public class UrbanResponse {
+    private List<UrbanResponseDefinition> list;
+}

abstracto-application/abstracto-modules/webservices/webservices-impl/src/main/java/dev/sheldan/abstracto/webservices/urban/model/UrbanResponseDefinition.java

@@ -0,0 +1,22 @@
+package dev.sheldan.abstracto.webservices.urban.model;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.Instant;
+
+@Getter
+@Setter
+@Builder
+public class UrbanResponseDefinition {
+    private String definition;
+    private String permalink;
+    private Long thumbs_up;
+    private Long thumbs_down;
+    private String author;
+    private String word;
+    private Long defid;
+    private Instant written_on;
+    private String example;
+}

abstracto-application/abstracto-modules/webservices/webservices-impl/src/main/java/dev/sheldan/abstracto/webservices/urban/service/UrbanServiceBean.java

@@ -0,0 +1,50 @@
+package dev.sheldan.abstracto.webservices.urban.service;
+
+import com.google.gson.Gson;
+import dev.sheldan.abstracto.webservices.urban.exception.NoUrbanDefinitionFoundException;
+import dev.sheldan.abstracto.webservices.urban.model.UrbanDefinition;
+import dev.sheldan.abstracto.webservices.urban.model.UrbanResponse;
+import dev.sheldan.abstracto.webservices.urban.model.UrbanResponseDefinition;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+
+@Component
+public class UrbanServiceBean implements UrbanService {
+
+    @Autowired
+    private OkHttpClient okHttpClient;
+
+    @Value("${abstracto.feature.webservices.urban.requestURL}")
+    private String requestUrl;
+
+    @Autowired
+    private Gson gson;
+
+    @Override
+    public UrbanDefinition getUrbanDefinition(String query) throws IOException {
+        Request request = new Request.Builder().url(String.format(requestUrl, query)).get().build();
+        Response response = okHttpClient.newCall(request).execute();
+        UrbanResponse urbanResponse = gson.fromJson(response.body().string(), UrbanResponse.class);
+        if(urbanResponse.getList().isEmpty()) {
+            throw new NoUrbanDefinitionFoundException();
+        } else {
+            UrbanResponseDefinition definition = urbanResponse.getList().get(0);
+            return UrbanDefinition
+                    .builder()
+                    .definition(definition.getDefinition())
+                    .author(definition.getAuthor())
+                    .url(definition.getPermalink())
+                    .creationDate(definition.getWritten_on())
+                    .downVoteCount(definition.getThumbs_down())
+                    .upvoteCount(definition.getThumbs_up())
+                    .example(definition.getExample())
+                    .build();
+        }
+    }
+}

abstracto-application/abstracto-modules/webservices/webservices-impl/src/main/java/dev/sheldan/abstracto/webservices/youtube/command/YoutubeVideoSearch.java

@@ -0,0 +1,77 @@
+package dev.sheldan.abstracto.webservices.youtube.command;
+
+import dev.sheldan.abstracto.core.command.UtilityModuleDefinition;
+import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
+import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
+import dev.sheldan.abstracto.core.command.config.HelpInfo;
+import dev.sheldan.abstracto.core.command.config.Parameter;
+import dev.sheldan.abstracto.core.command.execution.CommandContext;
+import dev.sheldan.abstracto.core.command.execution.CommandResult;
+import dev.sheldan.abstracto.core.command.execution.ContextConverter;
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.core.service.ChannelService;
+import dev.sheldan.abstracto.core.templating.model.MessageToSend;
+import dev.sheldan.abstracto.core.templating.service.TemplateService;
+import dev.sheldan.abstracto.core.utils.FutureUtils;
+import dev.sheldan.abstracto.webservices.config.WebserviceFeatureDefinition;
+import dev.sheldan.abstracto.webservices.youtube.model.YoutubeVideo;
+import dev.sheldan.abstracto.webservices.youtube.model.command.YoutubeVideoSearchCommandModel;
+import dev.sheldan.abstracto.webservices.youtube.service.YoutubeSearchService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+@Component
+public class YoutubeVideoSearch extends AbstractConditionableCommand {
+
+    @Autowired
+    private YoutubeSearchService youtubeSearchService;
+
+    @Autowired
+    private TemplateService templateService;
+
+    @Autowired
+    private ChannelService channelService;
+
+    @Override
+    public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) {
+        String query = (String) commandContext.getParameters().getParameters().get(0);
+        YoutubeVideo foundVideo = youtubeSearchService.searchOneVideoForQuery(query);
+        YoutubeVideoSearchCommandModel model = (YoutubeVideoSearchCommandModel) ContextConverter.slimFromCommandContext(commandContext, YoutubeVideoSearchCommandModel.class);
+        model.setVideo(foundVideo);
+        MessageToSend message = templateService.renderEmbedTemplate("youtube_search_command_response", model);
+        MessageToSend linkEmbed = templateService.renderEmbedTemplate("youtube_search_command_response_link", model);
+        CompletableFuture<Void> infoEmbedFuture = FutureUtils.toSingleFutureGeneric(channelService.sendMessageToSendToChannel(message, commandContext.getChannel()));
+        CompletableFuture<Void> linkEmbedFuture = FutureUtils.toSingleFutureGeneric(channelService.sendMessageToSendToChannel(linkEmbed, commandContext.getChannel()));
+        return CompletableFuture.allOf(infoEmbedFuture, linkEmbedFuture)
+                .thenApply(unused -> CommandResult.fromSuccess());
+    }
+
+    @Override
+    public CommandConfiguration getConfiguration() {
+        List<Parameter> parameters = new ArrayList<>();
+        parameters.add(Parameter.builder().name("searchQuery").type(String.class).remainder(true).templated(true).build());
+        HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
+        List<String> aliases = Arrays.asList("yt");
+        return CommandConfiguration.builder()
+                .name("youtubeSearch")
+                .module(UtilityModuleDefinition.UTILITY)
+                .templated(true)
+                .async(true)
+                .aliases(aliases)
+                .supportsEmbedException(true)
+                .causesReaction(false)
+                .parameters(parameters)
+                .help(helpInfo)
+                .build();
+    }
+
+    @Override
+    public FeatureDefinition getFeature() {
+        return WebserviceFeatureDefinition.YOUTUBE;
+    }
+}

abstracto-application/abstracto-modules/webservices/webservices-impl/src/main/java/dev/sheldan/abstracto/webservices/youtube/config/YoutubeServiceBeans.java

@@ -0,0 +1,39 @@
+package dev.sheldan.abstracto.webservices.youtube.config;
+
+import com.google.api.client.http.HttpTransport;
+import com.google.api.client.http.javanet.NetHttpTransport;
+import com.google.api.client.json.JsonFactory;
+import com.google.api.client.json.gson.GsonFactory;
+import com.google.api.services.youtube.YouTube;
+import com.google.api.services.youtube.YouTubeRequestInitializer;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class YoutubeServiceBeans {
+
+    @Value("${abstracto.feature.youtube.apiKey}")
+    private String youtubeApiKey;
+
+    @Value("${spring.application.name}")
+    private String applicationName;
+
+    @Bean
+    public YouTube getYouTubeBean() {
+        return new YouTube.Builder(getHttpTransport(), getJsonFactory(), request -> {}).setApplicationName(applicationName)
+          .setYouTubeRequestInitializer(new YouTubeRequestInitializer(youtubeApiKey)).build();
+    }
+
+
+    @Bean
+    public HttpTransport getHttpTransport() {
+        return new NetHttpTransport();
+    }
+
+    @Bean
+    public JsonFactory getJsonFactory() {
+        return new GsonFactory();
+    }
+
+}

abstracto-application/abstracto-modules/webservices/webservices-impl/src/main/java/dev/sheldan/abstracto/webservices/youtube/service/YoutubeSearchServiceBean.java

@@ -0,0 +1,41 @@
+package dev.sheldan.abstracto.webservices.youtube.service;
+
+import com.google.api.services.youtube.YouTube;
+import com.google.api.services.youtube.model.SearchListResponse;
+import com.google.api.services.youtube.model.SearchResult;
+import dev.sheldan.abstracto.webservices.youtube.exception.YoutubeAPIException;
+import dev.sheldan.abstracto.webservices.youtube.exception.YoutubeVideoNotFoundException;
+import dev.sheldan.abstracto.webservices.youtube.model.YoutubeVideo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.List;
+
+@Component
+public class YoutubeSearchServiceBean implements YoutubeSearchService {
+
+    @Autowired
+    private YouTube youTube;
+
+    @Autowired
+    private YoutubeVideoService youtubeVideoService;
+
+    @Override
+    public YoutubeVideo searchOneVideoForQuery(String query) {
+        try {
+            YouTube.Search.List search = youTube.search().list("id,snippet");
+            search.setQ(query);
+            search.setType("video");
+            search.setMaxResults(1L);
+            SearchListResponse execute = search.execute();
+            List<SearchResult> items = execute.getItems();
+            if(items.isEmpty()) {
+                throw new YoutubeVideoNotFoundException();
+            }
+            return youtubeVideoService.getVideoInfo(items.get(0).getId().getVideoId());
+        } catch (IOException e) {
+            throw new YoutubeAPIException(e);
+        }
+    }
+}

abstracto-application/abstracto-modules/webservices/webservices-impl/src/main/java/dev/sheldan/abstracto/webservices/youtube/service/YoutubeVideoServiceBean.java

@@ -0,0 +1,53 @@
+package dev.sheldan.abstracto.webservices.youtube.service;
+
+import com.google.api.services.youtube.YouTube;
+import com.google.api.services.youtube.model.*;
+import dev.sheldan.abstracto.webservices.youtube.exception.YoutubeAPIException;
+import dev.sheldan.abstracto.webservices.youtube.exception.YoutubeVideoNotFoundException;
+import dev.sheldan.abstracto.webservices.youtube.model.YoutubeVideo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.List;
+
+@Component
+public class YoutubeVideoServiceBean implements YoutubeVideoService {
+
+    @Autowired
+    private YouTube youTube;
+
+    @Override
+    public YoutubeVideo getVideoInfo(String id) {
+        try {
+            VideoListResponse videoListResponse = youTube
+                    .videos()
+                    .list("statistics,contentDetails,snippet")
+                    .setId(id)
+                    .execute();
+            List<Video> items = videoListResponse.getItems();
+            if(items.isEmpty()) {
+                throw new YoutubeVideoNotFoundException();
+            }
+            Video videoInfo = items.get(0);
+            VideoStatistics statistics = videoInfo.getStatistics();
+            VideoSnippet snipped = videoInfo.getSnippet();
+            VideoContentDetails contentDetails = videoInfo.getContentDetails();
+            return YoutubeVideo
+                    .builder()
+                    .channelTitle(snipped.getChannelTitle())
+                    .commentCount(statistics.getCommentCount())
+                    .dislikes(statistics.getDislikeCount())
+                    .likes(statistics.getLikeCount())
+                    .views(statistics.getViewCount())
+                    .duration(Duration.parse(contentDetails.getDuration()))
+                    .publishedAt(Instant.ofEpochMilli(snipped.getPublishedAt().getValue()))
+                    .url(String.format("https://youtu.be/%s", videoInfo.getId()))
+                    .build();
+        } catch (IOException e) {
+            throw new YoutubeAPIException(e);
+        }
+    }
+}

abstracto-application/abstracto-modules/webservices/webservices-impl/src/main/resources/migrations/1.2.5-webservices/collection.xml

@@ -0,0 +1,10 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog ../dbchangelog-3.8.xsd
+    http://www.liquibase.org/xml/ns/dbchangelog-ext ../dbchangelog-3.8.xsd
+    http://www.liquibase.org/xml/ns/pro ../dbchangelog-3.8.xsd" >
+    <include file="webservices-seedData/data.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>

abstracto-application/abstracto-modules/webservices/webservices-impl/src/main/resources/migrations/1.2.5-webservices/webservices-seedData/command.xml

@@ -0,0 +1,29 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog ../../dbchangelog-3.8.xsd
+    http://www.liquibase.org/xml/ns/dbchangelog-ext ../../dbchangelog-3.8.xsd
+    http://www.liquibase.org/xml/ns/pro ../../dbchangelog-3.8.xsd" >
+    <property name="utilityModule" value="(SELECT id FROM module WHERE name = 'utility')"/>
+    <property name="youtubeFeature" value="(SELECT id FROM feature WHERE key = 'youtube')"/>
+    <property name="urbanFeature" value="(SELECT id FROM feature WHERE key = 'urban')"/>
+
+    <changeSet  author="Sheldan"  id="webservices_youtube-commands">
+        <insert tableName="command">
+            <column name="name" value="youtubeSearch"/>
+            <column name="module_id" valueComputed="${utilityModule}"/>
+            <column name="feature_id" valueComputed="${youtubeFeature}"/>
+        </insert>
+    </changeSet>
+
+    <changeSet  author="Sheldan"  id="webservices_urban-commands">
+        <insert tableName="command">
+            <column name="name" value="urbanDefine"/>
+            <column name="module_id" valueComputed="${utilityModule}"/>
+            <column name="feature_id" valueComputed="${urbanFeature}"/>
+        </insert>
+    </changeSet>
+
+</databaseChangeLog>

abstracto-application/abstracto-modules/webservices/webservices-impl/src/main/resources/migrations/1.2.5-webservices/webservices-seedData/data.xml

@@ -0,0 +1,11 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog ../../dbchangelog-3.8.xsd
+    http://www.liquibase.org/xml/ns/dbchangelog-ext ../../dbchangelog-3.8.xsd
+    http://www.liquibase.org/xml/ns/pro ../../dbchangelog-3.8.xsd" >
+    <include file="feature.xml" relativeToChangelogFile="true"/>
+    <include file="command.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>

abstracto-application/abstracto-modules/webservices/webservices-impl/src/main/resources/migrations/1.2.5-webservices/webservices-seedData/feature.xml

@@ -0,0 +1,17 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog ../../dbchangelog-3.8.xsd
+    http://www.liquibase.org/xml/ns/dbchangelog-ext ../../dbchangelog-3.8.xsd
+    http://www.liquibase.org/xml/ns/pro ../../dbchangelog-3.8.xsd" >
+    <changeSet author="Sheldan"  id="webservices_feature-insertion">
+        <insert tableName="feature">
+            <column name="key" value="youtube"/>
+        </insert>
+        <insert tableName="feature">
+            <column name="key" value="urban"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>

abstracto-application/abstracto-modules/webservices/webservices-impl/src/main/resources/migrations/webservices-changeLog.xml

@@ -0,0 +1,10 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog-3.8.xsd
+    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog-3.8.xsd
+    http://www.liquibase.org/xml/ns/pro dbchangelog-3.8.xsd" >
+    <include file="1.2.5-webservices/collection.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>

abstracto-application/abstracto-modules/webservices/webservices-impl/src/main/resources/webservices-config.properties

@@ -0,0 +1,9 @@
+abstracto.featureFlags.youtube.featureName=youtube
+abstracto.featureFlags.youtube.enabled=false
+
+abstracto.featureFlags.urban.featureName=urban
+abstracto.featureFlags.urban.enabled=false
+
+abstracto.feature.youtube.apiKey=${YOUTUBE_API_KEY}
+
+abstracto.feature.webservices.urban.requestURL=https://api.urbandictionary.com/v0/define?term=%s

abstracto-application/abstracto-modules/webservices/webservices-int/pom.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>dev.sheldan.abstracto.modules</groupId>
+        <artifactId>webservices</artifactId>
+        <version>1.2.5</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>webservices-int</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>

abstracto-application/abstracto-modules/webservices/webservices-int/src/main/java/dev/sheldan/abstracto/webservices/config/WebserviceFeatureDefinition.java

@@ -0,0 +1,15 @@
+package dev.sheldan.abstracto.webservices.config;
+
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import lombok.Getter;
+
+@Getter
+public enum WebserviceFeatureDefinition implements FeatureDefinition {
+    YOUTUBE("youtube"), URBAN_DICTIONARY("urban");
+
+    private String key;
+
+    WebserviceFeatureDefinition(String key) {
+        this.key = key;
+    }
+}