integrate collect listener into rank listener

src/main/java/com/github/kaktushose/nplaybot/Bot.java

@@ -4,7 +4,6 @@
 import com.github.kaktushose.jda.commands.annotations.Produces;
 import com.github.kaktushose.jda.commands.data.EmbedCache;
 import com.github.kaktushose.jda.commands.embeds.JsonErrorMessageFactory;
-import com.github.kaktushose.nplaybot.events.collect.CollectEventListener;
 import com.github.kaktushose.nplaybot.events.contest.ContestListener;
 import com.github.kaktushose.nplaybot.karma.KarmaListener;
 import com.github.kaktushose.nplaybot.permissions.CustomPermissionsProvider;
@@ -59,7 +58,6 @@ private Bot(long guildId, String token) throws InterruptedException, RuntimeExce
         jda.addEventListener(
                 new RankListener(database, embedCache, this),
                 new ContestListener(database),
-                new CollectEventListener(database, embedCache),
                 new KarmaListener(database, embedCache),
                 new StarboardListener(database, embedCache),
                 new MemberDatabaseSyncListener(database),

src/main/java/com/github/kaktushose/nplaybot/rank/RankListener.java

@@ -3,17 +3,27 @@
 import com.github.kaktushose.jda.commands.data.EmbedCache;
 import com.github.kaktushose.nplaybot.Bot;
 import com.github.kaktushose.nplaybot.Database;
+import com.github.kaktushose.nplaybot.events.collect.CollectEventService;
+import com.github.kaktushose.nplaybot.items.ItemService;
 import com.github.kaktushose.nplaybot.permissions.PermissionsService;
+import com.github.kaktushose.nplaybot.settings.SettingsService;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
+import net.dv8tion.jda.api.utils.data.DataObject;
+import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
 
@@ -26,13 +36,21 @@ public class RankListener extends ListenerAdapter {
     private final EmbedCache embedCache;
     private final Bot bot;
     private final Map<Long, Integer> xpLootDrops;
+    private final Set<Long> collectLootDrops;
+    private final CollectEventService eventService;
+    private final ItemService itemService;
+    private final SettingsService settingsService;
 
     public RankListener(Database database, EmbedCache embedCache, Bot bot) {
         this.rankService = database.getRankService();
         this.permissionsService = database.getPermissionsService();
+        this.eventService = database.getCollectEventService();
         this.embedCache = embedCache;
         this.bot = bot;
         xpLootDrops = new HashMap<>();
+        collectLootDrops = new HashSet<>();
+        itemService = database.getItemService();
+        settingsService = database.getSettingsService();
     }
 
     @Override
@@ -68,6 +86,8 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
         onXpLootDrop(event);
         onCheckForLootbox(event);
         onAddRegularXp(event);
+        onAddRegularCollectPoints(event);
+        onCollectLootDrop(event);
     }
 
     private void onCheckForLootbox(MessageReceivedEvent event) {
@@ -111,6 +131,7 @@ public void onMessageReactionAdd(@NotNull MessageReactionAddEvent event) {
 
         var messageId = event.getMessageIdLong();
         if (!xpLootDrops.containsKey(messageId)) {
+            onCollectEventDropReactionAdd(event);
             return;
         }
         if (!event.getEmoji().equals(Emoji.fromUnicode(XP_LOOT_DROP_EMOJI))) {
@@ -139,4 +160,94 @@ public void onMessageReactionAdd(@NotNull MessageReactionAddEvent event) {
             message.clearReactions().queue();
         });
     }
+
+    private void onAddRegularCollectPoints(MessageReceivedEvent event) {
+        var oldPoints = eventService.getCollectPoints(event.getAuthor());
+        var newPoints = eventService.addCollectPoint(event.getAuthor());
+        onCollectPointChange(oldPoints, newPoints, event.getMember(), event.getGuild());
+    }
+
+    private void onCollectPointChange(int oldPoints, int newPoints, Member member, Guild guild) {
+        var rewards = eventService.getCollectRewards();
+        var optional = rewards.stream()
+                .filter(it -> it.threshold() > oldPoints)
+                .filter(it -> it.threshold() <= newPoints)
+                .findFirst();
+
+        if (optional.isEmpty()) {
+            return;
+        }
+        var reward = optional.get();
+
+        if (reward.xp() > 0) {
+            var xpChangeResult = rankService.addXp(member, reward.xp());
+            rankService.onXpChange(xpChangeResult, member, embedCache);
+        }
+
+        if (reward.roleId() > 0) {
+            guild.addRoleToMember(member, guild.getRoleById(reward.roleId())).queue();
+        }
+
+        if (reward.itemId() > 0) {
+            itemService.createTransaction(member, reward.itemId());
+        }
+
+        var builder = new MessageCreateBuilder().addContent(member.getAsMention())
+                .addEmbeds(EmbedBuilder.fromData(DataObject.fromJson(reward.embed())).build())
+                .build();
+        settingsService.getBotChannel().sendMessage(builder).queue();
+    }
+
+    private void onCollectLootDrop(MessageReceivedEvent event) {
+        var points = eventService.getCollectLootDrop(event.getMessage());
+
+        if (points < 1) {
+            log.debug("No collect loot drop for this message");
+            return;
+        }
+
+        collectLootDrops.add(event.getMessageIdLong());
+        event.getMessage().addReaction(Emoji.fromUnicode(eventService.getCollectCurrency().emoji())).queue();
+    }
+
+
+    private void onCollectEventDropReactionAdd(MessageReactionAddEvent event) {
+        if (event.getUser().isBot()) {
+            return;
+        }
+        if (!eventService.isCollectEventActive()) {
+            return;
+        }
+        var messageId = event.getMessageIdLong();
+        if (!collectLootDrops.contains(messageId)) {
+            return;
+        }
+        var currency = eventService.getCollectCurrency();
+        if (!event.getEmoji().equals(Emoji.fromUnicode(currency.emoji()))) {
+            return;
+        }
+
+        if (!permissionsService.hasUserPermissions(event.getMember())) {
+            event.getReaction().removeReaction(event.getUser()).queue();
+            return;
+        }
+
+        log.debug("Collect loot drop got claimed by {}", event.getMember());
+
+        var oldPoints = eventService.getCollectPoints(event.getMember());
+        var newPoints = eventService.addCollectPoint(event.getMember());
+        onCollectPointChange(oldPoints, newPoints, event.getMember(), event.getGuild());
+        collectLootDrops.remove(messageId);
+
+        event.retrieveMessage().queue(message -> {
+            message.reply(
+                    embedCache.getEmbed("collectLootDropClaimed")
+                            .injectValue("user", event.getMember().getAsMention())
+                            .injectValue("name", currency.name())
+                            .toMessageCreateData()
+            ).mentionRepliedUser(false).queue(it -> it.delete().queueAfter(1, TimeUnit.MINUTES));
+            message.clearReactions().queue();
+        });
+    }
+
 }