Merge branch 'insp20' into master.

[user/henk/code/inspircd.git] / include / modules / cap.h

diff --git a/include/modules/cap.h b/include/modules/cap.h
index e6f9340e83b0177669d3d398bd1acfd7a32c79e7..6dcb9f3bc4d037d5a9055cfe7472824e8adcb190 100644 (file)
--- a/include/modules/cap.h
+++ b/include/modules/cap.h
@@ -32,8 +32,8 @@ namespace Cap
        {
         public:
                ExtItem(Module* mod);
-               std::string serialize(SerializeFormat format, const Extensible* container, void* item) const;
-               void unserialize(SerializeFormat format, Extensible* container, const std::string& value);
+               std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE;
+               void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE;
        };
 
        class Capability;
@@ -197,7 +197,7 @@ namespace Cap
                        if (!IsRegistered())
                                return false;
                        Ext caps = extitem->get(user);
-                       return (caps & GetMask());
+                       return ((caps & GetMask()) != 0);
                }
 
                /** Turn the capability on/off for a user. If the cap is not registered this method has no effect.
@@ -313,4 +313,23 @@ namespace Cap
                        return false;
                }
        };
+
+       class MessageBase : public ClientProtocol::Message
+       {
+        public:
+               MessageBase(const std::string& subcmd)
+                       : ClientProtocol::Message("CAP", ServerInstance->Config->ServerName)
+               {
+                       PushParamPlaceholder();
+                       PushParam(subcmd);
+               }
+
+               void SetUser(LocalUser* user)
+               {
+                       if (user->registered & REG_NICK)
+                               ReplaceParamRef(0, user->nick);
+                       else
+                               ReplaceParam(0, "*");
+               }
+       };
 }