Archive/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2026-06-10 00:02:37 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: make MessageComponent accept type

Browse source
This commit is contained in:
Solareon 2026-04-06 09:39:01 +02:00
parent 0414da2fb7
commit 2bf8b86243
3 changed files with 35 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
DiscordChatExporter.Core/Discord/Data/Components/MessageComponent.cs
View file

@ -7,9 +7,9 @@ using JsonExtensions.Reading;
namespace DiscordChatExporter.Core.Discord.Data.Components; namespace DiscordChatExporter.Core.Discord.Data.Components;
// https://docs.discord.com/developers/components/reference#what-is-a-component // https://docs.discord.com/developers/components/reference#component-object
public partial record MessageComponent( public partial record MessageComponent(
MessageComponentKind Kind, MessageComponentType Kind,
IReadOnlyList<MessageComponent> Components, IReadOnlyList<MessageComponent> Components,
ButtonComponent? Button ButtonComponent? Button
) )
@ -29,21 +29,43 @@ public partial record MessageComponent
return null; return null;
var type = rawType.Value; var type = rawType.Value;
if (!Enum.IsDefined(typeof(MessageComponentKind), type)) if (!Enum.IsDefined(typeof(MessageComponentType), type))
return null; return null;
var kind = (MessageComponentKind)type; return Parse((MessageComponentType)type, json);
}
var components = private static MessageComponent Parse(MessageComponentType type, JsonElement json)
json.GetPropertyOrNull("components") {
return type switch
{
MessageComponentType.Button => ParseButton(json),
_ => ParseDefault(type, json),
};
}
private static MessageComponent ParseDefault(MessageComponentType type, JsonElement json)
{
var components = ParseComponents(json);
return new MessageComponent(type, components, null);
}
private static MessageComponent ParseButton(JsonElement json)
{
var components = ParseComponents(json);
var button = ButtonComponent.Parse(json);
return new MessageComponent(MessageComponentType.Button, components, button);
}
private static MessageComponent[] ParseComponents(JsonElement json)
{
return json.GetPropertyOrNull("components")
?.EnumerateArrayOrNull() ?.EnumerateArrayOrNull()
?.Select(Parse) ?.Select(Parse)
.WhereNotNull() .WhereNotNull()
.ToArray() .ToArray()
?? []; ?? [];
var button = kind == MessageComponentKind.Button ? ButtonComponent.Parse(json) : null;
return new MessageComponent(kind, components, button);
} }
} }

2
DiscordChatExporter.Core/Discord/Data/Components/MessageComponentKind.cs → DiscordChatExporter.Core/Discord/Data/Components/MessageComponentType.cs
View file

@ -1,7 +1,7 @@
namespace DiscordChatExporter.Core.Discord.Data.Components; namespace DiscordChatExporter.Core.Discord.Data.Components;
// https://discord.com/developers/docs/components/reference#component-object-component-types // https://discord.com/developers/docs/components/reference#component-object-component-types
public enum MessageComponentKind public enum MessageComponentType
{ {
ActionRow = 1, ActionRow = 1,
Button = 2, Button = 2,

4
DiscordChatExporter.Core/Exporting/MessageGroupTemplate.cshtml
View file

@ -733,10 +733,10 @@
} }
@* Components *@ @* Components *@
@if (message.Components.Any(c => c.Kind == MessageComponentKind.ActionRow && c.HasButtons)) @if (message.Components.Any(c => c.Kind == MessageComponentType.ActionRow && c.HasButtons))
{ {
<div class="chatlog__components"> <div class="chatlog__components">
@foreach (var actionRow in message.Components.Where(c => c.Kind == MessageComponentKind.ActionRow && c.HasButtons)) @foreach (var actionRow in message.Components.Where(c => c.Kind == MessageComponentType.ActionRow && c.HasButtons))
{ {
<div class="chatlog__action-row"> <div class="chatlog__action-row">
@foreach (var button in actionRow.Buttons) @foreach (var button in actionRow.Buttons)