Merge pull request #336 from VelvetToroyashi/fix/user-apps

Fix/user apps

Backend/Remora.Discord.API.Abstractions/API/Objects/Applications/IApplicationIntegrationTypeConfig.cs

@@ -21,6 +21,7 @@
 //
 
 using JetBrains.Annotations;
+using Remora.Rest.Core;
 
 namespace Remora.Discord.API.Abstractions.Objects;
 
@@ -33,5 +34,5 @@ public interface IApplicationIntegrationTypeConfig
     /// <summary>
     /// Gets the OAuth2 install parameters for the integration type.
     /// </summary>
-    public IApplicationOAuth2InstallParams OAuth2InstallParams { get; }
+    public Optional<IApplicationOAuth2InstallParams> OAuth2InstallParams { get; }
 }

Backend/Remora.Discord.API.Abstractions/API/Objects/Interactions/ApplicationCommands/IApplicationCommand.cs

@@ -123,5 +123,5 @@ public interface IApplicationCommand
     /// <summary>
     /// Gets a value indicating the contexts in which this command can be invoked.
     /// </summary>
-    Optional<IReadOnlyList<InteractionContextType>> Contexts { get; }
+    Optional<IReadOnlyList<InteractionContextType>?> Contexts { get; }
 }

Backend/Remora.Discord.API.Abstractions/API/Objects/Interactions/IMessageInteractionMetadata.cs

@@ -40,7 +40,7 @@ public interface IMessageInteractionMetadata
     /// <summary>
     /// Gets the ID of the user who triggered the interaction.
     /// </summary>
-    Snowflake UserID { get; }
+    IUser User { get; }
 
     /// <summary>
     /// Gets the type of the interaction.
@@ -52,6 +52,11 @@ public interface IMessageInteractionMetadata
     /// </summary>
     Optional<Snowflake> OriginalResponseMessageID { get; }
 
+    /// <summary>
+    /// Gets the ID of the message containing the interactive component; only applicable to component interactions.
+    /// </summary>
+    Optional<Snowflake> InteractedMessageID { get; }
+
     /// <summary>
     /// Gets the integrations that authorized the interaction.
     /// </summary>
@@ -65,4 +70,9 @@ public interface IMessageInteractionMetadata
     /// </para>
     /// </remarks>
     IReadOnlyDictionary<ApplicationIntegrationType, Snowflake> AuthorizingIntegrationOwners { get; }
+
+    /// <summary>
+    /// Gets the interaction metadata responsible, if this is a response to a modal.
+    /// </summary>
+    Optional<IMessageInteractionMetadata> TriggeringInteractionMetadata { get; }
 }

Backend/Remora.Discord.API.Abstractions/API/Objects/Messages/IMessage.cs

@@ -197,7 +197,7 @@ public interface IMessage : IPartialMessage
     /// <summary>
     /// Gets the metadata of the interaction, if any.
     /// </summary>
-    new Optional<OneOf<IApplicationCommandInteractionMetadata, IMessageComponentInteractionMetadata, IModalSubmitInteractionMetadata>> InteractionMetadata { get; }
+    new Optional<IMessageInteractionMetadata> InteractionMetadata { get; }
 
     /// <summary>
     /// Gets the poll sent with the message, if any.
@@ -295,7 +295,7 @@ public interface IMessage : IPartialMessage
     Optional<IApplicationCommandInteractionDataResolved> IPartialMessage.Resolved => this.Resolved;
 
     /// <inheritdoc/>
-    Optional<OneOf<IApplicationCommandInteractionMetadata, IMessageComponentInteractionMetadata, IModalSubmitInteractionMetadata>> IPartialMessage.InteractionMetadata => this.InteractionMetadata;
+    Optional<IMessageInteractionMetadata> IPartialMessage.InteractionMetadata => this.InteractionMetadata;
 
     /// <inheritdoc/>
     Optional<IPoll> IPartialMessage.Poll => this.Poll;

Backend/Remora.Discord.API.Abstractions/API/Objects/Messages/IPartialMessage.cs

@@ -125,7 +125,7 @@ public interface IPartialMessage
     Optional<IApplicationCommandInteractionDataResolved> Resolved { get; }
 
     /// <inheritdoc cref="IMessage.InteractionMetadata"/>
-    Optional<OneOf<IApplicationCommandInteractionMetadata, IMessageComponentInteractionMetadata, IModalSubmitInteractionMetadata>> InteractionMetadata { get; }
+    Optional<IMessageInteractionMetadata> InteractionMetadata { get; }
 
     /// <inheritdoc cref="IMessage.Poll"/>
     Optional<IPoll> Poll { get; }

Backend/Remora.Discord.API.Abstractions/API/Rest/IDiscordRestApplicationAPI.cs

@@ -72,7 +72,7 @@ Task<Result<IReadOnlyList<IApplicationCommand>>> GetGlobalApplicationCommandsAsy
     /// <param name="defaultMemberPermissions">The permissions required to execute the command.</param>
     /// <param name="dmPermission">Whether this command is executable in DMs.</param>
     /// <param name="isNsfw">Whether the command is age-restricted.</param>
-    /// <param name="allowedIntegrationTypes">The installation contexts the command can be installed to.</param>
+    /// <param name="integrationTypes">The installation contexts the command can be installed to.</param>
     /// <param name="allowedContextTypes">The contexts in which the command is allowed to be run in.</param>
     /// <param name="ct">The cancellation token for this operation.</param>
     /// <returns>A creation result which may or may not have succeeded.</returns>
@@ -88,7 +88,7 @@ Task<Result<IApplicationCommand>> CreateGlobalApplicationCommandAsync
         Optional<IDiscordPermissionSet?> defaultMemberPermissions = default,
         Optional<bool?> dmPermission = default,
         Optional<bool> isNsfw = default,
-        Optional<IReadOnlyList<ApplicationIntegrationType>> allowedIntegrationTypes = default,
+        Optional<IReadOnlyList<ApplicationIntegrationType>> integrationTypes = default,
         Optional<IReadOnlyList<InteractionContextType>> allowedContextTypes = default,
         CancellationToken ct = default
     );
@@ -134,7 +134,7 @@ Task<Result<IApplicationCommand>> GetGlobalApplicationCommandAsync
     /// <param name="defaultMemberPermissions">The permissions required to execute the command.</param>
     /// <param name="dmPermission">Whether this command is executable in DMs.</param>
     /// <param name="isNsfw">Whether this command is age-restricted.</param>
-    /// <param name="allowedIntegrationTypes">The installation contexts the command can be installed to.</param>
+    /// <param name="integrationTypes">The installation contexts the command can be installed to.</param>
     /// <param name="allowedContextTypes">The contexts in which the command is allowed to be run in.</param>
     /// <param name="ct">The cancellation token for this operation.</param>
     /// <returns>A creation result which may or may not have succeeded.</returns>
@@ -150,7 +150,7 @@ Task<Result<IApplicationCommand>> EditGlobalApplicationCommandAsync
         Optional<IDiscordPermissionSet?> defaultMemberPermissions = default,
         Optional<bool?> dmPermission = default,
         Optional<bool> isNsfw = default,
-        Optional<IReadOnlyList<ApplicationIntegrationType>> allowedIntegrationTypes = default,
+        Optional<IReadOnlyList<ApplicationIntegrationType>> integrationTypes = default,
         Optional<IReadOnlyList<InteractionContextType>> allowedContextTypes = default,
         CancellationToken ct = default
     );
@@ -205,7 +205,7 @@ Task<Result<IReadOnlyList<IApplicationCommand>>> GetGuildApplicationCommandsAsyn
     /// <param name="descriptionLocalizations">The localized descriptions of the command.</param>
     /// <param name="defaultMemberPermissions">The permissions required to execute the command.</param>
     /// <param name="isNsfw">Whether the command is age-restricted.</param>
-    /// <param name="allowedIntegrationTypes">The installation contexts the command can be installed to.</param>
+    /// <param name="integrationTypes">The installation contexts the command can be installed to.</param>
     /// <param name="allowedContextTypes">The contexts in which the command is allowed to be run in.</param>
     /// <param name="ct">The cancellation token for this operation.</param>
     /// <returns>A creation result which may or may not have succeeded.</returns>
@@ -221,7 +221,7 @@ Task<Result<IApplicationCommand>> CreateGuildApplicationCommandAsync
         Optional<IReadOnlyDictionary<string, string>?> descriptionLocalizations = default,
         Optional<IDiscordPermissionSet?> defaultMemberPermissions = default,
         Optional<bool> isNsfw = default,
-        Optional<IReadOnlyList<ApplicationIntegrationType>> allowedIntegrationTypes = default,
+        Optional<IReadOnlyList<ApplicationIntegrationType>> integrationTypes = default,
         Optional<IReadOnlyList<InteractionContextType>> allowedContextTypes = default,
         CancellationToken ct = default
     );
@@ -271,7 +271,7 @@ Task<Result<IApplicationCommand>> GetGuildApplicationCommandAsync
     /// <param name="descriptionLocalizations">The localized descriptions of the command.</param>
     /// <param name="defaultMemberPermissions">The permissions required to execute the command.</param>
     /// <param name="isNsfw">Whether this command is age-restricted.</param>
-    /// <param name="allowedIntegrationTypes">The installation contexts the command can be installed to.</param>
+    /// <param name="integrationTypes">The installation contexts the command can be installed to.</param>
     /// <param name="allowedContextTypes">The contexts in which the command is allowed to be run in.</param>
     /// <param name="ct">The cancellation token for this operation.</param>
     /// <returns>A creation result which may or may not have succeeded.</returns>
@@ -290,7 +290,7 @@ Task<Result<IApplicationCommand>> EditGuildApplicationCommandAsync
         Optional<IReadOnlyDictionary<string, string>?> descriptionLocalizations = default,
         Optional<IDiscordPermissionSet?> defaultMemberPermissions = default,
         Optional<bool> isNsfw = default,
-        Optional<IReadOnlyList<ApplicationIntegrationType>> allowedIntegrationTypes = default,
+        Optional<IReadOnlyList<ApplicationIntegrationType>> integrationTypes = default,
         Optional<IReadOnlyList<InteractionContextType>> allowedContextTypes = default,
         CancellationToken ct = default
     );
@@ -410,7 +410,7 @@ Task<Result<IReadOnlyList<IApplicationRoleConnectionMetadata>>> UpdateApplicatio
     /// <param name="coverImage">The new cover image.</param>
     /// <param name="interactionsEndpointUrl">The new interactions endpoint URL.</param>
     /// <param name="tags">The new tags.</param>
-    /// <param name="integrationTypes">The new integration types.</param>
+    /// <param name="integrationTypesConfig">The new integration types.</param>
     /// <param name="ct">The cancellation token for this operation.</param>
     /// <returns>The updated application.</returns>
     Task<Result<IApplication>> EditCurrentApplicationAsync
@@ -424,7 +424,7 @@ Task<Result<IApplication>> EditCurrentApplicationAsync
         Optional<Stream> coverImage = default,
         Optional<Uri> interactionsEndpointUrl = default,
         Optional<IReadOnlyList<string>> tags = default,
-        Optional<IReadOnlyList<ApplicationIntegrationType>> integrationTypes = default,
+        Optional<IReadOnlyDictionary<ApplicationIntegrationType, IApplicationIntegrationTypeConfig>> integrationTypesConfig = default,
         CancellationToken ct = default
     );
 }

Backend/Remora.Discord.API.Abstractions/Remora.Discord.API.Abstractions.csproj

@@ -117,15 +117,6 @@
       <Compile Update="API\Rest\IChannelPositionModification.cs">
         <DependentUpon>IDiscordRestGuildAPI.cs</DependentUpon>
       </Compile>
-      <Compile Update="API\Objects\Interactions\IMessageComponentInteractionMetadata.cs">
-        <DependentUpon>IMessageInteractionMetadata.cs</DependentUpon>
-      </Compile>
-      <Compile Update="API\Objects\Interactions\IApplicationCommandInteractionMetadata.cs">
-        <DependentUpon>IMessageInteractionMetadata.cs</DependentUpon>
-      </Compile>
-      <Compile Update="API\Objects\Interactions\IModalSubmitInteractionMetadata.cs">
-        <DependentUpon>IMessageInteractionMetadata.cs</DependentUpon>
-      </Compile>
       <Compile Update="API\Rest\IBulkBanResponse.cs">
         <DependentUpon>IDiscordRestGuildAPI.cs</DependentUpon>
       </Compile>

Backend/Remora.Discord.API/API/Gateway/Events/Messages/MessageCreate.cs

@@ -66,6 +66,6 @@ public record MessageCreate
     Optional<IReadOnlyList<IStickerItem>> StickerItems = default,
     Optional<int> Position = default,
     Optional<IApplicationCommandInteractionDataResolved> Resolved = default,
-    Optional<OneOf<IApplicationCommandInteractionMetadata, IMessageComponentInteractionMetadata, IModalSubmitInteractionMetadata>> InteractionMetadata = default,
+    Optional<IMessageInteractionMetadata> InteractionMetadata = default,
     Optional<IPoll> Poll = default
 ) : IMessageCreate;

Backend/Remora.Discord.API/API/Gateway/Events/Messages/MessageUpdate.cs

@@ -66,6 +66,6 @@ public record MessageUpdate
     Optional<IReadOnlyList<IStickerItem>> StickerItems = default,
     Optional<int> Position = default,
     Optional<IApplicationCommandInteractionDataResolved> Resolved = default,
-    Optional<OneOf<IApplicationCommandInteractionMetadata, IMessageComponentInteractionMetadata, IModalSubmitInteractionMetadata>> InteractionMetadata = default,
+    Optional<IMessageInteractionMetadata> InteractionMetadata = default,
     Optional<IPoll> Poll = default
 ) : IMessageUpdate;

Backend/Remora.Discord.API/API/Objects/Interactions/ApplicationCommands/ApplicationCommand.cs

@@ -49,5 +49,5 @@ public record ApplicationCommand
     Optional<bool> DMPermission = default,
     Optional<bool> IsNsfw = default,
     Optional<IReadOnlyList<ApplicationIntegrationType>> IntegrationTypes = default,
-    Optional<IReadOnlyList<InteractionContextType>> Contexts = default
+    Optional<IReadOnlyList<InteractionContextType>?> Contexts = default
 ) : IApplicationCommand;

Backend/Remora.Discord.API/API/Objects/Interactions/ApplicationIntegrationTypeConfig.cs

@@ -22,9 +22,13 @@
 
 using JetBrains.Annotations;
 using Remora.Discord.API.Abstractions.Objects;
+using Remora.Rest.Core;
 
 namespace Remora.Discord.API.Objects;
 
 /// <inheritdoc cref="IApplicationIntegrationTypeConfig"/>
 [PublicAPI]
-public record ApplicationIntegrationTypeConfig(IApplicationOAuth2InstallParams OAuth2InstallParams) : IApplicationIntegrationTypeConfig;
+public record ApplicationIntegrationTypeConfig
+(
+    Optional<IApplicationOAuth2InstallParams> OAuth2InstallParams
+) : IApplicationIntegrationTypeConfig;

Backend/Remora.Discord.API/API/Objects/Interactions/MessageComponentInteractionMetadata.cs → Backend/Remora.Discord.API/API/Objects/Interactions/MessageInteractionMetadata.cs

@@ -1,5 +1,5 @@
 //
-//  MessageComponentInteractionMetadata.cs
+//  MessageInteractionMetadata.cs
 //
 //  Author:
 //       Jarl Gullberg <[email protected]>
@@ -27,14 +27,15 @@
 
 namespace Remora.Discord.API.Objects;
 
-/// <inheritdoc cref="IMessageComponentInteractionMetadata"/>
+/// <inheritdoc cref="IMessageInteractionMetadata"/>
 [PublicAPI]
-public record MessageComponentInteractionMetadata
+public record MessageInteractionMetadata
 (
     Snowflake ID,
-    Snowflake UserID,
-    InteractionType Type,
+    IUser User,
     Optional<Snowflake> OriginalResponseMessageID,
+    Optional<Snowflake> InteractedMessageID,
+    InteractionType Type,
     IReadOnlyDictionary<ApplicationIntegrationType, Snowflake> AuthorizingIntegrationOwners,
-    Snowflake InteractedMessageID
-) : IMessageComponentInteractionMetadata;
+    Optional<IMessageInteractionMetadata> TriggeringInteractionMetadata
+) : IMessageInteractionMetadata;