Merge pull request #89 from cyanray/dev/cyanray

更新: SendNudge 函数以及相关代码

Author: cyanray

examples/NudgeEvent.cpp

@@ -58,18 +58,18 @@ int main()
 			// 注意: 因此必须过滤掉来自bot自己的戳一戳事件，不然会导致死循环
 			if (e.FromId.ToInt64() == bot.GetBotQQ().ToInt64()) return;
 
-			cout << e.FromId.ToInt64() << " " << e.Action << " " << e.Target << " " << e.Suffix;
+			cout << e.FromId.ToInt64() << " " << e.Action << " " << e.Target << " " << e.Suffix << endl;
 			// 如果别人戳机器人，那么就让机器人戳回去
 			if (e.Target.ToInt64() != bot.GetBotQQ().ToInt64()) return;
-			bot.SendNudge(e.FromId, e.SubjectId, e.FromKind);
+			bot.SendNudge(e.FromId, *e.GetSubjectId());
 			// 如果不喜欢上面这一行代码，也可以用下面的代码代替
 			//if (e.FromKind == NudgeEvent::SubjectKind::Group)
 			//{
-			//	bot.SendNudge(e.FromId, (GID_t)e.SubjectId);
+			//	bot.SendNudge(e.FromId, (GID_t)e.RawSubjectId);
 			//}
 			//else
 			//{
-			//	bot.SendNudge(e.FromId, (QQ_t)e.SubjectId);
+			//	bot.SendNudge(e.FromId, (QQ_t)e.RawSubjectId);
 			//}
 		});
 

include/mirai/events/nudge_event.hpp

@@ -22,11 +22,22 @@ namespace Cyan
 
 		QQ_t FromId;
 		QQ_t Target;
-		int64_t SubjectId;
+		int64_t RawSubjectId;
 		SubjectKind FromKind;
 		string Action;
 		string Suffix;
 
+		std::shared_ptr<UID_t> GetSubjectId()
+		{
+			if (FromKind == SubjectKind::Group)
+			{
+				return std::make_shared<GID_t>(RawSubjectId);
+			}
+			else
+			{
+				return std::make_shared<QQ_t>(RawSubjectId);
+			}
+		}
 
 		static MiraiEvent GetMiraiEvent()
 		{
@@ -56,7 +67,7 @@ namespace Cyan
 		{
 			this->FromId = (QQ_t)(j["fromId"].get<int64_t>());
 			this->Target = (QQ_t)(j["target"].get<int64_t>());
-			this->SubjectId = j["subject"]["id"].get<int64_t>();
+			this->RawSubjectId = j["subject"]["id"].get<int64_t>();
 			this->FromKind = SubjectKindStr(j["subject"]["kind"].get<string>());
 			this->Action = j["action"].get<string>();
 			this->Suffix = j["suffix"].get<string>();
@@ -70,7 +81,7 @@ namespace Cyan
 				{ "type", "NudgeEvent" },
 				{ "fromId", (int64_t)FromId },
 				{ "target", (int64_t)Target },
-				{ "subject", { {"id", SubjectId }, { "kind", SubjectKindStr(FromKind) } } },
+				{ "subject", { {"id", RawSubjectId }, { "kind", SubjectKindStr(FromKind) } } },
 				{ "action", Action },
 				{ "suffix", Suffix }
 			};

include/mirai/mirai_bot.hpp

@@ -25,7 +25,6 @@
 #include "mirai/events/friend_message.hpp"
 #include "mirai/events/group_message.hpp"
 #include "mirai/events/message_event.hpp"
-#include "mirai/events/nudge_event.hpp"
 #include "mirai/events/lost_connection.hpp"
 
 using std::string;
@@ -144,10 +143,9 @@ namespace Cyan
 		/**
 		 * @brief 发送戳一戳
 		 * @param target 目标QQ，可以是好友或者Bot的QQ
-		 * @param subject_id 戳一戳接收主体，可以是QQ好友或者群号码
-		 * @param kind 需要指定接收主体的类型
+		 * @param subject_id 戳一戳接收主体
 		*/
-		void SendNudge(QQ_t target, int64_t subject_id, NudgeEvent::SubjectKind kind);
+		void SendNudge(QQ_t target, const UID_t& subject_id);
 		/**
 		 * \brief 上传可以发送给好友的图片
 		 * \param fileName 文件名

src/mirai_bot.cpp

@@ -229,9 +229,16 @@ namespace Cyan
 		SendNudge(target.ToInt64(), subject_id.ToInt64(), "Group");
 	}
 
-	void MiraiBot::SendNudge(QQ_t target, int64_t subject_id, NudgeEvent::SubjectKind kind)
+	void MiraiBot::SendNudge(QQ_t target, const UID_t& subject_id)
 	{
-		SendNudge(target.ToInt64(), subject_id, NudgeEvent::SubjectKindStr(kind));
+		if (typeid(subject_id) == typeid(GID_t))
+		{
+			SendNudge(target, (const GID_t&)(subject_id));
+		}
+		else
+		{
+			SendNudge(target, (const QQ_t&)(subject_id));
+		}
 	}
 
 	FriendImage MiraiBot::UploadFriendImage(const string& fileName)