X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fmodules%2Fcap.h;h=6dcb9f3bc4d037d5a9055cfe7472824e8adcb190;hb=79892a727e323dcc4bce7e9c0cf3c99c5fe61706;hp=9ff5faca97456aba01d002a2df3c95bebe0ec520;hpb=425d54073a0ae61c68de1b339177bb7c0db116f1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/modules/cap.h b/include/modules/cap.h
index 9ff5faca9..6dcb9f3bc 100644
--- 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.
@@ -285,4 +285,51 @@ namespace Cap
 			return NULL;
 		}
 	};
+
+	/** Reference to a cap. The cap may be provided by another module.
+	 */
+	class Reference
+	{
+		dynamic_reference_nocheck<Capability> ref;
+
+	 public:
+		/** Constructor, initializes the capability reference
+		 * @param mod Module creating this object
+		 * @param Name Raw name of the cap as used in the protocol (CAP LS, etc.)
+		 */
+		Reference(Module* mod, const std::string& Name)
+			: ref(mod, "cap/" + Name)
+		{
+		}
+
+		/** Check whether a user has the referenced capability turned on.
+		 * @param user User to check
+		 * @return True if the user is using the referenced capability, false otherwise
+		 */
+		bool get(LocalUser* user)
+		{
+			if (ref)
+				return ref->get(user);
+			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, "*");
+		}
+	};
 }