feat/enhance serialization

lib/api/common/channel_properties.dart

@@ -16,7 +16,7 @@ final class ChannelProperties {
   final ChannelType type;
   final String? name;
   final String? description;
-  final Snowflake? guildId;
+  final Snowflake? serverId;
   final Snowflake? categoryId;
   final int? position;
   final bool nsfw;
@@ -48,7 +48,7 @@ final class ChannelProperties {
     required this.type,
     required this.name,
     required this.description,
-    required this.guildId,
+    required this.serverId,
     required this.categoryId,
     required this.position,
     required this.nsfw,
@@ -83,15 +83,15 @@ final class ChannelProperties {
         fn: () async => Future.wait(
               List.from(element['permission_overwrites'])
                   .map((json) async =>
-                      marshaller.serializers.channelPermissionOverwrite.serializeRemote(json))
+                      marshaller.serializers.channelPermissionOverwrite.serialize(json))
                   .toList(),
             ));
 
     final recipients = await Helper.createOrNullAsync(
         field: element['recipients'],
         fn: () async => Future.wait(
               List.from(element['recipients'])
-                  .map((json) async => marshaller.serializers.user.serializeRemote(json))
+                  .map((json) async => marshaller.serializers.user.serialize(json))
                   .toList(),
             ));
 
@@ -100,7 +100,7 @@ final class ChannelProperties {
       type: findInEnum(ChannelType.values, element['type']),
       name: element['name'],
       description: element['description'],
-      guildId: Helper.createOrNull(
+      serverId: Helper.createOrNull(
           field: element['guild_id'], fn: () => Snowflake(element['guild_id'])),
       categoryId: Helper.createOrNull(
           field: element['parent_id'], fn: () => Snowflake(element['parent_id'])),
@@ -139,15 +139,15 @@ final class ChannelProperties {
         fn: () async => Future.wait(
           List.from(element['permission_overwrites'])
               .map((json) async =>
-              marshaller.serializers.channelPermissionOverwrite.serializeRemote(json))
+              marshaller.serializers.channelPermissionOverwrite.serialize(json))
               .toList(),
         ));
 
     final recipients = await Helper.createOrNullAsync(
         field: element['recipients'],
         fn: () async => Future.wait(
           List.from(element['recipients'])
-              .map((json) async => marshaller.serializers.user.serializeRemote(json))
+              .map((json) async => marshaller.serializers.user.serialize(json))
               .toList(),
         ));
 
@@ -156,8 +156,8 @@ final class ChannelProperties {
       type: findInEnum(ChannelType.values, element['type']),
       name: element['name'],
       description: element['description'],
-      guildId: Helper.createOrNull(
-          field: element['guild_id'], fn: () => Snowflake(element['guild_id'])),
+      serverId: Helper.createOrNull(
+          field: element['server_id'], fn: () => Snowflake(element['server_id'])),
       categoryId: Helper.createOrNull(
           field: element['parent_id'], fn: () => Snowflake(element['parent_id'])),
       position: element['position'],

lib/api/common/emoji.dart

@@ -3,15 +3,13 @@ import 'package:mineral/api/common/snowflake.dart';
 import 'package:mineral/api/server/role.dart';
 
 final class Emoji extends PartialEmoji {
-  final String? globalName;
   final Map<Snowflake, Role> roles;
   final bool managed;
   final bool available;
 
   Emoji({
     required Snowflake id,
     required String name,
-    required this.globalName,
     required this.roles,
     required this.managed,
     required this.available,

lib/api/common/message_properties.dart

@@ -25,7 +25,7 @@ final class MessageProperties<T extends Channel> {
   factory MessageProperties.fromJson(T channel, Map<String, dynamic> json) {
     final embedSerializer = ioc.resolve<MarshallerContract>().serializers.embed;
     final embeds = List.from(json['embeds'])
-        .map((element) => embedSerializer.serializeRemote(element) as MessageEmbed)
+        .map((element) => embedSerializer.serialize(element) as MessageEmbed)
         .toList();
 
     return MessageProperties(

lib/api/common/polls/poll.dart

@@ -1,19 +1,22 @@
 import 'package:mineral/api/common/polls/poll_answer.dart';
 import 'package:mineral/api/common/polls/poll_layout.dart';
 import 'package:mineral/api/common/polls/poll_question.dart';
+import 'package:mineral/api/common/snowflake.dart';
 
 final class Poll {
   final PollQuestion question;
   final List<PollAnswer> answers;
   final Duration? expireAt;
   final bool isAllowMultiple;
+  final Snowflake? messageId;
   final PollLayout layout;
 
   Poll({
     required this.question,
     required this.answers,
     required this.expireAt,
     required this.isAllowMultiple,
+    this.messageId,
     this.layout = PollLayout.initial,
   });
 }

lib/api/common/sticker.dart

@@ -13,6 +13,7 @@ final class Sticker {
   final FormatType? formatType;
   final bool isAvailable;
   final int? sortValue;
+  final Snowflake? serverId;
 
   Sticker({
     required this.id,
@@ -25,5 +26,6 @@ final class Sticker {
     this.asset,
     this.formatType,
     this.sortValue,
+    this.serverId,
   });
 }

lib/api/private/private_message.dart

@@ -26,7 +26,7 @@ final class PrivateMessage implements Message<PrivateChannel> {
 
   DateTime? get updatedAt => _properties.updatedAt;
 
-  final String userId;
+  final Snowflake userId;
 
   final User author;
 

lib/api/private/user_assets.dart

@@ -1,26 +1,17 @@
 import 'package:mineral/api/common/image_asset.dart';
+import 'package:mineral/api/common/snowflake.dart';
 import 'package:mineral/infrastructure/commons/helper.dart';
 
 final class UserAssets {
+  final Snowflake userId;
   final ImageAsset? avatar;
   final ImageAsset? avatarDecoration;
   final ImageAsset? banner;
 
   UserAssets({
+    required this.userId,
     required this.avatar,
     required this.avatarDecoration,
     required this.banner,
   });
-
-  factory UserAssets.fromJson(Map<String, dynamic> json) {
-    return UserAssets(
-      avatar: Helper.createOrNull(
-          field: json['avatar'], fn: () => ImageAsset(['avatars', json['id']], json['avatar'])),
-      avatarDecoration: Helper.createOrNull(
-          field: json['avatar_decoration_data']?['sku_id'],
-          fn: () => ImageAsset(['avatar-decorations', json['id']], json['avatar_decoration_data']['sku_id'])),
-      banner: Helper.createOrNull(
-          field: json['banner'], fn: () => ImageAsset(['banners', json['id']], json['banner'])),
-    );
-  }
 }

lib/api/server/channels/server_announcement_channel.dart

@@ -34,7 +34,7 @@ final class ServerAnnouncementChannel extends ServerChannel {
   bool get isNsfw => _properties.nsfw;
 
   @override
-  Snowflake get guildId => _properties.guildId!;
+  Snowflake get serverId => _properties.serverId!;
 
   Snowflake? get categoryId => _properties.categoryId;
 

lib/api/server/channels/server_category_channel.dart

@@ -25,7 +25,7 @@ final class ServerCategoryChannel extends ServerChannel {
   List<ChannelPermissionOverwrite> get permissions => _properties.permissions!;
 
   @override
-  Snowflake get guildId => _properties.guildId!;
+  Snowflake get serverId => _properties.serverId!;
 
   ServerCategoryChannel(this._properties): _methods = ChannelMethods(_properties.id);
 

lib/api/server/channels/server_channel.dart

@@ -8,7 +8,7 @@ abstract class ServerChannel implements Channel {
   String get name;
   List<ChannelPermissionOverwrite> get permissions;
   int get position;
-  Snowflake get guildId;
+  Snowflake get serverId;
 
   @override
   T cast<T extends Channel>() => this as T;

lib/api/server/channels/server_forum_channel.dart

@@ -36,7 +36,7 @@ final class ServerForumChannel extends ServerChannel {
   late final ServerCategoryChannel? category;
 
   @override
-  Snowflake get guildId => _properties.guildId!;
+  Snowflake get serverId => _properties.serverId!;
 
   ServerForumChannel(this._properties,
       {required this.sortOrder, required this.layoutType});

lib/api/server/channels/server_stage_channel.dart

@@ -34,7 +34,7 @@ final class ServerStageChannel extends ServerChannel {
   String? get description => _properties.description;
 
   @override
-  Snowflake get guildId => _properties.guildId!;
+  Snowflake get serverId => _properties.serverId!;
 
   Snowflake? get categoryId => _properties.categoryId;
 
@@ -65,7 +65,7 @@ final class ServerStageChannel extends ServerChannel {
       _methods.setDefaultThreadRateLimitPerUser(value, reason);
 
   Future<void> send({String? content, List<MessageEmbed>? embeds, Poll? poll}) =>
-      _methods.send(guildId: _properties.guildId, content: content, embeds: embeds, poll: poll);
+      _methods.send(guildId: _properties.serverId, content: content, embeds: embeds, poll: poll);
 
   Future<void> delete({String? reason}) => _methods.delete(reason);
 }

lib/api/server/channels/server_text_channel.dart

@@ -35,7 +35,7 @@ final class ServerTextChannel extends ServerChannel {
   String? get description => _properties.description;
 
   @override
-  Snowflake get guildId => _properties.guildId!;
+  Snowflake get serverId => _properties.serverId!;
 
   Snowflake? get categoryId => _properties.categoryId;
 
@@ -71,7 +71,7 @@ final class ServerTextChannel extends ServerChannel {
           Poll? poll,
           List<MessageComponent>? components}) =>
       _methods.send(
-          guildId: _properties.guildId,
+          guildId: _properties.serverId,
           content: content,
           embeds: embeds,
           poll: poll,

lib/api/server/channels/server_voice_channel.dart

@@ -31,7 +31,7 @@ final class ServerVoiceChannel extends ServerChannel {
   List<ChannelPermissionOverwrite> get permissions => _properties.permissions!;
 
   @override
-  Snowflake get guildId => _properties.guildId!;
+  Snowflake get serverId => _properties.serverId!;
 
   Snowflake? get categoryId => _properties.categoryId;
 

lib/api/server/managers/channel_manager.dart

@@ -14,16 +14,17 @@ enum _ServerNamedChannel {
 
 final class ChannelManager {
   final Map<_ServerNamedChannel, Snowflake?> _namedChannels = {};
-  final Map<Snowflake, ServerChannel> _channels = {};
-
-  ChannelManager(Map<String, dynamic> json) {
-    _namedChannels..putIfAbsent(
-        _ServerNamedChannel.afkChannel, () => json['afk_channel_id'])..putIfAbsent(
-        _ServerNamedChannel.systemChannel, () => json['system_channel_id'])..putIfAbsent(
-        _ServerNamedChannel.rulesChannel, () => json['rules_channel_id'])..putIfAbsent(
-        _ServerNamedChannel
-            .publicUpdatesChannel, () => json['public_updates_channel_id'])..putIfAbsent(
-        _ServerNamedChannel.safetyAlertsChannel, () => json['safety_alerts_channel_id']);
+  final Map<Snowflake, ServerChannel> _channels;
+
+  ChannelManager(this._channels, Map<String, dynamic> json) {
+    _namedChannels
+      ..putIfAbsent(_ServerNamedChannel.afkChannel, () => json['afk_channel_id'])
+      ..putIfAbsent(_ServerNamedChannel.systemChannel, () => json['system_channel_id'])
+      ..putIfAbsent(_ServerNamedChannel.rulesChannel, () => json['rules_channel_id'])
+      ..putIfAbsent(
+          _ServerNamedChannel.publicUpdatesChannel, () => json['public_updates_channel_id'])
+      ..putIfAbsent(
+          _ServerNamedChannel.safetyAlertsChannel, () => json['safety_alerts_channel_id']);
   }
 
   Map<Snowflake, ServerChannel> get list => _channels;
@@ -51,4 +52,12 @@ final class ChannelManager {
 
   ServerTextChannel? get widgetChannel =>
       getOrNull<ServerTextChannel>(_namedChannels[_ServerNamedChannel.widgetChannel]);
+
+  factory ChannelManager.fromList(List<ServerChannel> channels, payload) {
+    return ChannelManager(
+        Map<Snowflake, ServerChannel>.from(channels.fold({}, (value, element) {
+          return {...value, element.id: element};
+        })),
+        payload);
+  }
 }

lib/api/server/managers/emoji_manager.dart

@@ -10,15 +10,9 @@ final class EmojiManager {
 
   Map<Snowflake, Emoji> get list => _emojis;
 
-  factory EmojiManager.fromJson(MarshallerContract marshaller,
-      {required List<Role> roles, required List<dynamic> payload}) {
-    return EmojiManager(Map<Snowflake, Emoji>.from(payload.fold({}, (value, element) {
-      final emoji = marshaller.serializers.emojis.serializeRemote({
-        'guildRoles': roles,
-        ...element,
-      }) as Emoji;
-
-      return {...value, emoji.id: emoji};
+  factory EmojiManager.fromList(List<Role> roles, List<Emoji> emojis) {
+    return EmojiManager(Map<Snowflake, Emoji>.from(emojis.fold({}, (value, element) {
+      return {...value, element.id: element};
     })));
   }
 }

lib/api/server/managers/sticker_manager.dart

@@ -9,12 +9,9 @@ final class StickerManager {
 
   Map<Snowflake, Sticker> get list => _stickers;
 
-  factory StickerManager.fromJson(MarshallerContract marshaller, List<dynamic> payload) {
-    final Map<Snowflake, Sticker> stickers = payload.fold({}, (value, element) {
-      final sticker = marshaller.serializers.sticker.serializeRemote(element) as Sticker;
-      return {...value, sticker.id: sticker};
-    });
-
-    return StickerManager(stickers);
+  factory StickerManager.fromList(List<Sticker> stickers) {
+    return StickerManager(stickers.fold({}, (acc, sticker) {
+      return {...acc, sticker.id: sticker};
+    }));
   }
 }

lib/api/server/member.dart

@@ -37,7 +37,6 @@ final class Member {
   final PremiumTier premiumType;
   final DateTime? joinedAt;
   final Permissions permissions;
-  final bool pending;
   final int? accentColor;
   final MemberFlagsManager flags;
   Presence? presence;
@@ -114,7 +113,6 @@ final class Member {
     required this.premiumType,
     required this.joinedAt,
     required this.permissions,
-    required this.pending,
     required this.accentColor,
     required this.presence,
   }) {

lib/api/server/member_assets.dart

@@ -1,26 +1,18 @@
 import 'package:mineral/api/common/image_asset.dart';
-import 'package:mineral/infrastructure/commons/helper.dart';
+import 'package:mineral/api/common/snowflake.dart';
 
 final class MemberAssets {
   final ImageAsset? avatar;
   final ImageAsset? avatarDecoration;
   final ImageAsset? banner;
+  final Snowflake memberId;
+  final Snowflake serverId;
 
   MemberAssets({
     required this.avatar,
     required this.avatarDecoration,
     required this.banner,
+    required this.memberId,
+    required this.serverId,
   });
-
-  factory MemberAssets.fromJson(Map<String, dynamic> json) {
-    return MemberAssets(
-      avatar: Helper.createOrNull(
-          field: json['avatar'], fn: () => ImageAsset(['avatars', json['id']], json['avatar'])),
-      avatarDecoration: Helper.createOrNull(
-          field: json['avatar_decoration_data']?['sku_id'],
-          fn: () => ImageAsset(['avatar-decorations', json['id']], json['avatar_decoration_data']['sku_id'])),
-      banner: Helper.createOrNull(
-          field: json['banner'], fn: () => ImageAsset(['banners', json['id']], json['banner'])),
-    );
-  }
 }