Merge branch 'master' into dev/cyanray

Author: cyanray

include/mirai/defs/group_config.hpp

@@ -21,7 +21,7 @@ namespace Cyan
 		/**
 		 * @brief 群公告
 		*/
-		string Announcement;
+//		string Announcement;
 
 		/**
 		 * @brief 是否允许坦白说
@@ -46,7 +46,7 @@ namespace Cyan
 		virtual bool Set(const json& j) override
 		{
 			Name = j["name"].get<string>();
-			Announcement = j["announcement"].get<string>();
+//			Announcement = j["announcement"].get<string>();
 			ConfessTalk = j["confessTalk"].get<bool>();
 			AllowMemberInvite = j["allowMemberInvite"].get<bool>();
 			AutoApprove = j["autoApprove"].get<bool>();
@@ -58,7 +58,7 @@ namespace Cyan
 		{
 			json j = json::object();
 			j["name"] = Name;
-			j["announcement"] = Announcement;
+//			j["announcement"] = Announcement;
 			j["confessTalk"] = ConfessTalk;
 			j["allowMemberInvite"] = AllowMemberInvite;
 			j["autoApprove"] = AutoApprove;

include/mirai/mirai_bot.hpp

@@ -48,7 +48,7 @@ namespace Cyan
 		 */
 		inline string GetMiraiCppVersion() const
 		{
-			return "2.2.0";
+			return "2.3.1";
 		}
 
 		std::shared_ptr<httplib::Client> GetHttpClient();
@@ -229,7 +229,7 @@ namespace Cyan
 		 * @param withDownloadInfo 获取下载信息(需要较长时间)
 		 * @return GroupFile
 		*/
-		GroupFile GetGroupFilById(const GID_t& gid, const string& groupFileId, bool withDownloadInfo = false);
+		GroupFile GetGroupFileById(const GID_t& gid, const string& groupFileId, bool withDownloadInfo = false);
 
 		/**
 		 * @brief 创建群文件夹

src/mirai_bot.cpp

@@ -692,7 +692,7 @@ namespace Cyan
 		return result;
 	}
 
-	GroupFile MiraiBot::GetGroupFilById(const GID_t& gid, const string& groupFileId, bool withDownloadInfo)
+	GroupFile MiraiBot::GetGroupFileById(const GID_t& gid, const string& groupFileId, bool withDownloadInfo)
 	{
 		stringstream api_url;
 		api_url