GuanM/AuroraNative
1
0
Fork 0
mirror of https://github.com/timi137137/AuroraNative.git synced 2025-09-18 13:56:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update events

Browse Source 
修改 修改了一些接口的返回参数，变得更统一了

更新 更新了一些事件的相应数据
This commit is contained in:
悠静萝莉
2021-05-07 13:17:37 +08:00
committed by GitHub
parent a703ee6ebb 43971de223
commit 693d44d387
6 changed files with 77 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
AuroraNative/API/Api.cs
View File

@@ -10,6 +10,7 @@ using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Net;
using System.Threading;
using System.Threading.Tasks;
@@ -111,7 +112,7 @@ namespace AuroraNative
{ "group_id", GroupID },
{ "messages", Message }
};
//HACK 等昵昵修复获取合并转发的BUG才能继续
//FIXME 等昵昵修复获取合并转发的BUG才能继续
SendCallVoid(new BaseAPI("send_group_forward_msg", Params, "SendGroupForwardMessage:" + Utils.NowTimeSteamp()));
}
@@ -364,7 +365,7 @@ namespace AuroraNative
}
/// <summary>
/// 设置群组专属头衔
/// 设置群组成员专属头衔
/// </summary>
/// <param name="GroupID">群号</param>
/// <param name="UserID">QQ号</param>
@@ -642,20 +643,26 @@ namespace AuroraNative
/// </summary>
/// <param name="Image">图片ID</param>
/// <returns>错误返回null,成功返回JObject</returns>
public async Task<(List<OCRTextDetection>, string)> OCRImage(string Image)
public async Task<Dictionary<string, object>> OCRImage(string Image)
{
JObject Json = await SendCallObject(new BaseAPI("ocr_image", new JObject { { "image", Image } }, "OCRImage:" + Utils.NowTimeSteamp()));
return (Json.Value<JToken>("texts").ToObject<List<OCRTextDetection>>(), Json.Value<string>("language"));
return new Dictionary<string, object>() {
{ "Texts",Json.Value<JToken>("texts").ToObject<List<OCRTextDetection>>()},
{ "Language",Json.Value<string>("language")}
};
}
/// <summary>
/// 获取群系统消息
/// </summary>
/// <returns>错误或不存在任何消息返回null,成功返回JObject</returns>
public async Task<(List<InvitedRequest>, List<JoinRequest>)> GetGroupSystemMsg()
public async Task<Dictionary<string, object>> GetGroupSystemMsg()
{
JObject Json = await SendCallObject(new BaseAPI("get_group_system_msg", null, "GetGroupSystemMsg:" + Utils.NowTimeSteamp()));
return (Json.Value<JToken>("invited_requests").ToObject<List<InvitedRequest>>(), Json.Value<JToken>("join_requests").ToObject<List<JoinRequest>>());
return new Dictionary<string, object>() {
{ "InvitedRequest",Json.Value<JToken>("invited_requests").ToObject<List<InvitedRequest>>()},
{ "JoinRequest",Json.Value<JToken>("join_requests").ToObject<List<JoinRequest>>()}
};
}
/// <summary>
@@ -700,11 +707,13 @@ namespace AuroraNative
/// </summary>
/// <param name="GroupID">群号</param>
/// <returns>错误返回null,成功返回JObject</returns>
public async Task<(List<File>, List<Folder>)> GetGroupRootFiles(long GroupID)
public async Task<Dictionary<string, object>> GetGroupRootFiles(long GroupID)
{
JObject Json = await SendCallObject(new BaseAPI("get_group_root_files", new JObject { { "group_id", GroupID } }, "GetGroupRootFiles:" + Utils.NowTimeSteamp()));
return (Json.Value<JToken>("files").ToObject<List<File>>(), Json.Value<JToken>("folders").ToObject<List<Folder>>());
return new Dictionary<string, object>() {
{ "Files",Json.Value<JToken>("files").ToObject<List<File>>()},
{ "Folder",Json.Value<JToken>("folders").ToObject<List<Folder>>()}
};
}
/// <summary>
@@ -713,7 +722,7 @@ namespace AuroraNative
/// <param name="GroupID">群号</param>
/// <param name="FolderID">文件夹ID</param>
/// <returns>错误返回null,成功返回JObject</returns>
public async Task<(List<File>, List<Folder>)> GetGroupFilesByFolder(long GroupID, string FolderID)
public async Task<Dictionary<string, object>> GetGroupFilesByFolder(long GroupID, string FolderID)
{
JObject Params = new JObject
{
@@ -723,7 +732,10 @@ namespace AuroraNative
JObject Json = await SendCallObject(new BaseAPI("get_group_files_by_folder", Params, "GetGroupFilesByFolder:" + Utils.NowTimeSteamp()));
return (Json.Value<JToken>("files").ToObject<List<File>>(), Json.Value<JToken>("folders").ToObject<List<Folder>>());
return new Dictionary<string, object>() {
{ "Files",Json.Value<JToken>("files").ToObject<List<File>>()},
{ "Folder",Json.Value<JToken>("folders").ToObject<List<Folder>>()}
};
}
/// <summary>
@@ -749,10 +761,18 @@ namespace AuroraNative
/// 获取状态
/// </summary>
/// <returns>错误返回null,成功返回JObject</returns>
public async Task<(bool, RunningStatistics)> GetStatus()
public async Task<Dictionary<string, object>> GetStatus()
{
JObject Json = await SendCallObject(new BaseAPI("get_group_info", null, "GetGroupInfo:" + Utils.NowTimeSteamp()));
return (Json.Value<bool>("online"), Json.Value<RunningStatistics>("stat"));
return new Dictionary<string, object>() {
{ "AppInitialized",Json.Value<bool>("app_initialized")},
{ "AppEnabled",Json.Value<bool>("app_enabled")},
{ "PluginsGood",Json.Value<bool>("plugins_good")},
{ "AppGood",Json.Value<bool>("app_good")},
{ "Online",Json.Value<bool>("online")},
{ "Good",Json.Value<bool>("good")},
{ "Statistics",Json.Value<RunningStatistics>("stat")}
};
}
/// <summary>
@@ -921,6 +941,27 @@ namespace AuroraNative
return (await SendCallObject(new BaseAPI("check_url_safely", new JObject { { "url", URL } }, "CheckURLSafely:" + Utils.NowTimeSteamp()))).Value<int>("level");
}
#region ==额外API==
/// <summary>
/// 获取指定群头像
/// </summary>
/// <param name="GroupID">群号</param>
/// <param name="SaveTo">保存路径-包括文件名(通常后缀名是jpg)</param>
/// <returns>是否成功</returns>
public bool DownloadGroupImage(long GroupID,string SaveTo) {
try
{
new WebClient().DownloadFile($"https://p.qlogo.cn/gh/{GroupID}/{GroupID}/100", SaveTo);
return true;
}
catch (Exception _) {
return false;
}
}
#endregion
#endregion
#region --私有函数--

2
AuroraNative/Abstract/Device.cs
View File

@@ -3,7 +3,7 @@
namespace AuroraNative.Type
{
/// <summary>
/// 提供用于描述事件参数的基础类, 该类是抽象的
/// 提供用于描述登录设备的基础类, 该类是抽象的
/// </summary>
public abstract class Device
{

22
AuroraNative/Abstract/Groups/Groups.cs
View File

@@ -21,16 +21,34 @@ namespace AuroraNative.Type.Groups
[JsonProperty(PropertyName = "group_name")]
public string GroupName;
/// <summary>
/// 群备注
/// </summary>
[JsonProperty(PropertyName = "group_memo")]
public string GroupRemark;
/// <summary>
/// 群创建时间
/// </summary>
[JsonProperty(PropertyName = "group_create_time", NullValueHandling = NullValueHandling.Ignore)]
public uint GroupCreateTime;
/// <summary>
/// 群等级
/// </summary>
[JsonProperty(PropertyName = "group_level", NullValueHandling = NullValueHandling.Ignore)]
public uint GroupLevel;
/// <summary>
/// 现在人数
/// </summary>
[JsonProperty(PropertyName = "member_count")]
[JsonProperty(PropertyName = "member_count", NullValueHandling = NullValueHandling.Ignore)]
public int MemberCount;
/// <summary>
/// 最大人数
/// </summary>
[JsonProperty(PropertyName = "max_member_count")]
[JsonProperty(PropertyName = "max_member_count", NullValueHandling = NullValueHandling.Ignore)]
public int MaxMemberCount;
#endregion

2
AuroraNative/Abstract/Groups/SystemMessage/JoinRequest.cs
View File

@@ -25,7 +25,7 @@ namespace AuroraNative.Type.Groups.SystemMessages
/// 验证信息
/// </summary>
[JsonProperty(PropertyName = "message")]
public long Message;
public string Message;
#endregion
}

1
AuroraNative/Abstract/RunningStatistics.cs
View File

@@ -45,7 +45,6 @@ namespace AuroraNative.Type
[JsonProperty(PropertyName = "disconnect_times")]
public uint DisconnectsCount;
/// <summary>
/// 账号掉线次数
/// </summary>

2
AuroraNative/AuroraNative.csproj
View File

@@ -21,7 +21,7 @@
<EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
<AssemblyName>AuroraNative</AssemblyName>
<RootNamespace>AuroraNative</RootNamespace>
<Version>1.2.0-Beta</Version>
<Version>1.3.0-Beta</Version>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>