summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSadie Powell <sadie@witchery.services>2024-03-12 14:34:34 (GMT)
committerSadie Powell <sadie@witchery.services>2024-03-12 14:43:12 (GMT)
commit1a8bbd600498d6ac00906e130950d75e6ccd3148 (patch)
tree4f455dcae2b04c71d14f6ed169ae666f7f787b05
parente725c880a9ebe862c903dfb217e055ef7cde4a93 (diff)
downloadanope-1a8bbd600498d6ac00906e130950d75e6ccd3148.zip
anope-1a8bbd600498d6ac00906e130950d75e6ccd3148.tar.gz
anope-1a8bbd600498d6ac00906e130950d75e6ccd3148.tar.bz2
Respect --noexpire in cs_suspend and ns_suspend.
-rw-r--r--modules/commands/cs_suspend.cpp4
-rw-r--r--modules/commands/ns_suspend.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/commands/cs_suspend.cpp b/modules/commands/cs_suspend.cpp
index ae050e1..c9274c0 100644
--- a/modules/commands/cs_suspend.cpp
+++ b/modules/commands/cs_suspend.cpp
@@ -262,7 +262,7 @@ class CSSuspend : public Module
expire = false;
- if (si->expires && si->expires < Anope::CurTime)
+ if (!Anope::NoExpire && si->expires && si->expires < Anope::CurTime)
{
ci->last_used = Anope::CurTime;
Expire(ci);
@@ -278,7 +278,7 @@ class CSSuspend : public Module
if (!si)
return EVENT_CONTINUE;
- if (si->expires && si->expires < Anope::CurTime)
+ if (!Anope::NoExpire && si->expires && si->expires < Anope::CurTime)
{
Expire(c->ci);
return EVENT_CONTINUE;
diff --git a/modules/commands/ns_suspend.cpp b/modules/commands/ns_suspend.cpp
index fc445a1..0d801ab 100644
--- a/modules/commands/ns_suspend.cpp
+++ b/modules/commands/ns_suspend.cpp
@@ -268,7 +268,7 @@ class NSSuspend : public Module
expire = false;
- if (s->expires && s->expires < Anope::CurTime)
+ if (!Anope::NoExpire && s->expires && s->expires < Anope::CurTime)
{
na->last_seen = Anope::CurTime;
Expire(na);
@@ -281,7 +281,7 @@ class NSSuspend : public Module
if (!s)
return EVENT_CONTINUE;
- if (s->expires && s->expires < Anope::CurTime)
+ if (!Anope::NoExpire && s->expires && s->expires < Anope::CurTime)
{
Expire(na);
return EVENT_CONTINUE;