diff options
| author | Peter Powell <petpow@saberuk.com> | 2017-08-27 21:11:12 +0100 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2017-09-11 16:03:06 +0100 |
| commit | ccb6c0f243ee8de52677dface0a24878630bb7fd (patch) | |
| tree | e5d496a59c8b94dcd7156b0fa9f16da5d6455fe8 | |
| parent | 51a47e7d757df63370168ab5000d13ca9c349ecd (diff) | |
Move operquit out of the core and into core_user.
| -rw-r--r-- | include/inspircd.h | 4 | ||||
| -rw-r--r-- | src/coremods/core_user/cmd_quit.cpp | 5 | ||||
| -rw-r--r-- | src/coremods/core_user/core_user.h | 3 | ||||
| -rw-r--r-- | src/inspircd.cpp | 3 |
4 files changed, 6 insertions, 9 deletions
diff --git a/include/inspircd.h b/include/inspircd.h index 824a30e8a..839cccb6a 100644 --- a/include/inspircd.h +++ b/include/inspircd.h @@ -320,10 +320,6 @@ class CoreExport InspIRCd */ ProtocolInterface DefaultProtocolInterface; - /** Holds extensible for user operquit - */ - StringExtItem OperQuit; - /** Manages the generation and transmission of ISUPPORT. */ ISupportManager ISupport; diff --git a/src/coremods/core_user/cmd_quit.cpp b/src/coremods/core_user/cmd_quit.cpp index c4e127dd8..f9a4e1f70 100644 --- a/src/coremods/core_user/cmd_quit.cpp +++ b/src/coremods/core_user/cmd_quit.cpp @@ -23,6 +23,7 @@ CommandQuit::CommandQuit(Module* parent) : Command(parent, "QUIT", 0, 1) + , operquit("operquit", ExtensionItem::EXT_USER, parent) { works_before_reg = true; syntax = "[<message>]"; @@ -38,8 +39,8 @@ CmdResult CommandQuit::Handle (const std::vector<std::string>& parameters, User else quitmsg = parameters[0]; - std::string* operquit = ServerInstance->OperQuit.get(user); - ServerInstance->Users->QuitUser(user, quitmsg, operquit); + std::string* operquitmsg = operquit.get(user); + ServerInstance->Users->QuitUser(user, quitmsg, operquitmsg); return CMD_SUCCESS; } diff --git a/src/coremods/core_user/core_user.h b/src/coremods/core_user/core_user.h index 0418588c1..72ba67869 100644 --- a/src/coremods/core_user/core_user.h +++ b/src/coremods/core_user/core_user.h @@ -137,6 +137,9 @@ class CommandPart : public Command */ class CommandQuit : public Command { + private: + StringExtItem operquit; + public: MessageWrapper msgwrap; diff --git a/src/inspircd.cpp b/src/inspircd.cpp index abd63f953..44ba3c2a9 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -226,7 +226,6 @@ InspIRCd::InspIRCd(int argc, char** argv) : * THIS MUST MATCH THE ORDER OF DECLARATION OF THE FUNCTORS, e.g. the methods * themselves within the class. */ - OperQuit("operquit", ExtensionItem::EXT_USER, NULL), GenRandom(&HandleGenRandom), IsChannel(&HandleIsChannel), IsNick(&HandleIsNick), @@ -234,8 +233,6 @@ InspIRCd::InspIRCd(int argc, char** argv) : { ServerInstance = this; - Extensions.Register(&OperQuit); - FailedPortList pl; // Flag variables passed to getopt_long() later int do_version = 0, do_nofork = 0, do_debug = 0, |