Refactor Channel::UserList() to use std::string

[user/henk/code/inspircd.git] / src / modules / m_svshold.cpp

diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index a38776d8db7a501a7a8f1fefe20a19cb4cccfce9..d35d5f3ba494964d3828d9578cd8a0e63c8f69b8 100644 (file)
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -30,16 +30,12 @@
 class SVSHold : public XLine
 {
 public:
-       irc::string nickname;
+       std::string nickname;
 
        SVSHold(time_t s_time, long d, std::string src, std::string re, std::string nick)
                : XLine(s_time, d, src, re, "SVSHOLD")
        {
-               this->nickname = nick.c_str();
-       }
-
-       ~SVSHold()
-       {
+               this->nickname = nick;
        }
 
        bool Matches(User *u)
@@ -51,20 +47,12 @@ public:
 
        bool Matches(const std::string &s)
        {
-               if (nickname == s)
-                       return true;
-               return false;
-       }
-
-       void DisplayExpiry()
-       {
-               ServerInstance->SNO->WriteToSnoMask('x',"Removing expired SVSHOLD %s (set by %s %ld seconds ago)",
-                       this->nickname.c_str(), this->source.c_str(), (long int)(ServerInstance->Time() - this->set_time));
+               return InspIRCd::Match(s, nickname);
        }
 
-       const char* Displayable()
+       const std::string& Displayable()
        {
-               return nickname.c_str();
+               return nickname;
        }
 };
 
@@ -81,6 +69,11 @@ class SVSHoldFactory : public XLineFactory
        {
                return new SVSHold(set_time, duration, source, reason, xline_specific_mask);
        }
+
+       bool AutoApplyToUserList(XLine *x)
+       {
+               return false;
+       }
 };
 
 /** Handle /SVSHold
@@ -113,47 +106,35 @@ class CommandSvshold : public Command
                        }
                        else
                        {
-                               user->WriteServ("NOTICE %s :*** SVSHOLD %s not found in list, try /stats S.",user->nick.c_str(),parameters[0].c_str());
+                               user->WriteNotice("*** SVSHOLD " + parameters[0] + " not found in list, try /stats S.");
                        }
-
-                       return CMD_SUCCESS;
                }
-               else if (parameters.size() >= 2)
+               else
                {
-                       // Adding - XXX todo make this respect <insane> tag perhaps..
-                       long duration = ServerInstance->Duration(parameters[1]);
-                       SVSHold *r = NULL;
+                       if (parameters.size() < 3)
+                               return CMD_FAILURE;
 
-                       try
-                       {
-                               r = new SVSHold(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str());
-                       }
-                       catch (...)
-                       {
-                               ; // Do nothing.
-                       }
+                       unsigned long duration = InspIRCd::Duration(parameters[1]);
+                       SVSHold* r = new SVSHold(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str());
 
-                       if (r)
+                       if (ServerInstance->XLines->AddLine(r, user))
                        {
-                               if (ServerInstance->XLines->AddLine(r, user))
+                               if (!duration)
                                {
-                                       if (!duration)
-                                       {
-                                               ServerInstance->SNO->WriteGlobalSno('x', "%s added permanent SVSHOLD for %s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[2].c_str());
-                                       }
-                                       else
-                                       {
-                                               time_t c_requires_crap = duration + ServerInstance->Time();
-                                               ServerInstance->SNO->WriteGlobalSno('x', "%s added timed SVSHOLD for %s, expires on %s: %s", user->nick.c_str(), parameters[0].c_str(), ServerInstance->TimeString(c_requires_crap).c_str(), parameters[2].c_str());
-                                       }
-
-                                       ServerInstance->XLines->ApplyLines();
+                                       ServerInstance->SNO->WriteGlobalSno('x', "%s added permanent SVSHOLD for %s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[2].c_str());
                                }
                                else
                                {
-                                       delete r;
+                                       time_t c_requires_crap = duration + ServerInstance->Time();
+                                       std::string timestr = ServerInstance->TimeString(c_requires_crap);
+                                       ServerInstance->SNO->WriteGlobalSno('x', "%s added timed SVSHOLD for %s, expires on %s: %s", user->nick.c_str(), parameters[0].c_str(), timestr.c_str(), parameters[2].c_str());
                                }
                        }
+                       else
+                       {
+                               delete r;
+                               return CMD_FAILURE;
+                       }
                }
 
                return CMD_SUCCESS;
@@ -173,15 +154,18 @@ class ModuleSVSHold : public Module
 
  public:
        ModuleSVSHold() : cmd(this)
+       {
+       }
+
+       void init() CXX11_OVERRIDE
        {
                ServerInstance->XLines->RegisterFactory(&s);
-               ServerInstance->AddCommand(&cmd);
+               ServerInstance->Modules->AddService(cmd);
                Implementation eventlist[] = { I_OnUserPreNick, I_OnStats };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-
-       virtual ModResult OnStats(char symbol, User* user, string_list &out)
+       ModResult OnStats(char symbol, User* user, string_list &out) CXX11_OVERRIDE
        {
                if(symbol != 'S')
                        return MOD_RES_PASSTHRU;
@@ -190,7 +174,7 @@ class ModuleSVSHold : public Module
                return MOD_RES_DENY;
        }
 
-       virtual ModResult OnUserPreNick(User *user, const std::string &newnick)
+       ModResult OnUserPreNick(User *user, const std::string &newnick) CXX11_OVERRIDE
        {
                XLine *rl = ServerInstance->XLines->MatchesLine("SVSHOLD", newnick);
 
@@ -203,13 +187,13 @@ class ModuleSVSHold : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       virtual ~ModuleSVSHold()
+       ~ModuleSVSHold()
        {
                ServerInstance->XLines->DelAll("SVSHOLD");
                ServerInstance->XLines->UnregisterFactory(&s);
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Implements SVSHOLD. Like Q:Lines, but can only be added/removed by Services.", VF_COMMON | VF_VENDOR);
        }