Merge pull request #136 from Numendacil/dev/numendacil

1. 添加查询非好友账号信息接口GetUserProfile()
2. 增加商店表情消息MarketFaceMessage
3. 更正MiraiCode.hpp一处字符串乱码
4. 修改了ImageMessage和VoiceMessage的Set()与ToJson()

Author: cyanray

CMakePresets.json

@@ -1,4 +1,4 @@
-{
+{
   "version": 2,
   "configurePresets": [
     {

include/mirai/MiraiBot.hpp

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #ifndef mirai_cpp__mirai_bot_hpp_H_
 #define mirai_cpp__mirai_bot_hpp_H_
 // std libraries
@@ -280,6 +280,13 @@ namespace Cyan
 		*/
 		Profile GetGroupMemberProfile(const GID_t& gid, const QQ_t& memberQQ);
 
+		/**
+		 * @brief 获取QQ用户的个人简介
+		 * @param qq 用户QQ
+		 * @return Profile
+		*/
+		Profile GetUserProfile(const QQ_t& qq);
+
 		/**
 		 * \brief 设置群成员的群名片
 		 * \param gid 群组(GID_t)

include/mirai/messages/ImageMessage.hpp

@@ -61,6 +61,12 @@ namespace Cyan
 		{
 			if (json["type"].is_null() || json["type"].get<string>() != this->GetType())
 				throw std::runtime_error("给定的json不正确");
+
+			imageId_ = "";
+			url_ = "";
+			path_ = "";
+			base64_ = "";
+
 			if (!json["imageId"].is_null())
 				imageId_ = json["imageId"].get<string>();
 			if (!json["url"].is_null())
@@ -76,10 +82,10 @@ namespace Cyan
 			return
 			{
 				{ "type", GetType() },
-				{ "imageId", imageId_ },
-				{ "url", url_ },
-				{ "path", path_ },
-				{ "base64", base64_ }
+				{ "imageId", imageId_.empty()? nullptr : imageId_ },
+				{ "url", url_.empty()? nullptr : url_ },
+				{ "path", path_.empty()? nullptr : path_ },
+				{ "base64", base64_.empty()? nullptr : base64_ }
 			};
 		}
 		virtual ~ImageMessage() {}

include/mirai/messages/MarketFaceMessage.hpp

@@ -0,0 +1,72 @@
+#pragma once
+#ifndef mirai_cpp_defs_messages_marketface_message_hpp_H_
+#define mirai_cpp_defs_messages_marketface_message_hpp_H_
+#include <utility>
+#include "mirai/defs/IMessage.hpp"
+
+namespace Cyan
+{
+	class MarketFaceMessage : public IMessage
+	{
+	public:
+		MarketFaceMessage() : id_(0), name_() {}
+		MarketFaceMessage(const int& id) : id_(id), name_() {}
+		MarketFaceMessage(const string& name) : id_(0), name_(name) {}
+		template<int N>
+		MarketFaceMessage(const char(&name)[N]) : id_(0), name_(name,N) {}
+		MarketFaceMessage(const MarketFaceMessage& m) :id_(m.id_), name_(m.name_) {}
+		MarketFaceMessage(MarketFaceMessage&& m) noexcept
+		{
+			std::swap(this->id_,m.id_);
+			std::swap(this->name_, m.name_);
+		}
+		virtual const string& GetType() const override
+		{
+			return type_;
+		}
+		virtual bool operator==(const IMessage& m) const override
+		{
+			if (auto m_ptr = dynamic_cast<const MarketFaceMessage*>(&m))
+			{
+				return m_ptr->id_ == this->id_;
+			}
+			return false;
+		}
+		virtual bool operator!=(const IMessage& m) const override
+		{
+			return !(*this == m);
+		}
+		virtual bool Set(const json& json) override
+		{
+			if (json["type"].is_null() || json["type"].get<string>() != this->GetType())
+				throw std::runtime_error("给定的json不正确");
+			id_ = json["id"].get<int>();
+			name_ = json["name"].get<string>();
+			return true;
+		}
+		virtual json ToJson() const override
+		{
+			return
+			{
+				{ "type", type_ },
+				{ "id", id_ },
+				{ "name",name_ }
+			};
+		}
+		virtual ~MarketFaceMessage() {}
+
+		int FaceId() const { return id_; }
+		void FaceId(int id) { this->id_ = id; }
+
+		string Name() const { return name_; }
+		void Name(const string& n) { this->name_ = n; }
+
+	private:
+		const string type_ = "MarketFace";
+		int id_;
+		string name_;
+	};
+
+}
+#endif
+

include/mirai/messages/MiraiCode.hpp

@@ -39,7 +39,7 @@ namespace Cyan
 		virtual bool Set(const json& json) override
 		{
 			if (json["type"].is_null() || json["type"].get<string>() != this->GetType())
-				throw std::runtime_error("¸ø¶¨µÄjson²»ÕýÈ·");
+				throw std::runtime_error("给定的json不正确");
 			code_ = json["code"].get<string>();
 			return true;
 		}

include/mirai/messages/VoiceMessage.hpp

@@ -63,6 +63,13 @@ namespace Cyan
 		{
 			if (json["type"].is_null() || json["type"].get<string>() != this->GetType())
 				throw std::runtime_error("给定的json不正确");
+
+			voiceId_ = "";
+			url_ = "";
+			path_ = "";
+			base64_ = "";
+			length_ = 0;
+
 			if (!json["voiceId"].is_null())
 				voiceId_ = json["voiceId"].get<string>();
 			if (!json["url"].is_null())
@@ -80,10 +87,10 @@ namespace Cyan
 			return
 			{
 				{ "type", type_ },
-				{ "voiceId", voiceId_ },
-				{ "url", url_ },
-				{ "path", path_ },
-				{ "base64", base64_ },
+				{ "voiceId", voiceId_.empty()? nullptr : voiceId_ },
+				{ "url", url_.empty()? nullptr : url_ },
+				{ "path", path_.empty()? nullptr : path_ },
+				{ "base64", base64_.empty()? nullptr : base64_ },
 				{ "length", length_ }
 			};
 		}

include/mirai/messages/messages.hpp

@@ -6,6 +6,7 @@
 #include "mirai/messages/AtAllMessage.hpp"
 #include "mirai/messages/AtMessage.hpp"
 #include "mirai/messages/DiceMessage.hpp"
+#include "mirai/messages/MarketFaceMessage.hpp"
 #include "mirai/messages/FaceMessage.hpp"
 #include "mirai/messages/FileMessage.hpp"
 #include "mirai/messages/FlashImageMessage.hpp"

src/MessageChain.cpp

@@ -18,6 +18,7 @@ namespace Cyan
 			reflection.Register<AppMessage>("App");
 			reflection.Register<JsonMessage>("Json");
 			reflection.Register<XmlMessage>("Xml");
+			reflection.Register<MarketFaceMessage>("MarketFace");
 			reflection.Register<FaceMessage>("Face");
 			reflection.Register<PokeMessage>("Poke");
 			reflection.Register<QuoteMessage>("Quote");

src/MiraiBot.cpp

@@ -1,4 +1,4 @@
-#define _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING
+#define _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING
 
 #include <iostream>
 #include <queue>
@@ -650,6 +650,21 @@ namespace Cyan
 		return result;
 	}
 
+	Profile MiraiBot::GetUserProfile(const QQ_t& qq)
+	{
+		stringstream api_url;
+		api_url
+			<< "/userProfile?sessionKey="
+			<< pmem->sessionKey
+			<< "&target="
+			<< int64_t(qq);
+		auto res = pmem->httpClient->Get(api_url.str().data());
+		json re_json = ParseOrThrowException(res);
+		Profile result;
+		result.Set(re_json);
+		return result;
+	}
+
 	void MiraiBot::SetGroupMemberName(const GID_t& gid, const QQ_t& memberId, const string& name)
 	{
 		auto member_info = this->GetGroupMemberInfo(gid, memberId);