Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[OneBot] Making API get_group_honor_info returns Onebot11 compliant #679

Merged
merged 7 commits into from
Nov 12, 2024
Merged

[OneBot] Making API get_group_honor_info returns Onebot11 compliant #679

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7e4457f
[OneBot] Making API `get_group_honor_info` returns Onebot11 compliant
ishkong Nov 5, 2024
2e14449
[Chore] Restore Comments
ishkong Nov 5, 2024
d139301
[OneBot] Fix tryadd key alread in result
ishkong Nov 8, 2024
5ec456e
Update GetGroupHonorInfoOperation.cs
ishkong Nov 8, 2024
dfa1803
Update GetGroupHonorInfoOperation.cs
ishkong Nov 12, 2024
8bcec63
Update GetGroupHonorInfoOperation.cs
ishkong Nov 12, 2024
44ce900
Update GetGroupHonorInfoOperation.cs
ishkong Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 34 additions & 1 deletion Lagrange.OneBot/Core/Operation/Group/GetGroupHonorInfoOperation.cs
View file
Open in desktop
ishkong marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ public partial class GetGroupHonorInfoOperation(TicketService ticket) : IOperati
{
{ "talkative", 1 }, { "performer", 2 }, { "legend", 3 }, { "strong_newbie", 5 }, { "emotion", 6 },
};

private static readonly Dictionary<string, string> KeyToOnebot11 = new()
{
{"uin", "user_id"}, {"name", "nickname"}, {"nick", "nickname"}, {"desc", "description"}
};

public async Task<OneBotResult> HandleOperation(BotContext context, JsonNode? payload)
{
Expand All @@ -35,6 +40,8 @@ public async Task<OneBotResult> HandleOperation(BotContext context, JsonNode? pa
? HonorToType.Select(x => x.Key).ToArray()
: [honor.Type];

result.TryAdd("group_id", honor.GroupId);

foreach (string honorRaw in honors)
{
string url = $"https://qun.qq.com/interactive/honorlist?gc={honor.GroupId}&type={HonorToType[honorRaw]}";
Expand All @@ -46,7 +53,22 @@ public async Task<OneBotResult> HandleOperation(BotContext context, JsonNode? pa
{
foreach (var (key, value) in Keys)
{
if (json[value] is { } node) result.TryAdd(key, node.Deserialize<JsonNode>()); // 神经病
if (json[value] is JsonObject jsonObject) // 神经病 (我也觉得)
{
ProcessJsonObject(jsonObject);
if (honor.Type == "all" || honor.Type == "talkative") result.TryAdd(key, jsonObject.Deserialize<JsonNode>());
}
else if (json[value] is JsonArray jsonArray)
{
foreach (var item in jsonArray)
{
if (item is JsonObject itemObject)
{
ProcessJsonObject(itemObject);
}
}
if ((honor.Type == "all" && key.Contains(honorRaw)) || key.Contains(honor.Type)) result.TryAdd(key, jsonArray.Deserialize<JsonNode>());
}
DarkRRb marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
Expand All @@ -56,4 +78,15 @@ public async Task<OneBotResult> HandleOperation(BotContext context, JsonNode? pa

throw new Exception();
}

private static void ProcessJsonObject(JsonObject jsonObject)
{
foreach (var oldKey in KeyToOnebot11.Keys)
{
if (jsonObject.Remove(oldKey, out var nodeValue))
{
jsonObject[KeyToOnebot11[oldKey]] = nodeValue;
}
}
}
}