Fixed pin added message in rare cases not getting deleted after disco…

…rd event print
Alf-Melmac · Jan 9, 2022 · a72eeba · a72eeba
1 parent 00186d1
commit a72eeba
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/main/java/de/webalf/slotbot/service/bot/command/event/AddEventToChannel.java b/src/main/java/de/webalf/slotbot/service/bot/command/event/AddEventToChannel.java
@@ -203,7 +203,7 @@ private Consumer<Message> slotListMsgConsumer(@NonNull MessageChannel channel, @
 		return slotListMsg -> {
 			eventApiDto.getDiscordInformation(guildId).ifPresent(discordInformation -> discordInformation.setSlotListMsgPartOne(slotListMsg.getId()));
 
-			slotListMsg.pin().queue(unused -> deleteLatestMessageIfTypePinAdd(channel));
+			slotListMsg.pin().queue();
 
 			sendMessage(channel, spacerCharIfEmpty(ListUtils.shift(slotListMessages)),
 					slotListMsgLastConsumer(channel, eventApiDto, guildId));
@@ -217,7 +217,7 @@ private Consumer<Message> slotListMsgLastConsumer(@NonNull MessageChannel channe
 		return slotListMsg -> {
 			eventApiDto.getDiscordInformation(guildId).ifPresent(discordInformation -> discordInformation.setSlotListMsgPartTwo(slotListMsg.getId()));
 
-			slotListMsg.pin().queue(unused -> deleteLatestMessageIfTypePinAdd(channel));
+			slotListMsg.pin().queue(unused -> deletePinAddedMessages(channel));
 
 			eventBotService.updateEvent(eventApiDto);
 		};

diff --git a/src/main/java/de/webalf/slotbot/util/bot/MessageUtils.java b/src/main/java/de/webalf/slotbot/util/bot/MessageUtils.java
@@ -80,19 +80,20 @@ private static void deleteMessages(int delay, Message... messages) {
 	}
 
 	/**
-	 * Deletes the latest message from the given channel if {@link MessageType#CHANNEL_PINNED_ADD}
+	 * Checks the last {@code 4} messages and deletes them from the given channel if {@link MessageType#CHANNEL_PINNED_ADD}
 	 *
-	 * @param channel in which the latest message should be deleted
+	 * @param channel in which the latest messages should be deleted
 	 */
-	public static void deleteLatestMessageIfTypePinAdd(@NonNull MessageChannel channel) {
-		channel.getHistory().retrievePast(1).queue(messages -> {
+	public static void deletePinAddedMessages(@NonNull MessageChannel channel) {
+		channel.getHistory().retrievePast(4).queue(messages -> {
 			if (ListUtils.isEmpty(messages)) {
 				return;
 			}
-			final Message message = messages.get(0);
-			if (MessageType.CHANNEL_PINNED_ADD == message.getType()) {
-				deleteMessagesInstant(channel, message.getIdLong());
-			}
+			messages.forEach(message -> {
+				if (MessageType.CHANNEL_PINNED_ADD == message.getType()) {
+					deleteMessagesInstant(channel, message.getIdLong());
+				}
+			});
 		});
 	}