[AB-191] grouping invite links in invite link deletion notification

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

@@ -15,7 +15,8 @@ import dev.sheldan.abstracto.core.utils.FutureUtils;
 import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
 import dev.sheldan.abstracto.moderation.config.features.mode.InviteFilterMode;
 import dev.sheldan.abstracto.moderation.config.posttargets.InviteFilterPostTarget;
-import dev.sheldan.abstracto.moderation.models.template.listener.InviteDeletedModel;
+import dev.sheldan.abstracto.moderation.models.template.listener.DeletedInvite;
+import dev.sheldan.abstracto.moderation.models.template.listener.DeletedInvitesNotificationModel;
 import dev.sheldan.abstracto.moderation.service.InviteLinkFilterService;
 import dev.sheldan.abstracto.templating.model.MessageToSend;
 import dev.sheldan.abstracto.templating.service.TemplateService;
@@ -29,7 +30,9 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
 import java.util.regex.Matcher;
+import java.util.stream.Collectors;
 
 @Component
 @Slf4j
@@ -104,13 +107,13 @@ public class InviteLinkFilterListener implements MessageReceivedListener {
             log.info("Post target {} not defined for server {} - not sending invite link deletion notification.", InviteFilterPostTarget.INVITE_DELETE_LOG.getKey(), serverId);
             return;
         }
-        InviteDeletedModel model = InviteDeletedModel
+        DeletedInvitesNotificationModel model = DeletedInvitesNotificationModel
                 .builder()
                 .author(message.getMember())
                 .guild(message.getGuild())
                 .message(message)
                 .channel(message.getTextChannel())
-                .invites(codes)
+                .invites(groupInvites(codes))
                 .build();
         log.info("Sending notification about {} deleted invite links in guild {} from user {} in channel {} in message {}.",
                 codes.size(), serverId, message.getAuthor().getIdLong(), message.getTextChannel().getIdLong(), message.getIdLong());
@@ -122,7 +125,16 @@ public class InviteLinkFilterListener implements MessageReceivedListener {
             log.error("Failed to send notification about deleted invite link in message {}.", message.getIdLong());
             return null;
         });
+    }
 
+    private List<DeletedInvite> groupInvites(List<String> codes) {
+        return codes
+                .stream()
+                .collect(Collectors.groupingBy(Function.identity(), Collectors.counting()))
+                .entrySet()
+                .stream()
+                .map(functionLongEntry -> new DeletedInvite(functionLongEntry.getKey(), functionLongEntry.getValue()))
+                .collect(Collectors.toList());
     }
 
     @Override

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

@@ -10,7 +10,7 @@ import dev.sheldan.abstracto.core.test.command.CommandTestUtilities;
 import dev.sheldan.abstracto.moderation.config.features.ModerationFeatures;
 import dev.sheldan.abstracto.moderation.config.features.mode.InviteFilterMode;
 import dev.sheldan.abstracto.moderation.config.posttargets.InviteFilterPostTarget;
-import dev.sheldan.abstracto.moderation.models.template.listener.InviteDeletedModel;
+import dev.sheldan.abstracto.moderation.models.template.listener.DeletedInvitesNotificationModel;
 import dev.sheldan.abstracto.moderation.service.InviteLinkFilterService;
 import dev.sheldan.abstracto.templating.model.MessageToSend;
 import dev.sheldan.abstracto.templating.service.TemplateService;
@@ -163,7 +163,7 @@ public class InviteLinkFilterListenerTest {
         verify(metricService, times(1)).incrementCounter(any());
         Assert.assertEquals(MessageReceivedListenerResult.DELETED, result);
         verify(inviteLinkFilterService, times(0)).storeFilteredInviteLinkUsage(eq(INVITE_CODE), any(ServerUser.class));
-        verify(templateService, times(0)).renderEmbedTemplate(eq(INVITE_LINK_DELETED_NOTIFICATION_EMBED_TEMPLATE_KEY), any(InviteDeletedModel.class));
+        verify(templateService, times(0)).renderEmbedTemplate(eq(INVITE_LINK_DELETED_NOTIFICATION_EMBED_TEMPLATE_KEY), any(DeletedInvitesNotificationModel.class));
     }
 
     private void verifyTracking() {
@@ -173,7 +173,7 @@ public class InviteLinkFilterListenerTest {
     private void setupForNotification() {
         when(postTargetService.postTargetDefinedInServer(InviteFilterPostTarget.INVITE_DELETE_LOG, SERVER_ID)).thenReturn(true);
         MessageToSend messageToSend = Mockito.mock(MessageToSend.class);
-        when(templateService.renderEmbedTemplate(eq(INVITE_LINK_DELETED_NOTIFICATION_EMBED_TEMPLATE_KEY), any(InviteDeletedModel.class))).thenReturn(messageToSend);
+        when(templateService.renderEmbedTemplate(eq(INVITE_LINK_DELETED_NOTIFICATION_EMBED_TEMPLATE_KEY), any(DeletedInvitesNotificationModel.class))).thenReturn(messageToSend);
         when(postTargetService.sendEmbedInPostTarget(messageToSend, InviteFilterPostTarget.INVITE_DELETE_LOG, SERVER_ID)).thenReturn(CommandTestUtilities.messageFutureList());
         when(textChannel.getIdLong()).thenReturn(CHANNEL_ID);
         when(message.getIdLong()).thenReturn(MESSAGE_ID);

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/listener/DeletedInvite.java

@@ -0,0 +1,14 @@
+package dev.sheldan.abstracto.moderation.models.template.listener;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+public class DeletedInvite {
+    private String code;
+    private Long count;
+}

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/listener/DeletedInvitesNotificationModel.java

@@ -13,10 +13,10 @@ import java.util.List;
 @Getter
 @Setter
 @Builder
-public class InviteDeletedModel {
+public class DeletedInvitesNotificationModel {
     private Guild guild;
     private TextChannel channel;
     private Member author;
     private Message message;
-    private List<String> invites;
+    private List<DeletedInvite> invites;
 }

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/FeatureValidationResult.java

@@ -36,7 +36,7 @@ public class FeatureValidationResult implements Templatable {
     @Override
     public Object getTemplateModel() {
         HashMap<String, Object> params = new HashMap<>();
-        params.put("featureTemplate", this.feature.getFeature().getKey() + "_feature");
+        params.put("featureTemplate", "feature_" + this.feature.getFeature().getKey());
         params.put("errors", this.validationErrorModels);
         return params;
     }