summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2009-03-27 14:14:47 +0000
committerw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2009-03-27 14:14:47 +0000
commit01fac25f1654299c53d721adc3481d4a5601eacf (patch)
tree95e709382d4c777d6c6d1d8909ce20064e61c509 /src/modules
parent38d3217d4cba0ab87bb04d557359df42b7308a18 (diff)
Don't use metadata in m_shun, this fixes problems with expiry reported by Taros in bug #772.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11266 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/m_shun.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index 05f4bfe3c..91be7c10f 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -47,8 +47,6 @@ public:
void Apply(User *u)
{
- if (!u->GetExt("shunned"))
- u->Extend("shunned");
}
@@ -245,13 +243,12 @@ class ModuleShun : public Module
virtual int OnPreCommand(std::string &command, std::vector<std::string>& parameters, User* user, bool validated, const std::string &original_line)
{
- if (validated || !user->GetExt("shunned"))
+ if (validated)
return 0;
if (!ServerInstance->XLines->MatchesLine("SHUN", user))
{
- /* The shun previously set on this user has expired or been removed */
- user->Shrink("shunned");
+ /* Not shunned, don't touch. */
return 0;
}