Fix bans with duration unbanning immediately

neoforged · Jan 9, 2024 · 4802dca · 4802dca
1 parent f851a1b
commit 4802dca
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/src/main/java/net/neoforged/camelot/db/transactionals/PendingUnbansDAO.java b/src/main/java/net/neoforged/camelot/db/transactionals/PendingUnbansDAO.java
@@ -28,7 +28,7 @@ public interface PendingUnbansDAO extends Transactional<PendingUnbansDAO> {
      * @param guild the guild in which to unban the users
      * @return a list of user IDs to unban
      */
-    @SqlQuery("select user from pending_unbans where guild = :guild and deadline < datetime()")
+    @SqlQuery("select user from pending_unbans where guild = :guild and deadline <= unixepoch() * 1000")
     List<Long> getUsersToUnban(@Bind("guild") long guild);
 
     /**

diff --git a/src/main/java/net/neoforged/camelot/module/MinecraftVerificationModule.java b/src/main/java/net/neoforged/camelot/module/MinecraftVerificationModule.java
@@ -104,7 +104,7 @@ public void registerCommands(CommandClientBuilder builder) {
     @Override
     public void setup(JDA jda) {
         final McVerificationDAO dao = Database.main().onDemand(McVerificationDAO.class);
-        BotMain.EXECUTOR.scheduleAtFixedRate(() -> banNotVerified(jda, dao), 0, 1, TimeUnit.MINUTES);
+        BotMain.EXECUTOR.scheduleAtFixedRate(() -> banNotVerified(jda, dao), 1, 1, TimeUnit.MINUTES);
     }
 
     private void banNotVerified(JDA jda, McVerificationDAO db) {

diff --git a/src/main/java/net/neoforged/camelot/util/MailService.java b/src/main/java/net/neoforged/camelot/util/MailService.java
@@ -1,8 +1,6 @@
 package net.neoforged.camelot.util;
 
-import com.google.common.base.Suppliers;
 import j2html.tags.Tag;
-import j2html.tags.specialized.HtmlTag;
 import jakarta.mail.Authenticator;
 import jakarta.mail.Message;
 import jakarta.mail.MessagingException;
@@ -17,12 +15,6 @@
 
 import java.util.Properties;
 import java.util.function.Consumer;
-import java.util.function.Supplier;
-
-import static j2html.TagCreator.body;
-import static j2html.TagCreator.h1;
-import static j2html.TagCreator.html;
-import static j2html.TagCreator.pre;
 
 public class MailService {
     private final Session session;