Don't update the idle timer when a user replies to a CTCP.

[user/henk/code/inspircd.git] / src / coremods / core_channel / invite.h

diff --git a/src/coremods/core_channel/invite.h b/src/coremods/core_channel/invite.h
index f11ff9043d9bfceb46639c4138cfd4b65fdc232c..19e3861f88940595ad0fe725aba7debd9fff4f64 100644 (file)
--- a/src/coremods/core_channel/invite.h
+++ b/src/coremods/core_channel/invite.h
@@ -40,6 +40,7 @@ namespace Invite
 }
 
 extern void RemoveInvite(Invite::Invite* inv, bool remove_user, bool remove_chan);
+extern void UnserializeInvite(LocalUser* user, const std::string& value);
 
 template<typename T, ExtensionItem::ExtensibleType ExtType>
 class Invite::ExtItem : public ExtensionItem
@@ -65,10 +66,10 @@ class Invite::ExtItem : public ExtensionItem
        {
                void* store = unset_raw(ext);
                if (store)
-                       free(store);
+                       free(ext, store);
        }
 
-       void free(void* item) CXX11_OVERRIDE
+       void free(Extensible* container, void* item) CXX11_OVERRIDE
        {
                Store<T>* store = static_cast<Store<T>*>(item);
                for (typename Store<T>::List::iterator i = store->invites.begin(); i != store->invites.end(); )
@@ -84,11 +85,25 @@ class Invite::ExtItem : public ExtensionItem
 
        std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE
        {
-               return std::string();
+               if (format == FORMAT_NETWORK)
+                       return std::string();
+
+               std::string ret;
+               Store<T>* store = static_cast<Store<T>*>(item);
+               for (typename insp::intrusive_list<Invite, T>::iterator i = store->invites.begin(); i != store->invites.end(); ++i)
+               {
+                       Invite* inv = *i;
+                       inv->Serialize(format, (ExtType == ExtensionItem::EXT_USER), ret);
+               }
+               if (!ret.empty())
+                       ret.erase(ret.length()-1);
+               return ret;
        }
 
        void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE
        {
+               if ((ExtType != ExtensionItem::EXT_CHANNEL) && (format != FORMAT_NETWORK))
+                       UnserializeInvite(static_cast<LocalUser*>(container), value);
        }
 };
 
@@ -108,4 +123,5 @@ class Invite::APIImpl : public APIBase
        void RemoveAll(LocalUser* user) { userext.unset(user); }
        void RemoveAll(Channel* chan) { chanext.unset(chan); }
        void Destruct(Invite* inv, bool remove_chan = true, bool remove_user = true);
+       void Unserialize(LocalUser* user, const std::string& value);
 };