From 5fa352da4a7a2876d546b7fdaa0db9ae361cdfbe Mon Sep 17 00:00:00 2001 From: Szymon Uglis Date: Sun, 5 Mar 2023 12:58:25 +0100 Subject: [PATCH] Update to nyxx 5.0.0 --- lib/src/events/interaction_event.dart | 2 +- lib/src/internal/interaction_endpoints.dart | 2 +- lib/src/models/interaction.dart | 2 +- pubspec.yaml | 2 +- test/unit/component_builder_test.dart | 4 +++- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/src/events/interaction_event.dart b/lib/src/events/interaction_event.dart index d29c29c..fbf1e9d 100644 --- a/lib/src/events/interaction_event.dart +++ b/lib/src/events/interaction_event.dart @@ -195,7 +195,7 @@ abstract class InteractionEventWithAcknowledge extends I } on IHttpResponseError catch (response) { // 40060 - Interaction has already been acknowledged // Catch in case of a desync between server and _hasAcked - if (response.code == 40060) { + if (response.errorCode == 40060) { throw AlreadyRespondedError(); } diff --git a/lib/src/internal/interaction_endpoints.dart b/lib/src/internal/interaction_endpoints.dart index c1de37a..feb9a5d 100644 --- a/lib/src/internal/interaction_endpoints.dart +++ b/lib/src/internal/interaction_endpoints.dart @@ -498,7 +498,7 @@ class InteractionsEndpoints implements IInteractionsEndpoints { } on IHttpResponseError catch (response) { // 10066 = Unknown application command permissions // Means there are no overrides for this command... why is this an error, Discord? - if (response.code == 10066) { + if (response.errorCode == 10066) { _logger.finest('Got error code 10066 on permissions for command $commandId in guild $guildId, returning empty permission overrides.'); return SlashCommandPermissionOverrides.empty(commandId, _client); } diff --git a/lib/src/models/interaction.dart b/lib/src/models/interaction.dart index 4083c12..3c3d2bf 100644 --- a/lib/src/models/interaction.dart +++ b/lib/src/models/interaction.dart @@ -154,7 +154,7 @@ class ModalInteraction extends Interaction implements IModalInteraction { if (raw['data']["components"] != null) { components = [ for (final rawRow in raw['data']["components"]) - [for (final componentRaw in rawRow["components"]) MessageComponent.deserialize(componentRaw as RawApiMap)] + [for (final componentRaw in rawRow["components"]) MessageComponent.deserialize(componentRaw as RawApiMap, client)] ]; } else { components = []; diff --git a/pubspec.yaml b/pubspec.yaml index 15afa76..5b4c9c2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -18,5 +18,5 @@ dev_dependencies: test: ^1.19.0 mockito: ^5.0.16 build_runner: ^2.1.4 - lints: ^1.0.1 + lints: ^2.0.1 coverage: ^1.0.3 diff --git a/test/unit/component_builder_test.dart b/test/unit/component_builder_test.dart index 95902fe..382dc5a 100644 --- a/test/unit/component_builder_test.dart +++ b/test/unit/component_builder_test.dart @@ -2,6 +2,8 @@ import 'package:nyxx/nyxx.dart'; import 'package:nyxx_interactions/nyxx_interactions.dart'; import 'package:test/test.dart'; +import '../mocks/nyxx_rest.mocks.dart'; + main() { test("components", () { final customButton = ButtonBuilder("label", "customId", ButtonStyle.secondary); @@ -78,7 +80,7 @@ main() { }); test("MultiselectOptionBuilder emoji unicode", () { - final builder = MultiselectOptionBuilder("test", 'test')..emoji = IBaseGuildEmoji.fromId(Snowflake.zero()); + final builder = MultiselectOptionBuilder("test", 'test')..emoji = IBaseGuildEmoji.fromId(Snowflake.zero(), NyxxRestMock()); final expectedResult = { 'label': 'test',