Cut down expiry time to 30 minutes.

diff --git a/trapbot/src/main/java/net/rizon/acid/plugins/trapbot/ExpireTimer.java b/trapbot/src/main/java/net/rizon/acid/plugins/trapbot/ExpireTimer.java
index 14399b8345186cbba1cee0f42d0a9ee62f226c2a..58981e8d7f212be74f9c3670c665739b0c0554d3 100644 (file)
--- a/trapbot/src/main/java/net/rizon/acid/plugins/trapbot/ExpireTimer.java
+++ b/trapbot/src/main/java/net/rizon/acid/plugins/trapbot/ExpireTimer.java
@@ -16,10 +16,10 @@ class ExpireTimer implements Runnable
                        Map.Entry<String, TrappedUser> e = it.next();
                        TrappedUser t = e.getValue();
 
-                       /* how many days have passed */
-                       int days = (int)((now.getTime() - t.lastTrap.getTime()) / (1000 * 60 * 60 * 24));
+                       /* how many minutes have passed */
+                       int minutes = (int)((now.getTime() - t.lastTrap.getTime()) / (1000 * 60));
 
-                       if (days >= trapbot.conf.expire)
+                       if (minutes >= trapbot.conf.expire)
                                it.remove();
                }
        }

diff --git a/trapbot/src/main/java/net/rizon/acid/plugins/trapbot/trapbot.java b/trapbot/src/main/java/net/rizon/acid/plugins/trapbot/trapbot.java
index e59fb995c5684ff1c69da61dae52d567388a0f82..6308377ddabb38b15799c678243c9129ae5afe2a 100644 (file)
--- a/trapbot/src/main/java/net/rizon/acid/plugins/trapbot/trapbot.java
+++ b/trapbot/src/main/java/net/rizon/acid/plugins/trapbot/trapbot.java
@@ -82,7 +82,7 @@ public class trapbot extends Plugin
 
                reload();
 
-               expireTimer = Acidictive.scheduleWithFixedDelay(new ExpireTimer(), 1, TimeUnit.DAYS);
+               expireTimer = Acidictive.scheduleWithFixedDelay(new ExpireTimer(), 10, TimeUnit.MINUTES);
 
                // magic!
                releaseTimer = Acidictive.schedule(new ReleaseTimer(), new Random().nextInt(2700) + 2700, TimeUnit.SECONDS);

diff --git a/trapbot/trapbot.example.yml b/trapbot/trapbot.example.yml
index 7ef0a84a0632d085ca941db1eccf0cbf68d98cd7..2406f29b4254c67a4f9a21481119e365771ff8a3 100644 (file)
--- a/trapbot/trapbot.example.yml
+++ b/trapbot/trapbot.example.yml
@@ -21,5 +21,5 @@ clients:
 trapbot: TrapBot
 # Our name for the channel that is the trap channel
 trapchan: trapchan
-# Number of days before IPs added to the trap list are forgotten
-expire: 2
+# Number of minutes before IPs added to the trap list are forgotten
+expire: 30