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.

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

Add user apps #641

Merged
merged 5 commits into from
Mar 20, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
15 changes: 12 additions & 3 deletions lib/nyxx.dart
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,8 @@ export 'src/models/message/attachment.dart' show Attachment, AttachmentFlags;
export 'src/models/message/author.dart' show MessageAuthor;
export 'src/models/message/channel_mention.dart' show ChannelMention;
export 'src/models/message/embed.dart' show Embed, EmbedAuthor, EmbedField, EmbedFooter, EmbedImage, EmbedProvider, EmbedThumbnail, EmbedVideo;
export 'src/models/message/message.dart' show Message, MessageFlags, PartialMessage, MessageType, MessageInteraction;
// ignore: deprecated_member_use_from_same_package
export 'src/models/message/message.dart' show Message, MessageFlags, PartialMessage, MessageType, MessageInteraction, MessageInteractionMetadata;
export 'src/models/message/reaction.dart' show Reaction, ReactionCountDetails;
export 'src/models/message/reference.dart' show MessageReference;
export 'src/models/message/role_subscription_data.dart' show RoleSubscriptionData;
Expand Down Expand Up @@ -186,7 +187,14 @@ export 'src/models/guild/welcome_screen.dart' show WelcomeScreen, WelcomeScreenC
export 'src/models/guild/scheduled_event.dart' show EntityMetadata, PartialScheduledEvent, ScheduledEvent, ScheduledEventUser, EventStatus, ScheduledEntityType;
export 'src/models/guild/audit_log.dart' show AuditLogChange, AuditLogEntry, AuditLogEntryInfo, PartialAuditLogEntry, AuditLogEvent;
export 'src/models/application.dart'
show Application, ApplicationFlags, InstallationParameters, PartialApplication, ApplicationRoleConnectionMetadata, ConnectionMetadataType;
show
Application,
ApplicationFlags,
InstallationParameters,
PartialApplication,
ApplicationRoleConnectionMetadata,
ConnectionMetadataType,
ApplicationIntegrationType;
export 'src/models/guild/template.dart' show GuildTemplate;
export 'src/models/guild/auto_moderation.dart'
show
Expand Down Expand Up @@ -299,7 +307,8 @@ export 'src/models/interaction.dart'
ApplicationCommandInteraction,
MessageComponentInteraction,
ModalSubmitInteraction,
PingInteraction;
PingInteraction,
InteractionContextType;
export 'src/models/entitlement.dart' show Entitlement, PartialEntitlement, EntitlementType;
export 'src/models/sku.dart' show Sku, SkuType, SkuFlags;
export 'src/models/oauth2.dart' show OAuth2Information;
Expand Down
13 changes: 12 additions & 1 deletion lib/src/builders/application.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ class ApplicationUpdateBuilder extends UpdateBuilder<Application> {

List<String>? tags;

Map<ApplicationIntegrationType, ApplicationIntegrationTypeConfiguration>? integrationTypesConfig;

ApplicationUpdateBuilder({
this.customInstallUrl,
this.description,
Expand All @@ -33,6 +35,7 @@ class ApplicationUpdateBuilder extends UpdateBuilder<Application> {
this.coverImage = sentinelImageBuilder,
this.interactionsEndpointUrl = sentinelUri,
this.tags,
this.integrationTypesConfig,
});

@override
Expand All @@ -43,8 +46,16 @@ class ApplicationUpdateBuilder extends UpdateBuilder<Application> {
if (installationParameters != null)
'install_params': {
'scopes': installationParameters!.scopes,
'permissions': installationParameters!.permissions.toString(),
'permissions': installationParameters!.permissions.value.toString(),
},
if (integrationTypesConfig != null)
'integration_types_config': integrationTypesConfig!.map((key, value) => MapEntry(key.value.toString(), {
if (value.oauth2InstallParameters != null)
'oauth2_install_params': {
'scopes': value.oauth2InstallParameters!.scopes,
'permissions': value.oauth2InstallParameters!.permissions.value.toString(),
},
})),
MCausc78 marked this conversation as resolved.
Show resolved Hide resolved
if (flags != null) 'flags': flags!.value,
if (!identical(icon, sentinelImageBuilder)) 'icon': icon?.buildDataString(),
if (!identical(coverImage, sentinelImageBuilder)) 'cover_image': coverImage?.buildDataString(),
Expand Down
38 changes: 38 additions & 0 deletions lib/src/builders/application_command.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import 'package:nyxx/src/builders/builder.dart';
import 'package:nyxx/src/builders/sentinels.dart';
import 'package:nyxx/src/models/application.dart';
import 'package:nyxx/src/models/channel/channel.dart';
import 'package:nyxx/src/models/commands/application_command.dart';
import 'package:nyxx/src/models/commands/application_command_option.dart';
import 'package:nyxx/src/models/interaction.dart';
import 'package:nyxx/src/models/locale.dart';
import 'package:nyxx/src/models/permissions.dart';
import 'package:nyxx/src/utils/flags.dart';
Expand All @@ -20,12 +22,19 @@ class ApplicationCommandBuilder extends CreateBuilder<ApplicationCommand> {

Flags<Permissions>? defaultMemberPermissions;

@Deprecated('Use `contexts`')
bool? hasDmPermission;

ApplicationCommandType type;

bool? isNsfw;

/// Installation context(s) where the command is available, only for globally-scoped commands. Defaults to [ApplicationIntegrationType.guildInstall].
List<ApplicationIntegrationType>? integrationTypes;

/// Interaction context(s) where the command can be used, only for globally-scoped commands. By default, all interaction context types included.
List<InteractionContextType>? contexts;

ApplicationCommandBuilder({
required this.name,
required this.type,
Expand All @@ -36,6 +45,8 @@ class ApplicationCommandBuilder extends CreateBuilder<ApplicationCommand> {
this.defaultMemberPermissions,
this.hasDmPermission,
this.isNsfw,
this.integrationTypes,
this.contexts,
});

ApplicationCommandBuilder.chatInput({
Expand All @@ -47,6 +58,8 @@ class ApplicationCommandBuilder extends CreateBuilder<ApplicationCommand> {
this.defaultMemberPermissions,
this.hasDmPermission,
this.isNsfw,
this.integrationTypes,
this.contexts,
}) : type = ApplicationCommandType.chatInput;

ApplicationCommandBuilder.message({
Expand All @@ -55,6 +68,8 @@ class ApplicationCommandBuilder extends CreateBuilder<ApplicationCommand> {
this.defaultMemberPermissions,
this.hasDmPermission,
this.isNsfw,
this.integrationTypes,
this.contexts,
}) : type = ApplicationCommandType.message,
description = null,
descriptionLocalizations = null,
Expand All @@ -66,6 +81,8 @@ class ApplicationCommandBuilder extends CreateBuilder<ApplicationCommand> {
this.defaultMemberPermissions,
this.hasDmPermission,
this.isNsfw,
this.integrationTypes,
this.contexts,
}) : type = ApplicationCommandType.user,
description = null,
descriptionLocalizations = null,
Expand All @@ -80,9 +97,12 @@ class ApplicationCommandBuilder extends CreateBuilder<ApplicationCommand> {
'description_localizations': {for (final MapEntry(:key, :value) in descriptionLocalizations!.entries) key.identifier: value},
if (options != null) 'options': options!.map((e) => e.build()).toList(),
if (defaultMemberPermissions != null) 'default_member_permissions': defaultMemberPermissions!.value.toString(),
// ignore: deprecated_member_use_from_same_package
if (hasDmPermission != null) 'dm_permission': hasDmPermission,
'type': type.value,
if (isNsfw != null) 'nsfw': isNsfw,
if (integrationTypes != null) 'integration_types': integrationTypes!.map((type) => type.value).toList(),
if (contexts != null) 'contexts': contexts!.map((type) => type.value).toList(),
};
}

Expand All @@ -99,10 +119,17 @@ class ApplicationCommandUpdateBuilder extends UpdateBuilder<ApplicationCommand>

Flags<Permissions>? defaultMemberPermissions;

@Deprecated('Use `contexts`')
bool? hasDmPermission;

bool? isNsfw;

/// Installation context(s) where the command is available, only for globally-scoped commands. Defaults to [ApplicationIntegrationType.guildInstall].
List<ApplicationIntegrationType>? integrationTypes;

/// Interaction context(s) where the command can be used, only for globally-scoped commands. By default, all interaction context types included.
List<InteractionContextType>? contexts;

ApplicationCommandUpdateBuilder({
this.name,
this.nameLocalizations = sentinelMap,
Expand All @@ -112,6 +139,8 @@ class ApplicationCommandUpdateBuilder extends UpdateBuilder<ApplicationCommand>
this.defaultMemberPermissions = sentinelFlags,
this.hasDmPermission,
this.isNsfw,
this.integrationTypes,
this.contexts,
});

ApplicationCommandUpdateBuilder.chatInput({
Expand All @@ -123,6 +152,8 @@ class ApplicationCommandUpdateBuilder extends UpdateBuilder<ApplicationCommand>
this.defaultMemberPermissions,
this.hasDmPermission,
this.isNsfw,
this.integrationTypes,
this.contexts,
});

ApplicationCommandUpdateBuilder.message({
Expand All @@ -131,6 +162,8 @@ class ApplicationCommandUpdateBuilder extends UpdateBuilder<ApplicationCommand>
this.defaultMemberPermissions,
this.hasDmPermission,
this.isNsfw,
this.integrationTypes,
this.contexts,
}) : description = null,
descriptionLocalizations = null,
options = null;
Expand All @@ -141,6 +174,8 @@ class ApplicationCommandUpdateBuilder extends UpdateBuilder<ApplicationCommand>
this.defaultMemberPermissions,
this.hasDmPermission,
this.isNsfw,
this.integrationTypes,
this.contexts,
}) : description = null,
descriptionLocalizations = null,
options = null;
Expand All @@ -154,8 +189,11 @@ class ApplicationCommandUpdateBuilder extends UpdateBuilder<ApplicationCommand>
'description_localizations': descriptionLocalizations?.map((key, value) => MapEntry(key.toString(), value)),
if (options != null) 'options': options!.map((e) => e.build()).toList(),
if (!identical(defaultMemberPermissions, sentinelFlags)) 'default_member_permissions': defaultMemberPermissions?.value.toString(),
// ignore: deprecated_member_use_from_same_package
if (hasDmPermission != null) 'dm_permission': hasDmPermission,
if (isNsfw != null) 'nsfw': isNsfw,
if (integrationTypes != null) 'integration_types': integrationTypes!.map((type) => type.value).toList(),
if (contexts != null) 'contexts': contexts!.map((type) => type.value).toList(),
};
}

Expand Down
4 changes: 4 additions & 0 deletions lib/src/http/managers/application_command_manager.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ import 'package:nyxx/src/http/managers/manager.dart';
import 'package:nyxx/src/http/request.dart';
import 'package:nyxx/src/http/response.dart';
import 'package:nyxx/src/http/route.dart';
import 'package:nyxx/src/models/application.dart';
import 'package:nyxx/src/models/channel/channel.dart';
import 'package:nyxx/src/models/commands/application_command.dart';
import 'package:nyxx/src/models/commands/application_command_option.dart';
import 'package:nyxx/src/models/commands/application_command_permissions.dart';
import 'package:nyxx/src/models/interaction.dart';
import 'package:nyxx/src/models/locale.dart';
import 'package:nyxx/src/models/permissions.dart';
import 'package:nyxx/src/models/snowflake.dart';
Expand Down Expand Up @@ -57,6 +59,8 @@ abstract class ApplicationCommandManager extends Manager<ApplicationCommand> {
defaultMemberPermissions: maybeParse(raw['default_member_permissions'], (String raw) => Permissions(int.parse(raw))),
hasDmPermission: raw['dm_permission'] as bool?,
isNsfw: raw['nsfw'] as bool?,
integrationTypes: (raw['integration_types'] as List).cast<int>().map(ApplicationIntegrationType.parse).toList(),
contexts: (raw['contexts'] as List? ?? []).cast<int>().map(InteractionContextType.parse).toList(),
abitofevrything marked this conversation as resolved.
Show resolved Hide resolved
version: Snowflake.parse(raw['version']!),
);
}
Expand Down
11 changes: 11 additions & 0 deletions lib/src/http/managers/application_manager.dart
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ class ApplicationManager {
tags: maybeParseMany(raw['tags']),
installationParameters: maybeParse(raw['install_params'], parseInstallationParameters),
customInstallUrl: maybeParse(raw['custom_install_url'], Uri.parse),
integrationTypesConfig: maybeParse(
raw['integration_types_config'],
(config) => (config as Map).cast<String, Object?>().map((key, value) =>
MapEntry(ApplicationIntegrationType.parse(int.parse(key)), parseApplicationIntegrationTypeConfiguration((value as Map).cast<String, Object>())))),
MCausc78 marked this conversation as resolved.
Show resolved Hide resolved
roleConnectionsVerificationUrl: maybeParse(raw['role_connections_verification_url'], Uri.parse),
);
}
Expand Down Expand Up @@ -95,6 +99,13 @@ class ApplicationManager {
);
}

/// Parse a [ApplicationIntegrationTypeConfiguration] from [raw].
ApplicationIntegrationTypeConfiguration parseApplicationIntegrationTypeConfiguration(Map<String, Object?> raw) {
return ApplicationIntegrationTypeConfiguration(
oauth2InstallParameters: maybeParse(raw['oauth2_install_params'], parseInstallationParameters),
);
}

/// Parse a [ApplicationRoleConnectionMetadata] from [raw].
ApplicationRoleConnectionMetadata parseApplicationRoleConnectionMetadata(Map<String, Object?> raw) {
return ApplicationRoleConnectionMetadata(
Expand Down
20 changes: 19 additions & 1 deletion lib/src/http/managers/interaction_manager.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import 'package:nyxx/src/builders/sentinels.dart';
import 'package:nyxx/src/client.dart';
import 'package:nyxx/src/http/request.dart';
import 'package:nyxx/src/http/route.dart';
import 'package:nyxx/src/models/application.dart';
import 'package:nyxx/src/models/channel/channel.dart';
import 'package:nyxx/src/models/channel/text_channel.dart';
import 'package:nyxx/src/models/commands/application_command.dart';
Expand Down Expand Up @@ -48,11 +49,18 @@ class InteractionManager {
raw['message'],
(Map<String, Object?> raw) => (client.channels[channelId!] as PartialTextChannel).messages.parse(raw, guildId: guildId),
);
final appPermissions = maybeParse(raw['app_permissions'], (String raw) => Permissions(int.parse(raw)));
final appPermissions = Permissions(int.parse(raw['app_permissions'] as String));
final locale = maybeParse(raw['locale'], Locale.parse);
final guildLocale = maybeParse(raw['guild_locale'], Locale.parse);
final entitlements = parseMany(raw['entitlements'] as List, client.applications[applicationId].entitlements.parse);

final authorizingIntegrationOwners = maybeParse(
raw['authorizing_integration_owners'],
(map) =>
(map as Map).cast<String, Object>().map((key, value) => MapEntry(ApplicationIntegrationType.parse(int.parse(key)), Snowflake.parse(value)))) ??
{};
abitofevrything marked this conversation as resolved.
Show resolved Hide resolved
final context = maybeParse(raw['context'], InteractionContextType.parse);

return switch (type) {
InteractionType.ping => PingInteraction(
manager: this,
Expand All @@ -71,6 +79,8 @@ class InteractionManager {
locale: locale,
guildLocale: guildLocale,
entitlements: entitlements,
authorizingIntegrationOwners: authorizingIntegrationOwners,
context: context,
),
InteractionType.applicationCommand => ApplicationCommandInteraction(
manager: this,
Expand All @@ -90,6 +100,8 @@ class InteractionManager {
locale: locale,
guildLocale: guildLocale,
entitlements: entitlements,
authorizingIntegrationOwners: authorizingIntegrationOwners,
context: context,
),
InteractionType.messageComponent => MessageComponentInteraction(
manager: this,
Expand All @@ -109,6 +121,8 @@ class InteractionManager {
locale: locale,
guildLocale: guildLocale,
entitlements: entitlements,
authorizingIntegrationOwners: authorizingIntegrationOwners,
context: context,
),
InteractionType.modalSubmit => ModalSubmitInteraction(
manager: this,
Expand All @@ -128,6 +142,8 @@ class InteractionManager {
locale: locale,
guildLocale: guildLocale,
entitlements: entitlements,
authorizingIntegrationOwners: authorizingIntegrationOwners,
context: context,
),
InteractionType.applicationCommandAutocomplete => ApplicationCommandAutocompleteInteraction(
manager: this,
Expand All @@ -147,6 +163,8 @@ class InteractionManager {
locale: locale,
guildLocale: guildLocale,
entitlements: entitlements,
authorizingIntegrationOwners: authorizingIntegrationOwners,
context: context,
),
} as Interaction;
}
Expand Down
20 changes: 20 additions & 0 deletions lib/src/http/managers/message_manager.dart
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ class MessageManager extends Manager<Message> {
raw['interaction'],
(Map<String, Object?> raw) => parseMessageInteraction(raw, guildId: guildId),
),
interactionMetadata: maybeParse(
raw['interaction_metadata'],
(Map<dynamic, dynamic> raw) => parseMessageInteractionMetadata(raw.cast()),
MCausc78 marked this conversation as resolved.
Show resolved Hide resolved
),
thread: maybeParse(raw['thread'], client.channels.parse) as Thread?,
components: maybeParseMany(raw['components'], parseMessageComponent),
position: raw['position'] as int?,
Expand Down Expand Up @@ -299,9 +303,11 @@ class MessageManager extends Manager<Message> {
);
}

// ignore: deprecated_member_use_from_same_package
MessageInteraction parseMessageInteraction(Map<String, Object?> raw, {Snowflake? guildId}) {
final user = client.users.parse(raw['user'] as Map<String, Object?>);

// ignore: deprecated_member_use_from_same_package
return MessageInteraction(
id: Snowflake.parse(raw['id']!),
type: InteractionType.parse(raw['type'] as int),
Expand All @@ -314,6 +320,20 @@ class MessageManager extends Manager<Message> {
);
}

MessageInteractionMetadata parseMessageInteractionMetadata(Map<String, Object?> raw) {
return MessageInteractionMetadata(
id: Snowflake.parse(raw['id']!),
type: InteractionType.parse(raw['type'] as int),
userId: Snowflake.parse(raw['user_id']!),
authorizingIntegrationOwners: (raw['authorizing_integration_owners'] as Map)
.cast<String, Object>()
.map((key, value) => MapEntry(ApplicationIntegrationType.parse(int.parse(key)), Snowflake.parse(value))),
MCausc78 marked this conversation as resolved.
Show resolved Hide resolved
originalResponseMessageId: maybeParse(raw['original_response_message_id'], Snowflake.parse),
interactedMessageId: maybeParse(raw['interacted_message_id'], Snowflake.parse),
triggeringInteractionMetadata: maybeParse(raw['triggering_interaction_metadata'], parseMessageInteractionMetadata),
);
}

@override
Future<Message> create(MessageBuilder builder) async {
final route = HttpRoute()
Expand Down
Loading
Loading