Merge pull request #88 from cyanray/dev/cyanray

更新: 完善QQ_t和GID_t

Author: cyanray

include/mirai/defs/qq_types.hpp

@@ -3,43 +3,73 @@
 #define mirai_cpp_defs_qq_types_hpp_H_
 
 #include <exception>
+#include <iostream>
 #include "serializable.hpp"
 #include "mirai/exported.h"
 
 namespace Cyan
 {
-	// QQ 号码类型
-	class QQ_t
+	// QQ_t 和 GID_t 的基类型
+	class UID_t
 	{
 	public:
-		QQ_t() :QQ(-1) {}
-		explicit  QQ_t(int64_t qq) :QQ(qq) {}
-		operator int64_t() const { return QQ; }
-		int64_t ToInt64() const { return QQ; }
-	private:
-		int64_t QQ;
+		int64_t ToInt64() const
+		{
+			return data_;
+		}
+		explicit operator int64_t() const
+		{
+			return data_;
+		}
+		bool operator==(const UID_t& a) const
+		{
+			return this->data_ == a.data_;
+		}
+		bool operator!=(const UID_t& a) const
+		{
+			return !operator==(a);
+		}
+		virtual ~UID_t() = default;
+	protected:
+		explicit UID_t(int64_t id) : data_(id) {}
+		virtual void __avoiding_object_slicing() const = 0;
+		int64_t data_;
 	};
-
-	inline QQ_t operator "" _qq(unsigned long long int v)
+	
+	// 储存 QQ 号码的类型
+	class QQ_t : public UID_t
 	{
-		return QQ_t(int64_t(v));
-	}
+	public:
+		QQ_t() : UID_t(-1) {}
+		explicit QQ_t(int64_t id) : UID_t(id) {}
+	private:
+		virtual void __avoiding_object_slicing() const override {}
+	};
 
-	// 群号码类型
-	class GID_t
+	// 储存群号码的类型
+	class GID_t : public UID_t
 	{
 	public:
-		GID_t() :GID(-1) {}
-		explicit GID_t(int64_t gid) :GID(gid) {}
-		operator int64_t() const { return GID; }
-		int64_t ToInt64() const { return GID; }
+		GID_t() : UID_t(-1) {}
+		explicit GID_t(int64_t id) : UID_t(id) {}
 	private:
-		int64_t GID;
+		virtual void __avoiding_object_slicing() const override {}
 	};
 
-	inline GID_t operator "" _gid(unsigned long long int v)
+	inline GID_t operator ""_gid(unsigned long long int id)
+	{
+		return (GID_t)(id);
+	}
+
+	inline QQ_t operator ""_qq(unsigned long long int id)
+	{
+		return (QQ_t)(id);
+	}
+
+	inline std::ostream& operator<<(std::ostream& o, const UID_t& uid)
 	{
-		return GID_t(int64_t(v));
+		o << (int64_t)(uid);
+		return o;
 	}
 
 	// 消息 ID

include/mirai/events/command_event.hpp

@@ -40,7 +40,7 @@ namespace Cyan
 		{
 			CommandName = j["name"].get<string>();
 			Sender = (QQ_t)(j["friend"].get<int64_t>());
-			GroupId = (GID_t)(QQ_t)(j["group"].get<int64_t>());
+			GroupId = (GID_t)(j["group"].get<int64_t>());
 			Args = j["args"].get<vector<string>>();
 			return true;
 		}