m_spanningtree Remove SpanningTreeUtilities* fields and parameters

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

diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp
index e814e0206c3a6383795e9b61893b27085e41f088..bace497c20dfb2a111b49bd8a11f2428740e6256 100644 (file)
--- a/src/modules/m_chanhistory.cpp
+++ b/src/modules/m_chanhistory.cpp
@@ -19,8 +19,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides channel history for a given number of lines */
-
 struct HistoryItem
 {
        time_t ts;
@@ -94,14 +92,12 @@ class HistoryMode : public ModeHandler
                        {
                                ext.set(channel, new HistoryList(len, time));
                        }
-                       channel->SetModeParam('H', parameter);
                }
                else
                {
-                       if (!channel->IsModeSet('H'))
+                       if (!channel->IsModeSet(this))
                                return MODEACTION_DENY;
                        ext.unset(channel);
-                       channel->SetModeParam('H', "");
                }
                return MODEACTION_ALLOW;
        }
@@ -121,8 +117,6 @@ class ModuleChanHistory : public Module
                ServerInstance->Modules->AddService(m);
                ServerInstance->Modules->AddService(m.ext);
 
-               Implementation eventlist[] = { I_OnPostJoin, I_OnUserMessage, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
                OnRehash(NULL);
        }
 
@@ -133,9 +127,9 @@ class ModuleChanHistory : public Module
                sendnotice = tag->getBool("notice", true);
        }
 
-       void OnUserMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList&) CXX11_OVERRIDE
+       void OnUserMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList&, MessageType msgtype) CXX11_OVERRIDE
        {
-               if (target_type == TYPE_CHANNEL && status == 0)
+               if ((target_type == TYPE_CHANNEL) && (status == 0) && (msgtype == MSG_PRIVMSG))
                {
                        Channel* c = (Channel*)dest;
                        HistoryList* list = m.ext.get(c);