Merge pull request #122 from retropc/jupes

jupes: fix max expires and expiry bugs in commands
quakenet · Aug 10, 2023 · 1c92b8d · 1c92b8d
2 parents d374672 + de082ed
commit 1c92b8d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/jupe/jupe.h b/jupe/jupe.h
@@ -9,7 +9,7 @@ typedef struct jupe_s {
 
 extern jupe_t *jupes;
 
-#define JUPE_MAX_EXPIRE	6048000
+#define JUPE_MAX_EXPIRE	604800
 
 #define JUPE_ACTIVE	0x0001
 

diff --git a/jupe/jupe_commands.c b/jupe/jupe_commands.c
@@ -13,6 +13,8 @@ int ju_addjupe(void *source, int cargc, char **cargv) {
     return CMD_USAGE;
   }
 
+  jupe_expire();
+
   if (jupe_find(cargv[0]) != NULL) {
     controlreply(np, "There is already a jupe for that server.");
     return CMD_OK;
@@ -44,6 +46,8 @@ int ju_activatejupe(void *source, int cargc, char **cargv) {
     return CMD_USAGE;
   }
 
+  jupe_expire();
+
   jupe = jupe_find(cargv[0]);
 
   if (jupe == NULL) {
@@ -72,6 +76,8 @@ int ju_deactivatejupe(void *source, int cargc, char **cargv) {
     return CMD_USAGE;
   }
 
+  jupe_expire();
+
   jupe = jupe_find(cargv[0]);
 
   if (jupe == NULL) {