From 083fef3911c0d404b9d8bd82a6bb9202639e49ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beatrice=20Dellac=C3=A0?= Date: Mon, 21 Nov 2022 11:19:23 +0100 Subject: [PATCH] Fix expired coinflip channel id bug --- .../beatrice/hidekobot/commands/slash/CoinFlipCommand.java | 2 +- .../wtf/beatrice/hidekobot/utils/ExpiredMessageRunner.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/slash/CoinFlipCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/slash/CoinFlipCommand.java index b92a6d7..03b0ba5 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/slash/CoinFlipCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/slash/CoinFlipCommand.java @@ -62,7 +62,7 @@ public class CoinFlipCommand private void trackAndRestrict(Message replyMessage, User user) { String replyMessageId = replyMessage.getId(); - String replyChannelId = replyMessage.getId(); + String replyChannelId = replyMessage.getChannel().getId(); String replyGuildId = replyMessage.getGuild().getId(); String userId = user.getId(); diff --git a/src/main/java/wtf/beatrice/hidekobot/utils/ExpiredMessageRunner.java b/src/main/java/wtf/beatrice/hidekobot/utils/ExpiredMessageRunner.java index cfe8270..06f36a6 100644 --- a/src/main/java/wtf/beatrice/hidekobot/utils/ExpiredMessageRunner.java +++ b/src/main/java/wtf/beatrice/hidekobot/utils/ExpiredMessageRunner.java @@ -43,6 +43,9 @@ public class ExpiredMessageRunner implements Runnable { for(String messageId : expiringMessages) { + + if(Configuration.isVerbose()) logger.log("expired check: " + messageId); + String expiryTimestamp = databaseManager.getQueuedExpiringMessageExpiryDate(messageId); if(expiryTimestamp == null || expiryTimestamp.equals("")) continue; //todo: idk count it as expired already? @@ -50,6 +53,7 @@ public class ExpiredMessageRunner implements Runnable { LocalDateTime expiryDate = LocalDateTime.parse(expiryTimestamp, formatter); if(now.isAfter(expiryDate)) { + if(Configuration.isVerbose()) logger.log("expired: " + messageId); disableExpired(messageId); } } @@ -73,6 +77,7 @@ public class ExpiredMessageRunner implements Runnable { RestAction retrieveAction = textChannel.retrieveMessageById(messageId); + if(Configuration.isVerbose()) logger.log("cleaning up: " + messageId); retrieveAction.queue(