summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/m_shun.cpp212
1 files changed, 84 insertions, 128 deletions
diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index b3b9b2010..a0b2adffc 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -6,81 +6,64 @@
#include "modules.h"
#include "hashcomp.h"
#include "configreader.h"
+#include "xline.h"
-/* $ModDesc: Gives the /shun command, which stops a user executing all commands except PING and PONG. */
-/* $ModAuthor: Om */
-/* $ModAuthorMail: om@inspircd.org */
+/* $ModDesc: Provides the /shun command, which stops a user executing all commands except PING and PONG. */
-class Shun
+class Shun : public XLine
{
public:
- std::string banmask;
- std::string set_by;
- time_t set_on;
- long length;
- std::string reason;
+ std::string matchtext;
- Shun() { }
+ Shun(InspIRCd* Instance, time_t s_time, long d, const char* src, const char* re, const char *shunmask) : XLine(Instance, s_time, d, src, re, "S")
+ {
+ this->matchtext = shunmask;
+ }
- Shun(std::string bm, std::string sb, time_t so, long ln, std::string rs) : banmask(bm), set_by(sb), set_on(so), length(ln), reason(rs) { }
-
- bool operator<(const Shun &ban2) const
+ ~Shun()
{
- return ((this->set_on + this->length) < (ban2.set_on + ban2.length));
}
-};
-typedef std::vector<Shun> shunlist;
+ bool Matches(User *u)
+ {
+ if (ServerInstance->MatchText(u->GetFullHost(), matchtext) || ServerInstance->MatchText(u->GetFullRealHost(), matchtext))
+ return true;
-class ModuleShunBase
-{
- public:
- /* shuns is declared here, as our type is right above. Don't try move it. */
- shunlist shuns;
-
- InspIRCd* Srv;
-
- std::string EncodeShun(const Shun &shun)
+ return false;
+ }
+
+ // XXX unused, why do we *have* to implement this
+ bool Matches(const std::string &s)
{
- std::ostringstream stream;
- stream << shun.banmask << " " << shun.set_by << " " << shun.set_on << " " << shun.length << " " << shun.reason;
- return stream.str();
+ return false;
}
- Shun DecodeShun(const std::string &data)
+ void Apply(User *u)
{
- Shun res;
- std::istringstream stream(data);
- stream >> res.banmask;
- stream >> res.set_by;
- stream >> res.set_on;
- stream >> res.length;
- res.reason = stream.str();
-
- return res;
+ // Application is done by the module.
}
- void ExpireBans()
+
+ void DisplayExpiry()
{
- while(shuns.size() && shuns.begin()->length && ((shuns.begin()->set_on + shuns.begin()->length) <= Srv->Time()))
- {
- shunlist::iterator iter = shuns.begin();
-
- Srv->SNO->WriteToSnoMask('X', "*** %ld second shun on '%s' (%s) set by %s %ld seconds ago expired", iter->length, iter->banmask.c_str(), iter->reason.c_str(), iter->set_by.c_str(), Srv->Time() - iter->set_on);
- shuns.erase(iter);
- }
+ ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed shun %s (set by %s %ld seconds ago)", this->matchtext.c_str(), this->source, this->duration);
+ }
+
+ const char* Displayable()
+ {
+ return matchtext.c_str();
}
};
+//typedef std::vector<Shun> shunlist;
+
class cmd_shun : public Command
{
private:
InspIRCd *Srv;
- ModuleShunBase* base;
public:
- cmd_shun(InspIRCd* Me, ModuleShunBase* b)
- : Command(Me, "SHUN", "o", 1), Srv(Me), base(b)
+ cmd_shun(InspIRCd* Me) : Command(Me, "SHUN", "o", 1), Srv(Me)
{
this->source = "m_shun.so";
}
@@ -89,60 +72,58 @@ class cmd_shun : public Command
{
/* syntax: SHUN nick!user@host time :reason goes here */
/* 'time' is a human-readable timestring, like 2d3h2s. */
-
- base->ExpireBans();
if(pcnt == 1)
{
- /* form: SHUN mask removes a SHUN */
- for(shunlist::iterator iter = base->shuns.begin(); iter != base->shuns.end(); iter++)
+ if (ServerInstance->XLines->DelLine(parameters[0], "S", user))
{
- if(parameters[0] == iter->banmask)
- {
- Srv->SNO->WriteToSnoMask('X', "*** %s removed shun '%s', set %ld seconds ago with reason '%s'", user->nick, iter->banmask.c_str(), Srv->Time() - iter->set_on, iter->reason.c_str());
- base->shuns.erase(iter);
- return CMD_SUCCESS;
- }
+ ServerInstance->SNO->WriteToSnoMask('x',"%s Removed R-Line on %s.",user->nick,parameters[0]);
+ }
+ else
+ {
+ // XXX todo implement stats
+ user->WriteServ("NOTICE %s :*** Shun %s not found in list, try /stats s.",user->nick,parameters[0]);
}
- user->WriteServ("NOTICE %s :*** The mask %s is not currently shunned, try /stats s", user->nick, parameters[0]);
- return CMD_FAILURE;
+ return CMD_SUCCESS;
}
else if (pcnt >= 2)
{
- /* full form to add a shun */
- if(Srv->IsValidMask(parameters[0]))
+ // Adding - XXX todo make this respect <insane> tag perhaps..
+ long duration = ServerInstance->Duration(parameters[1]);
+ Shun *r = NULL;
+
+ try
{
- // parameters[0] = Foamy!*@*
- // parameters[1] = 1h3m2s
- // parameters[2] = Tortoise abuser
- for(shunlist::iterator iter = base->shuns.begin(); iter != base->shuns.end(); iter++)
+ r = new Shun(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], parameters[0]);
+ }
+ catch (...)
+ {
+ ; // Do nothing. If we get here, the regex was fucked up, and they already got told it fucked up.
+ }
+
+ if (r)
+ {
+ if (ServerInstance->XLines->AddLine(r, user))
{
- if (parameters[0] == iter->banmask)
+ if (!duration)
+ {
+ ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent shun for %s.", user->nick, parameters[0]);
+ }
+ else
{
- user->WriteServ("NOTICE %s :*** Shun on %s already exists", user->nick, parameters[0]);
- return CMD_FAILURE;
+ time_t c_requires_crap = duration + ServerInstance->Time();
+ ServerInstance->SNO->WriteToSnoMask('x', "%s added timed shun for %s, expires on %s", user->nick, parameters[0],
+ ServerInstance->TimeString(c_requires_crap).c_str());
}
+
+ ServerInstance->XLines->ApplyLines();
}
-
- long length = Srv->Duration(parameters[1]);
-
- std::string reason = (pcnt > 2) ? parameters[2] : "No reason supplied";
-
- base->shuns.push_back(Shun(parameters[0], user->nick, Srv->Time(), length, reason));
-
- std::sort(base->shuns.begin(), base->shuns.end());
-
- if(length > 0)
- Srv->SNO->WriteToSnoMask('X', "*** %s added %ld second shun on '%s' (%s)", user->nick, length, parameters[0], reason.c_str());
else
- Srv->SNO->WriteToSnoMask('X', "*** %s added permanent shun on '%s' (%s)", user->nick, parameters[0], reason.c_str());
-
- return CMD_SUCCESS;
- }
- else
- {
- user->WriteServ("NOTICE %s :*** Invalid ban mask (%s)", user->nick, parameters[0]);
+ {
+ delete r;
+ user->WriteServ("NOTICE %s :*** Shun for %s already exists", user->nick, parameters[0]);
+ }
}
}
@@ -150,37 +131,27 @@ class cmd_shun : public Command
}
};
-class ModuleShun : public Module, public ModuleShunBase
+class ModuleShun : public Module
{
cmd_shun* mycommand;
public:
- ModuleShun(InspIRCd* Me)
- : Module::Module(Me)
+ ModuleShun(InspIRCd* Me) : Module(Me)
{
- this->Srv = Me;
- mycommand = new cmd_shun(Srv, this);
- Srv->AddCommand(mycommand);
+ mycommand = new cmd_shun(ServerInstance);
+ ServerInstance->AddCommand(mycommand);
}
void Implements(char* List)
{
- List[I_OnPreCommand] = List[I_OnSyncOtherMetaData] = List[I_OnDecodeMetaData] = List[I_OnStats] = 1;
+ List[I_OnPreCommand] = List[I_OnStats] = 1;
}
virtual int OnStats(char symbol, User* user, string_list& out)
{
- ExpireBans();
-
- if(symbol == 's')
- {
- for(shunlist::iterator iter = shuns.begin(); iter != shuns.end(); iter++)
- {
- std::ostringstream format;
- format << Srv->Config->ServerName << " 223 " << user->nick << " :" << iter->banmask << " " << iter->set_on << " " << iter->length << " " << iter->set_by << " " << iter->reason;
- out.push_back(format.str());
- }
- }
+ // XXX write me
+//format << Srv->Config->ServerName << " 223 " << user->nick << " :" << iter->banmask << " " << iter->set_on << " " << iter->length << " " <<
+//iter->set_by << " " << iter->reason;
return 0;
}
@@ -189,33 +160,18 @@ class ModuleShun : public Module, public ModuleShunBase
{
if((command != "PONG") && (command != "PING"))
{
- ExpireBans();
-
- for(shunlist::iterator iter = shuns.begin(); iter != shuns.end(); iter++)
- if(Srv->MatchText(user->GetFullHost(), iter->banmask) || Srv->MatchText(user->GetFullRealHost(), iter->banmask))
- return 1;
+ // Don't let them issue cmd if they are shunned..
+ XLine *rl = ServerInstance->XLines->MatchesLine("R", user);
+
+ if (rl)
+ {
+ return 1;
+ }
}
return 0;
}
- virtual void OnSyncOtherMetaData(Module* proto, void* opaque, bool displayable)
- {
- for(shunlist::iterator iter = shuns.begin(); iter != shuns.end(); iter++)
- {
- proto->ProtoSendMetaData(opaque, TYPE_OTHER, NULL, "shun", EncodeShun(*iter));
- }
- }
-
- virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata)
- {
- if((target_type == TYPE_OTHER) && (extname == "shun"))
- {
- shuns.push_back(DecodeShun(extdata));
- std::sort(shuns.begin(), shuns.end());
- }
- }
-
virtual ~ModuleShun()
{
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-19 19:57:54 +0000