pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-04 00:03:12 +02:00
Code Activity

Remove the two day X-line cap.

Browse Source
This commit is contained in:
Sadie Powell
2023-11-03 11:01:01 +00:00
parent 38d5b93e4a
commit 6e16e71fda
6 changed files with 22 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/protocol/bahamut.cpp
+5 -8
View File
@@ -106,10 +106,9 @@ class BahamutIRCdProto : public IRCDProto
/* SZLINE */
void SendSZLine(User *, const XLine *x) override
{
// Calculate the time left before this would expire, capping it at 2 days
time_t timeleft = x->expires - Anope::CurTime;
if (timeleft > 172800 || !x->expires)
timeleft = 172800;
// Calculate the time left before this would expire
time_t timeleft = x->expires ? x->expires - Anope::CurTime : x->expires;
/* this will likely fail so its only here for legacy */
UplinkSocket::Message() << "SZLINE " << x->GetHost() << " :" << x->GetReason();
/* this is how we are supposed to deal with it */
@@ -220,10 +219,8 @@ class BahamutIRCdProto : public IRCDProto
}
}
// Calculate the time left before this would expire, capping it at 2 days
time_t timeleft = x->expires - Anope::CurTime;
if (timeleft > 172800)
timeleft = 172800;
// Calculate the time left before this would expire
time_t timeleft = x->expires ? x->expires - Anope::CurTime : x->expires;
UplinkSocket::Message() << "AKILL " << x->GetHost() << " " << x->GetUser() << " " << timeleft << " " << x->by << " " << Anope::CurTime << " :" << x->GetReason();
}
modules/protocol/hybrid.cpp
+4 -10
View File
@@ -77,11 +77,8 @@ class HybridProto : public IRCDProto
void SendSZLine(User *, const XLine *x) override
{
/* Calculate the time left before this would expire, capping it at 2 days */
time_t timeleft = x->expires - Anope::CurTime;
if (timeleft > 172800 || !x->expires)
timeleft = 172800;
/* Calculate the time left before this would expire */
time_t timeleft = x->expires ? x->expires - Anope::CurTime : x->expires;
UplinkSocket::Message(Me) << "DLINE * " << timeleft << " " << x->GetHost() << " :" << x->GetReason();
}
@@ -162,11 +159,8 @@ class HybridProto : public IRCDProto
<< u->realname << " matches " << old->mask;
}
/* Calculate the time left before this would expire, capping it at 2 days */
time_t timeleft = x->expires - Anope::CurTime;
if (timeleft > 172800 || !x->expires)
timeleft = 172800;
/* Calculate the time left before this would expire */
time_t timeleft = x->expires ? x->expires - Anope::CurTime : x->expires;
UplinkSocket::Message(Me) << "KLINE * " << timeleft << " " << x->GetUser() << " " << x->GetHost() << " :" << x->GetReason();
}
modules/protocol/inspircd.cpp
+7 -12
View File
@@ -207,10 +207,8 @@ class InspIRCdProto : public IRCDProto
void SendAkill(User *u, XLine *x) override
{
// Calculate the time left before this would expire, capping it at 2 days
time_t timeleft = x->expires - Anope::CurTime;
if (timeleft > 172800 || !x->expires)
timeleft = 172800;
// Calculate the time left before this would expire
time_t timeleft = x->expires ? x->expires - Anope::CurTime : x->expires;
/* InspIRCd may support regex bans, if they do we can send this and forget about it
* Mask is expected in format: 'n!u@h\sr' and spaces as '\s'
@@ -349,10 +347,8 @@ class InspIRCdProto : public IRCDProto
void SendSQLine(User *u, const XLine *x) override
{
// Calculate the time left before this would expire, capping it at 2 days
time_t timeleft = x->expires - Anope::CurTime;
if (timeleft > 172800 || !x->expires)
timeleft = 172800;
// Calculate the time left before this would expire
time_t timeleft = x->expires ? x->expires - Anope::CurTime : x->expires;
if (IRCD->CanSQLineChannel && (x->mask[0] == '#'))
SendAddLine("CBAN", x->mask, timeleft, x->by, x->GetReason());
@@ -385,10 +381,9 @@ class InspIRCdProto : public IRCDProto
void SendSZLine(User *u, const XLine *x) override
{
// Calculate the time left before this would expire, capping it at 2 days
time_t timeleft = x->expires - Anope::CurTime;
if (timeleft > 172800 || !x->expires)
timeleft = 172800;
// Calculate the time left before this would expire
time_t timeleft = x->expires ? x->expires - Anope::CurTime : x->expires;
SendAddLine("Z", x->GetHost(), timeleft, x->by, x->GetReason());
}
modules/protocol/ngircd.cpp
+2 -4
View File
@@ -32,10 +32,8 @@ class ngIRCdProto : public IRCDProto
void SendAkill(User *u, XLine *x) override
{
// Calculate the time left before this would expire, capping it at 2 days
time_t timeleft = x->expires - Anope::CurTime;
if (timeleft > 172800 || !x->expires)
timeleft = 172800;
// Calculate the time left before this would expire
time_t timeleft = x->expires ? x->expires - Anope::CurTime : x->expires;
UplinkSocket::Message(Me) << "GLINE " << x->mask << " " << timeleft << " :" << x->GetReason() << " (" << x->by << ")";
}
modules/protocol/ratbox.cpp
+2 -5
View File
@@ -63,11 +63,8 @@ class RatboxProto : public IRCDProto
void SendSQLine(User *, const XLine *x) override
{
/* Calculate the time left before this would expire, capping it at 2 days */
time_t timeleft = x->expires - Anope::CurTime;
if (timeleft > 172800 || !x->expires)
timeleft = 172800;
// Calculate the time left before this would expire
time_t timeleft = x->expires ? x->expires - Anope::CurTime : x->expires;
UplinkSocket::Message(FindIntroduced()) << "ENCAP * RESV " << timeleft << " " << x->mask << " 0 :" << x->GetReason();
}
modules/protocol/unrealircd.cpp
+2 -10
View File
@@ -123,11 +123,7 @@ class UnrealIRCdProto : public IRCDProto
}
}
// Calculate the time left before this would expire, capping it at 2 days
time_t timeleft = x->expires - Anope::CurTime;
if (timeleft > 172800 || !x->expires)
timeleft = 172800;
UplinkSocket::Message() << "TKL + G " << x->GetUser() << " " << x->GetHost() << " " << x->by << " " << Anope::CurTime + timeleft << " " << x->created << " :" << x->GetReason();
UplinkSocket::Message() << "TKL + G " << x->GetUser() << " " << x->GetHost() << " " << x->by << " " << x->expires << " " << x->created << " :" << x->GetReason();
}
void SendSVSKillInternal(const MessageSource &source, User *user, const Anope::string &buf) override
@@ -273,11 +269,7 @@ class UnrealIRCdProto : public IRCDProto
/* SZLINE */
void SendSZLine(User *, const XLine *x) override
{
// Calculate the time left before this would expire, capping it at 2 days
time_t timeleft = x->expires - Anope::CurTime;
if (timeleft > 172800 || !x->expires)
timeleft = 172800;
UplinkSocket::Message() << "TKL + Z * " << x->GetHost() << " " << x->by << " " << Anope::CurTime + timeleft << " " << x->created << " :" << x->GetReason();
UplinkSocket::Message() << "TKL + Z * " << x->GetHost() << " " << x->by << " " << x->expires << " " << x->created << " :" << x->GetReason();
}
/* SGLINE */