Merge pull request #292 from nyxx-discord/dev

Release 3.2.4
nyxx-discord · Jan 23, 2022 · ee17a86 · ee17a86
2 parents 4f741e6 + f05ee71
commit ee17a86
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 3.2.4
+__23.01.2022__
+
+- bugfix: Properly serialize member edit payload. Fixes #291
+- bugfix: Improve shard searching mechanism. Fixes #290
+- bugfix: Fix message deserialization bug with roleMentions. Fixes #289
+
 ## 3.2.3
 __10.01.2022__
 

diff --git a/lib/src/core/guild/guild.dart b/lib/src/core/guild/guild.dart
@@ -476,9 +476,12 @@ class Guild extends SnowflakeEntity implements IGuild {
       throw UnsupportedError("Cannot use this property with NyxxRest");
     }
 
+    final shardId = (id.id >> 22) % (client as NyxxWebsocket).shardManager.shards.length;
+
     return (client as NyxxWebsocket).shardManager.shards.firstWhere(
-          (_shard) => _shard.guilds.contains(id),
-          orElse: throw InvalidShardException('Cannot find shard for this guild!'),
+          (element) => element.id == shardId,
+          orElse: () =>
+              throw InvalidShardException('Cannot find shard for this guild! Calculated shard id for this guild is: $shardId but no such shard exist'),
         );
   }
 

diff --git a/lib/src/core/message/message.dart b/lib/src/core/message/message.dart
@@ -361,7 +361,7 @@ class Message extends SnowflakeEntity implements IMessage {
     }
 
     roleMentions = [
-      if (raw["mention_roles"] != null)
+      if (raw["mention_roles"] != null && guild != null)
         for (var roleId in raw["mention_roles"]) RoleCacheable(client, Snowflake(roleId), guild!)
     ];
   }

diff --git a/lib/src/internal/constants.dart b/lib/src/internal/constants.dart
@@ -33,7 +33,7 @@ class Constants {
   static const int apiVersion = 9;
 
   /// Version of Nyxx
-  static const String version = "3.2.3";
+  static const String version = "3.2.4";
 
   /// Url to Nyxx repo
   static const String repoUrl = "https://github.com/nyxx-discord/nyxx";

diff --git a/lib/src/internal/http_endpoints.dart b/lib/src/internal/http_endpoints.dart
@@ -865,7 +865,7 @@ class HttpEndpoints implements IHttpEndpoints {
       ..deaf = deaf
       ..channel = channel;
 
-    return executeSafe(BasicRequest("/guilds/$guildId/members/$memberId", method: "PATCH", auditLog: auditReason, body: finalBuilder));
+    return executeSafe(BasicRequest("/guilds/$guildId/members/$memberId", method: "PATCH", auditLog: auditReason, body: finalBuilder.build()));
   }
 
   @override

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: nyxx
-version: 3.2.3
+version: 3.2.4
 description: A Discord library for Dart. Simple, robust framework for creating discord bots for Dart language.
 homepage: https://github.com/nyxx-discord/nyxx
 repository: https://github.com/nyxx-discord/nyxx