Add action row support #1484
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| using System; | ||
| using System.Text.Json; | ||
| using DiscordChatExporter.Core.Discord.Data.Common; | ||
| using DiscordChatExporter.Core.Utils.Extensions; | ||
| using JsonExtensions.Reading; | ||
|
|
||
| namespace DiscordChatExporter.Core.Discord.Data.Components; | ||
|
|
||
| // https://discord.com/developers/docs/components/reference#button | ||
| public partial record ButtonComponent( | ||
| ButtonStyle Style, | ||
| string? Label, | ||
| Emoji? Emoji, | ||
| string? Url, | ||
| string? CustomId, | ||
| Snowflake? SkuId, | ||
| bool IsDisabled | ||
| ) | ||
| { | ||
| public bool IsUrlButton => !string.IsNullOrWhiteSpace(Url); | ||
| } | ||
|
|
||
| public partial record ButtonComponent | ||
| { | ||
| public static ButtonComponent Parse(JsonElement json) | ||
| { | ||
| var style = | ||
| json.GetPropertyOrNull("style") | ||
| ?.GetInt32OrNull() | ||
| ?.Pipe(s => | ||
| Enum.IsDefined(typeof(ButtonStyle), s) ? (ButtonStyle)s : (ButtonStyle?)null | ||
|
Owner
There was a problem hiding this comment. I think we can just do |
||
| ) | ||
| ?? ButtonStyle.Secondary; | ||
|
|
||
| var label = json.GetPropertyOrNull("label")?.GetStringOrNull(); | ||
| var emoji = json.GetPropertyOrNull("emoji")?.Pipe(Emoji.Parse); | ||
|
|
||
| var url = json.GetPropertyOrNull("url")?.GetNonWhiteSpaceStringOrNull(); | ||
| var customId = json.GetPropertyOrNull("custom_id")?.GetNonWhiteSpaceStringOrNull(); | ||
| var skuId = json.GetPropertyOrNull("sku_id") | ||
| ?.GetNonWhiteSpaceStringOrNull() | ||
| ?.Pipe(Snowflake.Parse); | ||
|
|
||
| var isDisabled = json.GetPropertyOrNull("disabled")?.GetBooleanOrNull() ?? false; | ||
|
|
||
| return new ButtonComponent(style, label, emoji, url, customId, skuId, isDisabled); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| namespace DiscordChatExporter.Core.Discord.Data.Components; | ||
|
|
||
| // https://discord.com/developers/docs/components/reference#button-button-styles | ||
| public enum ButtonStyle | ||
| { | ||
| Primary = 1, | ||
| Secondary = 2, | ||
| Success = 3, | ||
| Danger = 4, | ||
| Link = 5, | ||
| Premium = 6, | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Text.Json; | ||
| using DiscordChatExporter.Core.Utils.Extensions; | ||
| using JsonExtensions.Reading; | ||
|
|
||
| namespace DiscordChatExporter.Core.Discord.Data.Components; | ||
|
|
||
| // https://docs.discord.com/developers/components/reference#component-object | ||
|
solareon marked this conversation as resolved.
|
||
| public partial record MessageComponent( | ||
|
Tyrrrz marked this conversation as resolved.
Owner
There was a problem hiding this comment. The design I was thinking about was more like this:
Owner
There was a problem hiding this comment. The rendering code would then pattern match via: component switch
{
ButtonMessageComponent button => ...
ActionRowComponent actionRow => ...
} |
||
| MessageComponentType Kind, | ||
| IReadOnlyList<MessageComponent> Components, | ||
| ButtonComponent? Button | ||
| ) | ||
| { | ||
| public bool HasButtons => Button is not null || Components.Any(c => c.HasButtons); | ||
|
|
||
| public IReadOnlyList<ButtonComponent> Buttons => | ||
| Components.Select(c => c.Button).WhereNotNull().ToArray(); | ||
| } | ||
|
|
||
| public partial record MessageComponent | ||
| { | ||
| public static MessageComponent? Parse(JsonElement json) | ||
| { | ||
| var rawType = json.GetPropertyOrNull("type")?.GetInt32OrNull(); | ||
| if (rawType is null) | ||
| return null; | ||
|
|
||
| var type = rawType.Value; | ||
| if (!Enum.IsDefined(typeof(MessageComponentType), type)) | ||
| return null; | ||
|
Comment on lines
+32
to
+33
Owner
There was a problem hiding this comment. Are you sure this check is necessary? If that value is not defined in the enum, your current logic would flow through to |
||
|
|
||
| return Parse((MessageComponentType)type, json); | ||
| } | ||
|
|
||
| private static MessageComponent Parse(MessageComponentType type, JsonElement json) | ||
| { | ||
| 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() | ||
| ?.Select(Parse) | ||
| .WhereNotNull() | ||
| .ToArray() | ||
| ?? []; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| namespace DiscordChatExporter.Core.Discord.Data.Components; | ||
|
|
||
| // https://discord.com/developers/docs/components/reference#component-object-component-types | ||
| public enum MessageComponentType | ||
| { | ||
| ActionRow = 1, | ||
| Button = 2, | ||
| StringSelect = 3, | ||
| TextInput = 4, | ||
| UserSelect = 5, | ||
| RoleSelect = 6, | ||
| MentionableSelect = 7, | ||
| ChannelSelect = 8, | ||
| Section = 9, | ||
| TextDisplay = 10, | ||
| Thumbnail = 11, | ||
| MediaGallery = 12, | ||
| File = 13, | ||
| Separator = 14, | ||
| Container = 17, | ||
| Label = 18, | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.