summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2008-04-08 10:23:35 +0000
committerw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2008-04-08 10:23:35 +0000
commit1ff54f0c4d4a53003319e72e3c7cbcf4c6c025e3 (patch)
treea298c599544fedcb9b9b12b6263964c626960565 /src/modules
parente8aa1caa961f8c6c2c29f865b07b291609d30df3 (diff)
SHUN: check SHUN on connect, extend user with shunned metadata if they match, and disallow any commands if metadata exists instead of constantly rechecking bans per-command.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9418 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/m_shun.cpp32
1 files changed, 17 insertions, 15 deletions
diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index fe8da9280..a5c98dbbf 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -41,7 +41,8 @@ public:
void Apply(User *u)
{
- // Application is done by the module.
+ if (!u->GetExt("shunned"))
+ u->Extend("shunned");
}
@@ -69,12 +70,6 @@ class ShunFactory : public XLineFactory
{
return new Shun(ServerInstance, set_time, duration, source, reason, xline_specific_mask);
}
-
- virtual bool AutoApplyToUserList(XLine*)
- {
- // No, we don't want to be applied to users automagically.
- return false;
- }
};
//typedef std::vector<Shun> shunlist;
@@ -167,8 +162,8 @@ class ModuleShun : public Module
mycommand = new cmd_shun(ServerInstance);
ServerInstance->AddCommand(mycommand);
- Implementation eventlist[] = { I_OnStats, I_OnPreCommand };
- ServerInstance->Modules->Attach(eventlist, this, 2);
+ Implementation eventlist[] = { I_OnStats, I_OnPreCommand, I_OnUserConnect };
+ ServerInstance->Modules->Attach(eventlist, this, 3);
}
virtual ~ModuleShun()
@@ -185,6 +180,18 @@ class ModuleShun : public Module
return 0;
}
+ virtual void OnUserConnect(User* user)
+ {
+ // Apply lines on user connect
+ XLine *rl = ServerInstance->XLines->MatchesLine("SHUN", user);
+
+ if (rl)
+ {
+ // Bang. :P
+ rl->Apply(user);
+ }
+ }
+
virtual int OnPreCommand(const std::string &command, const char* const*parameters, int pcnt, User* user, bool validated, const std::string &original_line)
{
if (user->registered != REG_ALL)
@@ -192,13 +199,8 @@ class ModuleShun : public Module
if((command != "PONG") && (command != "PING"))
{
- // Don't let them issue cmd if they are shunned..
- XLine *rl = ServerInstance->XLines->MatchesLine("SHUN", user);
-
- if (rl)
- {
+ if (user->GetExt("shunned"))
return 1;
- }
}
return 0;