Fixes found by removing User inheritance from StreamSocket

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

diff --git a/src/modules/m_satopic.cpp b/src/modules/m_satopic.cpp
index 7414058df495ee269b563541b40c0eb8f5143bbe..eec13decc558f870b6980e6b9170d123741bc3a6 100644 (file)
--- a/src/modules/m_satopic.cpp
+++ b/src/modules/m_satopic.cpp
@@ -20,11 +20,9 @@
 class CommandSATopic : public Command
 {
  public:
-       CommandSATopic (InspIRCd* Instance)
-       : Command(Instance,"SATOPIC", "o", 2, 2, false, 0)
+       CommandSATopic(Module* Creator) : Command(Creator,"SATOPIC", 2, 2)
        {
-               this->source = "m_satopic.so";
-               syntax = "<target> <topic>";
+               flags_needed = 'o'; Penalty = 0; syntax = "<target> <topic>";
        }
 
        CmdResult Handle (const std::vector<std::string>& parameters, User *user)
@@ -43,7 +41,7 @@ class CommandSATopic : public Command
                        ServerInstance->SNO->WriteToSnoMask('a', user->nick + " used SATOPIC on " + target->name + ", new topic: " + newTopic);
                        ServerInstance->PI->SendSNONotice("A", user->nick + " used SATOPIC on " + target->name + ", new topic: " + newTopic);
 
-                       return CMD_LOCALONLY;
+                       return CMD_SUCCESS;
                }
                else
                {
@@ -57,8 +55,8 @@ class ModuleSATopic : public Module
 {
        CommandSATopic cmd;
  public:
-       ModuleSATopic(InspIRCd* Me)
-       : Module(Me), cmd(Me)
+       ModuleSATopic()
+       : cmd(this)
        {
                ServerInstance->AddCommand(&cmd);
        }
@@ -69,7 +67,7 @@ class ModuleSATopic : public Module
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_VENDOR, API_VERSION);
+               return Version("Provides a SATOPIC command", VF_VENDOR);
        }
 };