🐛 Fix file upload

[Feature] add pool-aware file upload with default pool selection

android/app/build.gradle.kts

@@ -24,6 +24,8 @@ android {
     ndkVersion = "29.0.13113456"
 
     compileOptions {
+        isCoreLibraryDesugaringEnabled = true
+
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
@@ -63,6 +65,8 @@ android {
 }
 
 dependencies {
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
+    
     implementation("com.google.android.material:material:1.12.0")
     implementation("com.github.bumptech.glide:glide:4.16.0")
     implementation("com.squareup.okhttp3:okhttp:5.1.0")

assets/i18n/en-US.json

@@ -30,6 +30,8 @@
   "fieldEmailAddressMustBeValid": "The email address must be valid.",
   "logout": "Logout",
   "updateYourProfile": "Profile Settings",
+  "settingsDefaultPool": "Default file pool",
+  "settingsDefaultPoolHelper": "Select the default storage pool for file uploads",
   "accountBasicInfo": "Basic Info",
   "accountProfile": "Your Profile",
   "saveChanges": "Save Changes",
@@ -133,6 +135,25 @@
     "other": "{} replies"
   },
   "forward": "Forward",
+  "award": "Award",
+  "awardPost": "Award Post",
+  "awardMessage": "Message",
+  "awardMessageHint": "Enter your award message...",
+  "awardAttitude": "Attitude",
+  "awardAttitudePositive": "Positive",
+  "awardAttitudeNegative": "Negative",
+  "awardAmount": "Amount",
+  "awardAmountHint": "Enter amount...",
+  "awardAmountRequired": "Amount is required",
+  "awardAmountInvalid": "Please enter a valid amount",
+  "awardMessageTooLong": "Message is too long (max 4096 characters)",
+  "awardSuccess": "Award sent successfully!",
+  "awardSubmit": "Award",
+  "awardPostPreview": "Post Preview",
+  "awardNoContent": "No content available",
+  "awardByPublisher": "By {}",
+  "awardBenefits": "Award Benefits",
+  "awardBenefitsDescription": "Awarding this post increases its value and visibility. Higher valued posts have a better chance of being featured and highlighted in the community.",
   "repliedTo": "Replied to",
   "forwarded": "Forwarded",
   "hasAttachments": {
@@ -149,6 +170,7 @@
   "addPhoto": "Add photo",
   "addAudio": "Add audio",
   "addFile": "Add file",
+  "uploadFile": "Upload File",
   "recordAudio": "Record Audio",
   "linkAttachment": "Link Attachment",
   "fileIdCannotBeEmpty": "File ID cannot be empty",
@@ -428,6 +450,8 @@
   "lastActiveAt": "Last active at {}",
   "authDeviceLogout": "Logout",
   "authDeviceLogoutHint": "Are you sure you want to logout this device? This will also disable the push notification to this device.",
+  "authDeviceChallenges": "Device Usage",
+  "authDeviceHint": "Swipe left to edit label, swipe right to logout device.",
   "typingHint": {
     "one": "{} is typing...",
     "other": "{} are typing..."
@@ -452,6 +476,8 @@
   "close": "Close",
   "drafts": "Drafts",
   "noDrafts": "No drafts yet",
+  "searchDrafts": "Search drafts...",
+  "noSearchResults": "No search results",
   "articleDrafts": "Article drafts",
   "postDrafts": "Post drafts",
   "saveDraft": "Save draft",
@@ -498,6 +524,10 @@
   "contactMethodSetPrimary": "Set as Primary",
   "contactMethodSetPrimaryHint": "Set this contact method as your primary contact method for account recovery and notifications",
   "contactMethodDeleteHint": "Are you sure to delete this contact method? This action cannot be undone.",
+  "contactMethodMakePublic": "Make Public",
+  "contactMethodMakePrivate": "Make Private",
+  "contactMethodPublic": "Public",
+  "contactMethodPrivate": "Private",
   "chatNotifyLevel": "Notify Level",
   "chatNotifyLevelDescription": "Decide how many notifications you will receive.",
   "chatNotifyLevelAll": "All",
@@ -977,5 +1007,19 @@
   "pinned": "Pinned",
   "noResultsFound": "No results found",
   "toggleFilters": "Toggle filters",
-  "notableDayNext": "{} is in"
+  "notableDayNext": "{} is in",
+  "expandPoll": "Expand Poll",
+  "collapsePoll": "Collapse Poll",
+  "embedView": "Embed View",
+  "embedUri": "Embed URI",
+  "aspectRatio": "Aspect Ratio",
+  "renderer": "Renderer",
+  "addEmbed": "Add Embed",
+  "editEmbed": "Edit Embed",
+  "deleteEmbed": "Delete Embed",
+  "deleteEmbedConfirm": "Are you sure you want to delete this embed?",
+  "currentEmbed": "Current Embed",
+  "noEmbed": "No embed yet",
+  "save": "Save",
+  "webView": "Web View"
 }

assets/i18n/zh-CN.json

@@ -122,6 +122,9 @@
   "addVideo": "添加视频",
   "addPhoto": "添加照片",
   "addFile": "添加文件",
+  "uploadFile": "上传文件",
+  "settingsDefaultPool": "选择文件池",
+  "settingsDefaultPoolHelper": "为文件上传选择一个默认池",
   "createDirectMessage": "创建新私人消息",
   "gotoDirectMessage": "前往私信",
   "react": "反应",

assets/i18n/zh-TW.json

@@ -122,6 +122,10 @@
     "addVideo": "添加視頻",
     "addPhoto": "添加照片",
     "addFile": "添加文件",
+    "uploadFile": "上傳文件",
+    "settingsDefaultPool": "選擇文件池",
+    "settingsDefaultPoolHelper": "爲文件上傳選擇一個默認池",
+ 
     "createDirectMessage": "創建新私人消息",
     "gotoDirectMessage": "前往私信",
     "react": "反應",

ios/Podfile.lock

@@ -149,9 +149,9 @@ PODS:
   - flutter_udid (0.0.1):
     - Flutter
     - SAMKeychain
-  - flutter_webrtc (1.1.0):
+  - flutter_webrtc (1.2.0):
     - Flutter
-    - WebRTC-SDK (= 137.7151.03)
+    - WebRTC-SDK (= 137.7151.04)
   - gal (1.0.0):
     - Flutter
     - FlutterMacOS
@@ -219,7 +219,7 @@ PODS:
   - livekit_client (2.5.0):
     - Flutter
     - flutter_webrtc
-    - WebRTC-SDK (= 137.7151.03)
+    - WebRTC-SDK (= 137.7151.04)
   - local_auth_darwin (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -299,7 +299,7 @@ PODS:
     - Flutter
   - wakelock_plus (0.0.1):
     - Flutter
-  - WebRTC-SDK (137.7151.03)
+  - WebRTC-SDK (137.7151.04)
 
 DEPENDENCIES:
   - Alamofire
@@ -499,7 +499,7 @@ SPEC CHECKSUMS:
   flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
   flutter_timezone: 7c838e17ffd4645d261e87037e5bebf6d38fe544
   flutter_udid: f7c3884e6ec2951efe4f9de082257fc77c4d15e9
-  flutter_webrtc: b0b2e04411747142962164a1cfa43a1af9a0afac
+  flutter_webrtc: c3e21fc0dcd9d8eb246ae4d5256fcbeb2f5ecd22
   gal: baecd024ebfd13c441269ca7404792a7152fde89
   GoogleAdsOnDeviceConversion: 9090c435cde08903e8dd1ba2c77fbec9e46d9afe
   GoogleAppMeasurement: 09f341dfa8527d1612a09cbfe809a242c0b737af
@@ -508,8 +508,8 @@ SPEC CHECKSUMS:
   image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
   irondash_engine_context: 8e58ca8e0212ee9d1c7dc6a42121849986c88486
   Kingfisher: ff0d31a1f07bdff6a1ebb3ba08b8e6e567b6500c
-  livekit_client: f810c81bbbc229a84f60b09e66603ac4e93f7599
-  local_auth_darwin: d2e8c53ef0c4f43c646462e3415432c4dab3ae19
+  livekit_client: a6f5fa86ac28ccd7ded53626a5379961db311ab4
+  local_auth_darwin: c3ee6cce0a8d56be34c8ccb66ba31f7f180aaebb
   media_kit_libs_ios_video: 5a18affdb97d1f5d466dc79988b13eff6c5e2854
   media_kit_video: 1746e198cb697d1ffb734b1d05ec429d1fcd1474
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
@@ -536,7 +536,7 @@ SPEC CHECKSUMS:
   url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
   volume_controller: 3657a1f65bedb98fa41ff7dc5793537919f31b12
   wakelock_plus: e29112ab3ef0b318e58cfa5c32326458be66b556
-  WebRTC-SDK: 69d4e56b0b4b27d788e87bab9b9a1326ed05b1e3
+  WebRTC-SDK: 40d4f5ba05cadff14e4db5614aec402a633f007e
 
 PODFILE CHECKSUM: c818292390b02fa379036ea099713a332bd7193f
 

ios/Runner.xcodeproj/project.pbxproj

@@ -566,7 +566,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n";
 		};
 		4815E0A19398E51078F4160D /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -883,6 +883,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.solian;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_ENABLE_EXPLICIT_MODULES = "$(SWIFT_USE_INTEGRATED_DRIVER)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -1096,6 +1097,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_ENABLE_EXPLICIT_MODULES = NO;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1137,6 +1139,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_ENABLE_EXPLICIT_MODULES = NO;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -1177,6 +1180,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_ENABLE_EXPLICIT_MODULES = NO;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -1434,6 +1438,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.solian;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_ENABLE_EXPLICIT_MODULES = "$(SWIFT_USE_INTEGRATED_DRIVER)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -1462,6 +1467,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.solian;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_ENABLE_EXPLICIT_MODULES = "$(SWIFT_USE_INTEGRATED_DRIVER)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";

lib/database/draft.dart

@@ -2,8 +2,15 @@ import 'package:drift/drift.dart';
 
 class PostDrafts extends Table {
   TextColumn get id => text()();
-  TextColumn get post => text()(); // Store SnPost model as JSON string
+  // Searchable fields stored separately for performance
+  TextColumn get title => text().nullable()();
+  TextColumn get description => text().nullable()();
+  TextColumn get content => text().nullable()();
+  IntColumn get visibility => integer().withDefault(const Constant(0))();
+  IntColumn get type => integer().withDefault(const Constant(0))();
   DateTimeColumn get lastModified => dateTime()();
+  // Full post data stored as JSON for complete restoration
+  TextColumn get postData => text()();
 
   @override
   Set<Column> get primaryKey => {id};

lib/database/drift_db.dart

@@ -12,7 +12,7 @@ class AppDatabase extends _$AppDatabase {
   AppDatabase(super.e);
 
   @override
-  int get schemaVersion => 4;
+  int get schemaVersion => 6;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
@@ -28,9 +28,67 @@ class AppDatabase extends _$AppDatabase {
         // Drop old draft tables if they exist
         await m.createTable(postDrafts);
       }
+      if (from < 6) {
+        // Migrate from old schema to new schema with separate searchable fields
+        await _migrateToVersion6(m);
+      }
     },
   );
 
+  Future<void> _migrateToVersion6(Migrator m) async {
+    // Rename existing table to old if it exists
+    try {
+      await customStatement(
+        'ALTER TABLE post_drafts RENAME TO post_drafts_old',
+      );
+    } catch (e) {
+      // Table might not exist
+    }
+
+    // Drop the table
+    await customStatement('DROP TABLE IF EXISTS post_drafts');
+
+    // Create new table
+    await m.createTable(postDrafts);
+
+    // Migrate existing data if any
+    try {
+      final oldDrafts =
+          await customSelect(
+            'SELECT id, post, lastModified FROM post_drafts_old',
+            readsFrom: {postDrafts},
+          ).get();
+
+      for (final row in oldDrafts) {
+        final postJson = row.read<String>('post');
+        final id = row.read<String>('id');
+        final lastModified = row.read<DateTime>('lastModified');
+
+        if (postJson.isNotEmpty) {
+          final post = SnPost.fromJson(jsonDecode(postJson));
+          await into(postDrafts).insert(
+            PostDraftsCompanion(
+              id: Value(id),
+              title: Value(post.title),
+              description: Value(post.description),
+              content: Value(post.content),
+              visibility: Value(post.visibility),
+              type: Value(post.type),
+              lastModified: Value(lastModified),
+              postData: Value(postJson),
+            ),
+          );
+        }
+      }
+
+      // Drop old table
+      await customStatement('DROP TABLE IF EXISTS post_drafts_old');
+    } catch (e) {
+      // If migration fails, just recreate the table
+      await m.createTable(postDrafts);
+    }
+  }
+
   // Methods for chat messages
   Future<List<ChatMessage>> getMessagesForRoom(
     String roomId, {
@@ -69,7 +127,9 @@ class AppDatabase extends _$AppDatabase {
   }
 
   Future<int> getTotalMessagesForRoom(String roomId) {
-    return (select(chatMessages)..where((m) => m.roomId.equals(roomId))).get().then((list) => list.length);
+    return (select(
+      chatMessages,
+    )..where((m) => m.roomId.equals(roomId))).get().then((list) => list.length);
   }
 
   Future<List<LocalChatMessage>> searchMessages(
@@ -85,10 +145,6 @@ class AppDatabase extends _$AppDatabase {
             ..where((m) => m.content.like('%${query.toLowerCase()}%'));
     }
 
-    
-
-    
-
     final messages =
         await (selectStatement
               ..orderBy([(m) => OrderingTerm.desc(m.createdAt)]))
@@ -129,10 +185,31 @@ class AppDatabase extends _$AppDatabase {
   Future<List<SnPost>> getAllPostDrafts() async {
     final drafts = await select(postDrafts).get();
     return drafts
-        .map((draft) => SnPost.fromJson(jsonDecode(draft.post)))
+        .map((draft) => SnPost.fromJson(jsonDecode(draft.postData)))
         .toList();
   }
 
+  Future<List<PostDraft>> getAllPostDraftRecords() async {
+    return await select(postDrafts).get();
+  }
+
+  Future<List<PostDraft>> searchPostDrafts(String query) async {
+    if (query.isEmpty) {
+      return await select(postDrafts).get();
+    }
+
+    final searchTerm = '%${query.toLowerCase()}%';
+    return await (select(postDrafts)
+          ..where(
+            (draft) =>
+                draft.title.like(searchTerm) |
+                draft.description.like(searchTerm) |
+                draft.content.like(searchTerm),
+          )
+          ..orderBy([(draft) => OrderingTerm.desc(draft.lastModified)]))
+        .get();
+  }
+
   Future<void> addPostDraft(PostDraftsCompanion entry) async {
     await into(postDrafts).insert(entry, mode: InsertMode.replace);
   }
@@ -144,4 +221,9 @@ class AppDatabase extends _$AppDatabase {
   Future<void> clearAllPostDrafts() async {
     await delete(postDrafts).go();
   }
+
+  Future<PostDraft?> getPostDraftById(String id) async {
+    return await (select(postDrafts)
+      ..where((tbl) => tbl.id.equals(id))).getSingleOrNull();
+  }
 }

lib/database/drift_db.g.dart

@@ -584,14 +584,58 @@ class $PostDraftsTable extends PostDrafts
     type: DriftSqlType.string,
     requiredDuringInsert: true,
   );
-  static const VerificationMeta _postMeta = const VerificationMeta('post');
+  static const VerificationMeta _titleMeta = const VerificationMeta('title');
   @override
-  late final GeneratedColumn<String> post = GeneratedColumn<String>(
-    'post',
+  late final GeneratedColumn<String> title = GeneratedColumn<String>(
+    'title',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  static const VerificationMeta _descriptionMeta = const VerificationMeta(
+    'description',
+  );
+  @override
+  late final GeneratedColumn<String> description = GeneratedColumn<String>(
+    'description',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  static const VerificationMeta _contentMeta = const VerificationMeta(
+    'content',
+  );
+  @override
+  late final GeneratedColumn<String> content = GeneratedColumn<String>(
+    'content',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  static const VerificationMeta _visibilityMeta = const VerificationMeta(
+    'visibility',
+  );
+  @override
+  late final GeneratedColumn<int> visibility = GeneratedColumn<int>(
+    'visibility',
     aliasedName,
     false,
-    type: DriftSqlType.string,
-    requiredDuringInsert: true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    defaultValue: const Constant(0),
+  );
+  static const VerificationMeta _typeMeta = const VerificationMeta('type');
+  @override
+  late final GeneratedColumn<int> type = GeneratedColumn<int>(
+    'type',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    defaultValue: const Constant(0),
   );
   static const VerificationMeta _lastModifiedMeta = const VerificationMeta(
     'lastModified',
@@ -604,8 +648,28 @@ class $PostDraftsTable extends PostDrafts
     type: DriftSqlType.dateTime,
     requiredDuringInsert: true,
   );
+  static const VerificationMeta _postDataMeta = const VerificationMeta(
+    'postData',
+  );
   @override
-  List<GeneratedColumn> get $columns => [id, post, lastModified];
+  late final GeneratedColumn<String> postData = GeneratedColumn<String>(
+    'post_data',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    id,
+    title,
+    description,
+    content,
+    visibility,
+    type,
+    lastModified,
+    postData,
+  ];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -623,13 +687,38 @@ class $PostDraftsTable extends PostDrafts
     } else if (isInserting) {
       context.missing(_idMeta);
     }
-    if (data.containsKey('post')) {
+    if (data.containsKey('title')) {
       context.handle(
-        _postMeta,
-        post.isAcceptableOrUnknown(data['post']!, _postMeta),
+        _titleMeta,
+        title.isAcceptableOrUnknown(data['title']!, _titleMeta),
+      );
+    }
+    if (data.containsKey('description')) {
+      context.handle(
+        _descriptionMeta,
+        description.isAcceptableOrUnknown(
+          data['description']!,
+          _descriptionMeta,
+        ),
+      );
+    }
+    if (data.containsKey('content')) {
+      context.handle(
+        _contentMeta,
+        content.isAcceptableOrUnknown(data['content']!, _contentMeta),
+      );
+    }
+    if (data.containsKey('visibility')) {
+      context.handle(
+        _visibilityMeta,
+        visibility.isAcceptableOrUnknown(data['visibility']!, _visibilityMeta),
+      );
+    }
+    if (data.containsKey('type')) {
+      context.handle(
+        _typeMeta,
+        type.isAcceptableOrUnknown(data['type']!, _typeMeta),
       );
-    } else if (isInserting) {
-      context.missing(_postMeta);
     }
     if (data.containsKey('last_modified')) {
       context.handle(
@@ -642,6 +731,14 @@ class $PostDraftsTable extends PostDrafts
     } else if (isInserting) {
       context.missing(_lastModifiedMeta);
     }
+    if (data.containsKey('post_data')) {
+      context.handle(
+        _postDataMeta,
+        postData.isAcceptableOrUnknown(data['post_data']!, _postDataMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_postDataMeta);
+    }
     return context;
   }
 
@@ -656,16 +753,38 @@ class $PostDraftsTable extends PostDrafts
             DriftSqlType.string,
             data['${effectivePrefix}id'],
           )!,
-      post:
+      title: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}title'],
+      ),
+      description: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}description'],
+      ),
+      content: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}content'],
+      ),
+      visibility:
           attachedDatabase.typeMapping.read(
-            DriftSqlType.string,
-            data['${effectivePrefix}post'],
+            DriftSqlType.int,
+            data['${effectivePrefix}visibility'],
+          )!,
+      type:
+          attachedDatabase.typeMapping.read(
+            DriftSqlType.int,
+            data['${effectivePrefix}type'],
           )!,
       lastModified:
           attachedDatabase.typeMapping.read(
             DriftSqlType.dateTime,
             data['${effectivePrefix}last_modified'],
           )!,
+      postData:
+          attachedDatabase.typeMapping.read(
+            DriftSqlType.string,
+            data['${effectivePrefix}post_data'],
+          )!,
     );
   }
 
@@ -677,27 +796,60 @@ class $PostDraftsTable extends PostDrafts
 
 class PostDraft extends DataClass implements Insertable<PostDraft> {
   final String id;
-  final String post;
+  final String? title;
+  final String? description;
+  final String? content;
+  final int visibility;
+  final int type;
   final DateTime lastModified;
+  final String postData;
   const PostDraft({
     required this.id,
-    required this.post,
+    this.title,
+    this.description,
+    this.content,
+    required this.visibility,
+    required this.type,
     required this.lastModified,
+    required this.postData,
   });
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['id'] = Variable<String>(id);
-    map['post'] = Variable<String>(post);
+    if (!nullToAbsent || title != null) {
+      map['title'] = Variable<String>(title);
+    }
+    if (!nullToAbsent || description != null) {
+      map['description'] = Variable<String>(description);
+    }
+    if (!nullToAbsent || content != null) {
+      map['content'] = Variable<String>(content);
+    }
+    map['visibility'] = Variable<int>(visibility);
+    map['type'] = Variable<int>(type);
     map['last_modified'] = Variable<DateTime>(lastModified);
+    map['post_data'] = Variable<String>(postData);
     return map;
   }
 
   PostDraftsCompanion toCompanion(bool nullToAbsent) {
     return PostDraftsCompanion(
       id: Value(id),
-      post: Value(post),
+      title:
+          title == null && nullToAbsent ? const Value.absent() : Value(title),
+      description:
+          description == null && nullToAbsent
+              ? const Value.absent()
+              : Value(description),
+      content:
+          content == null && nullToAbsent
+              ? const Value.absent()
+              : Value(content),
+      visibility: Value(visibility),
+      type: Value(type),
       lastModified: Value(lastModified),
+      postData: Value(postData),
     );
   }
 
@@ -708,8 +860,13 @@ class PostDraft extends DataClass implements Insertable<PostDraft> {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return PostDraft(
       id: serializer.fromJson<String>(json['id']),
-      post: serializer.fromJson<String>(json['post']),
+      title: serializer.fromJson<String?>(json['title']),
+      description: serializer.fromJson<String?>(json['description']),
+      content: serializer.fromJson<String?>(json['content']),
+      visibility: serializer.fromJson<int>(json['visibility']),
+      type: serializer.fromJson<int>(json['type']),
       lastModified: serializer.fromJson<DateTime>(json['lastModified']),
+      postData: serializer.fromJson<String>(json['postData']),
     );
   }
   @override
@@ -717,25 +874,50 @@ class PostDraft extends DataClass implements Insertable<PostDraft> {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'id': serializer.toJson<String>(id),
-      'post': serializer.toJson<String>(post),
+      'title': serializer.toJson<String?>(title),
+      'description': serializer.toJson<String?>(description),
+      'content': serializer.toJson<String?>(content),
+      'visibility': serializer.toJson<int>(visibility),
+      'type': serializer.toJson<int>(type),
       'lastModified': serializer.toJson<DateTime>(lastModified),
+      'postData': serializer.toJson<String>(postData),
     };
   }
 
-  PostDraft copyWith({String? id, String? post, DateTime? lastModified}) =>
-      PostDraft(
-        id: id ?? this.id,
-        post: post ?? this.post,
-        lastModified: lastModified ?? this.lastModified,
-      );
+  PostDraft copyWith({
+    String? id,
+    Value<String?> title = const Value.absent(),
+    Value<String?> description = const Value.absent(),
+    Value<String?> content = const Value.absent(),
+    int? visibility,
+    int? type,
+    DateTime? lastModified,
+    String? postData,
+  }) => PostDraft(
+    id: id ?? this.id,
+    title: title.present ? title.value : this.title,
+    description: description.present ? description.value : this.description,
+    content: content.present ? content.value : this.content,
+    visibility: visibility ?? this.visibility,
+    type: type ?? this.type,
+    lastModified: lastModified ?? this.lastModified,
+    postData: postData ?? this.postData,
+  );
   PostDraft copyWithCompanion(PostDraftsCompanion data) {
     return PostDraft(
       id: data.id.present ? data.id.value : this.id,
-      post: data.post.present ? data.post.value : this.post,
+      title: data.title.present ? data.title.value : this.title,
+      description:
+          data.description.present ? data.description.value : this.description,
+      content: data.content.present ? data.content.value : this.content,
+      visibility:
+          data.visibility.present ? data.visibility.value : this.visibility,
+      type: data.type.present ? data.type.value : this.type,
       lastModified:
           data.lastModified.present
               ? data.lastModified.value
               : this.lastModified,
+      postData: data.postData.present ? data.postData.value : this.postData,
     );
   }
 
@@ -743,66 +925,120 @@ class PostDraft extends DataClass implements Insertable<PostDraft> {
   String toString() {
     return (StringBuffer('PostDraft(')
           ..write('id: $id, ')
-          ..write('post: $post, ')
-          ..write('lastModified: $lastModified')
+          ..write('title: $title, ')
+          ..write('description: $description, ')
+          ..write('content: $content, ')
+          ..write('visibility: $visibility, ')
+          ..write('type: $type, ')
+          ..write('lastModified: $lastModified, ')
+          ..write('postData: $postData')
           ..write(')'))
         .toString();
   }
 
   @override
-  int get hashCode => Object.hash(id, post, lastModified);
+  int get hashCode => Object.hash(
+    id,
+    title,
+    description,
+    content,
+    visibility,
+    type,
+    lastModified,
+    postData,
+  );
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
       (other is PostDraft &&
           other.id == this.id &&
-          other.post == this.post &&
-          other.lastModified == this.lastModified);
+          other.title == this.title &&
+          other.description == this.description &&
+          other.content == this.content &&
+          other.visibility == this.visibility &&
+          other.type == this.type &&
+          other.lastModified == this.lastModified &&
+          other.postData == this.postData);
 }
 
 class PostDraftsCompanion extends UpdateCompanion<PostDraft> {
   final Value<String> id;
-  final Value<String> post;
+  final Value<String?> title;
+  final Value<String?> description;
+  final Value<String?> content;
+  final Value<int> visibility;
+  final Value<int> type;
   final Value<DateTime> lastModified;
+  final Value<String> postData;
   final Value<int> rowid;
   const PostDraftsCompanion({
     this.id = const Value.absent(),
-    this.post = const Value.absent(),
+    this.title = const Value.absent(),
+    this.description = const Value.absent(),
+    this.content = const Value.absent(),
+    this.visibility = const Value.absent(),
+    this.type = const Value.absent(),
     this.lastModified = const Value.absent(),
+    this.postData = const Value.absent(),
     this.rowid = const Value.absent(),
   });
   PostDraftsCompanion.insert({
     required String id,
-    required String post,
+    this.title = const Value.absent(),
+    this.description = const Value.absent(),
+    this.content = const Value.absent(),
+    this.visibility = const Value.absent(),
+    this.type = const Value.absent(),
     required DateTime lastModified,
+    required String postData,
     this.rowid = const Value.absent(),
   }) : id = Value(id),
-       post = Value(post),
-       lastModified = Value(lastModified);
+       lastModified = Value(lastModified),
+       postData = Value(postData);
   static Insertable<PostDraft> custom({
     Expression<String>? id,
-    Expression<String>? post,
+    Expression<String>? title,
+    Expression<String>? description,
+    Expression<String>? content,
+    Expression<int>? visibility,
+    Expression<int>? type,
     Expression<DateTime>? lastModified,
+    Expression<String>? postData,
     Expression<int>? rowid,
   }) {
     return RawValuesInsertable({
       if (id != null) 'id': id,
-      if (post != null) 'post': post,
+      if (title != null) 'title': title,
+      if (description != null) 'description': description,
+      if (content != null) 'content': content,
+      if (visibility != null) 'visibility': visibility,
+      if (type != null) 'type': type,
       if (lastModified != null) 'last_modified': lastModified,
+      if (postData != null) 'post_data': postData,
       if (rowid != null) 'rowid': rowid,
     });
   }
 
   PostDraftsCompanion copyWith({
     Value<String>? id,
-    Value<String>? post,
+    Value<String?>? title,
+    Value<String?>? description,
+    Value<String?>? content,
+    Value<int>? visibility,
+    Value<int>? type,
     Value<DateTime>? lastModified,
+    Value<String>? postData,
     Value<int>? rowid,
   }) {
     return PostDraftsCompanion(
       id: id ?? this.id,
-      post: post ?? this.post,
+      title: title ?? this.title,
+      description: description ?? this.description,
+      content: content ?? this.content,
+      visibility: visibility ?? this.visibility,
+      type: type ?? this.type,
       lastModified: lastModified ?? this.lastModified,
+      postData: postData ?? this.postData,
       rowid: rowid ?? this.rowid,
     );
   }
@@ -813,12 +1049,27 @@ class PostDraftsCompanion extends UpdateCompanion<PostDraft> {
     if (id.present) {
       map['id'] = Variable<String>(id.value);
     }
-    if (post.present) {
-      map['post'] = Variable<String>(post.value);
+    if (title.present) {
+      map['title'] = Variable<String>(title.value);
+    }
+    if (description.present) {
+      map['description'] = Variable<String>(description.value);
+    }
+    if (content.present) {
+      map['content'] = Variable<String>(content.value);
+    }
+    if (visibility.present) {
+      map['visibility'] = Variable<int>(visibility.value);
+    }
+    if (type.present) {
+      map['type'] = Variable<int>(type.value);
     }
     if (lastModified.present) {
       map['last_modified'] = Variable<DateTime>(lastModified.value);
     }
+    if (postData.present) {
+      map['post_data'] = Variable<String>(postData.value);
+    }
     if (rowid.present) {
       map['rowid'] = Variable<int>(rowid.value);
     }
@@ -829,8 +1080,13 @@ class PostDraftsCompanion extends UpdateCompanion<PostDraft> {
   String toString() {
     return (StringBuffer('PostDraftsCompanion(')
           ..write('id: $id, ')
-          ..write('post: $post, ')
+          ..write('title: $title, ')
+          ..write('description: $description, ')
+          ..write('content: $content, ')
+          ..write('visibility: $visibility, ')
+          ..write('type: $type, ')
           ..write('lastModified: $lastModified, ')
+          ..write('postData: $postData, ')
           ..write('rowid: $rowid')
           ..write(')'))
         .toString();
@@ -1140,15 +1396,25 @@ typedef $$ChatMessagesTableProcessedTableManager =
 typedef $$PostDraftsTableCreateCompanionBuilder =
     PostDraftsCompanion Function({
       required String id,
-      required String post,
+      Value<String?> title,
+      Value<String?> description,
+      Value<String?> content,
+      Value<int> visibility,
+      Value<int> type,
       required DateTime lastModified,
+      required String postData,
       Value<int> rowid,
     });
 typedef $$PostDraftsTableUpdateCompanionBuilder =
     PostDraftsCompanion Function({
       Value<String> id,
-      Value<String> post,
+      Value<String?> title,
+      Value<String?> description,
+      Value<String?> content,
+      Value<int> visibility,
+      Value<int> type,
       Value<DateTime> lastModified,
+      Value<String> postData,
       Value<int> rowid,
     });
 
@@ -1166,8 +1432,28 @@ class $$PostDraftsTableFilterComposer
     builder: (column) => ColumnFilters(column),
   );
 
-  ColumnFilters<String> get post => $composableBuilder(
-    column: $table.post,
+  ColumnFilters<String> get title => $composableBuilder(
+    column: $table.title,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<String> get description => $composableBuilder(
+    column: $table.description,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<String> get content => $composableBuilder(
+    column: $table.content,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<int> get visibility => $composableBuilder(
+    column: $table.visibility,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<int> get type => $composableBuilder(
+    column: $table.type,
     builder: (column) => ColumnFilters(column),
   );
 
@@ -1175,6 +1461,11 @@ class $$PostDraftsTableFilterComposer
     column: $table.lastModified,
     builder: (column) => ColumnFilters(column),
   );
+
+  ColumnFilters<String> get postData => $composableBuilder(
+    column: $table.postData,
+    builder: (column) => ColumnFilters(column),
+  );
 }
 
 class $$PostDraftsTableOrderingComposer
@@ -1191,8 +1482,28 @@ class $$PostDraftsTableOrderingComposer
     builder: (column) => ColumnOrderings(column),
   );
 
-  ColumnOrderings<String> get post => $composableBuilder(
-    column: $table.post,
+  ColumnOrderings<String> get title => $composableBuilder(
+    column: $table.title,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get description => $composableBuilder(
+    column: $table.description,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get content => $composableBuilder(
+    column: $table.content,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<int> get visibility => $composableBuilder(
+    column: $table.visibility,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<int> get type => $composableBuilder(
+    column: $table.type,
     builder: (column) => ColumnOrderings(column),
   );
 
@@ -1200,6 +1511,11 @@ class $$PostDraftsTableOrderingComposer
     column: $table.lastModified,
     builder: (column) => ColumnOrderings(column),
   );
+
+  ColumnOrderings<String> get postData => $composableBuilder(
+    column: $table.postData,
+    builder: (column) => ColumnOrderings(column),
+  );
 }
 
 class $$PostDraftsTableAnnotationComposer
@@ -1214,13 +1530,32 @@ class $$PostDraftsTableAnnotationComposer
   GeneratedColumn<String> get id =>
       $composableBuilder(column: $table.id, builder: (column) => column);
 
-  GeneratedColumn<String> get post =>
-      $composableBuilder(column: $table.post, builder: (column) => column);
+  GeneratedColumn<String> get title =>
+      $composableBuilder(column: $table.title, builder: (column) => column);
+
+  GeneratedColumn<String> get description => $composableBuilder(
+    column: $table.description,
+    builder: (column) => column,
+  );
+
+  GeneratedColumn<String> get content =>
+      $composableBuilder(column: $table.content, builder: (column) => column);
+
+  GeneratedColumn<int> get visibility => $composableBuilder(
+    column: $table.visibility,
+    builder: (column) => column,
+  );
+
+  GeneratedColumn<int> get type =>
+      $composableBuilder(column: $table.type, builder: (column) => column);
 
   GeneratedColumn<DateTime> get lastModified => $composableBuilder(
     column: $table.lastModified,
     builder: (column) => column,
   );
+
+  GeneratedColumn<String> get postData =>
+      $composableBuilder(column: $table.postData, builder: (column) => column);
 }
 
 class $$PostDraftsTableTableManager
@@ -1255,25 +1590,45 @@ class $$PostDraftsTableTableManager
           updateCompanionCallback:
               ({
                 Value<String> id = const Value.absent(),
-                Value<String> post = const Value.absent(),
+                Value<String?> title = const Value.absent(),
+                Value<String?> description = const Value.absent(),
+                Value<String?> content = const Value.absent(),
+                Value<int> visibility = const Value.absent(),
+                Value<int> type = const Value.absent(),
                 Value<DateTime> lastModified = const Value.absent(),
+                Value<String> postData = const Value.absent(),
                 Value<int> rowid = const Value.absent(),
               }) => PostDraftsCompanion(
                 id: id,
-                post: post,
+                title: title,
+                description: description,
+                content: content,
+                visibility: visibility,
+                type: type,
                 lastModified: lastModified,
+                postData: postData,
                 rowid: rowid,
               ),
           createCompanionCallback:
               ({
                 required String id,
-                required String post,
+                Value<String?> title = const Value.absent(),
+                Value<String?> description = const Value.absent(),
+                Value<String?> content = const Value.absent(),
+                Value<int> visibility = const Value.absent(),
+                Value<int> type = const Value.absent(),
                 required DateTime lastModified,
+                required String postData,
                 Value<int> rowid = const Value.absent(),
               }) => PostDraftsCompanion.insert(
                 id: id,
-                post: post,
+                title: title,
+                description: description,
+                content: content,
+                visibility: visibility,
+                type: type,
                 lastModified: lastModified,
+                postData: postData,
                 rowid: rowid,
               ),
           withReferenceMapper:

lib/main.dart

@@ -181,7 +181,7 @@ class IslandApp extends HookConsumerWidget {
     }
 
     useEffect(() {
-      if (!kIsWeb && Platform.isLinux) {
+      if (!kIsWeb && (Platform.isLinux || Platform.isWindows)) {
         return null;
       }
 

lib/models/account.dart

@@ -19,6 +19,7 @@ sealed class SnAccount with _$SnAccount {
     required SnAccountProfile profile,
     required SnWalletSubscriptionRef? perkSubscription,
     @Default([]) List<SnAccountBadge> badges,
+    @Default([]) List<SnContactMethod> contacts,
     required DateTime createdAt,
     required DateTime updatedAt,
     required DateTime? deletedAt,
@@ -135,6 +136,7 @@ sealed class SnContactMethod with _$SnContactMethod {
     required int type,
     required DateTime? verifiedAt,
     required bool isPrimary,
+    required bool isPublic,
     required String content,
     required String accountId,
     required DateTime createdAt,

lib/models/account.freezed.dart

@@ -15,7 +15,7 @@ T _$identity<T>(T value) => value;
 /// @nodoc
 mixin _$SnAccount {
 
- String get id; String get name; String get nick; String get language; String get region; bool get isSuperuser; String? get automatedId; SnAccountProfile get profile; SnWalletSubscriptionRef? get perkSubscription; List<SnAccountBadge> get badges; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
+ String get id; String get name; String get nick; String get language; String get region; bool get isSuperuser; String? get automatedId; SnAccountProfile get profile; SnWalletSubscriptionRef? get perkSubscription; List<SnAccountBadge> get badges; List<SnContactMethod> get contacts; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
 /// Create a copy of SnAccount
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -28,16 +28,16 @@ $SnAccountCopyWith<SnAccount> get copyWith => _$SnAccountCopyWithImpl<SnAccount>
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnAccount&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.nick, nick) || other.nick == nick)&&(identical(other.language, language) || other.language == language)&&(identical(other.region, region) || other.region == region)&&(identical(other.isSuperuser, isSuperuser) || other.isSuperuser == isSuperuser)&&(identical(other.automatedId, automatedId) || other.automatedId == automatedId)&&(identical(other.profile, profile) || other.profile == profile)&&(identical(other.perkSubscription, perkSubscription) || other.perkSubscription == perkSubscription)&&const DeepCollectionEquality().equals(other.badges, badges)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnAccount&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.nick, nick) || other.nick == nick)&&(identical(other.language, language) || other.language == language)&&(identical(other.region, region) || other.region == region)&&(identical(other.isSuperuser, isSuperuser) || other.isSuperuser == isSuperuser)&&(identical(other.automatedId, automatedId) || other.automatedId == automatedId)&&(identical(other.profile, profile) || other.profile == profile)&&(identical(other.perkSubscription, perkSubscription) || other.perkSubscription == perkSubscription)&&const DeepCollectionEquality().equals(other.badges, badges)&&const DeepCollectionEquality().equals(other.contacts, contacts)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hash(runtimeType,id,name,nick,language,region,isSuperuser,automatedId,profile,perkSubscription,const DeepCollectionEquality().hash(badges),createdAt,updatedAt,deletedAt);
+int get hashCode => Object.hash(runtimeType,id,name,nick,language,region,isSuperuser,automatedId,profile,perkSubscription,const DeepCollectionEquality().hash(badges),const DeepCollectionEquality().hash(contacts),createdAt,updatedAt,deletedAt);
 
 @override
 String toString() {
-  return 'SnAccount(id: $id, name: $name, nick: $nick, language: $language, region: $region, isSuperuser: $isSuperuser, automatedId: $automatedId, profile: $profile, perkSubscription: $perkSubscription, badges: $badges, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+  return 'SnAccount(id: $id, name: $name, nick: $nick, language: $language, region: $region, isSuperuser: $isSuperuser, automatedId: $automatedId, profile: $profile, perkSubscription: $perkSubscription, badges: $badges, contacts: $contacts, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
 }
 
 
@@ -48,7 +48,7 @@ abstract mixin class $SnAccountCopyWith<$Res>  {
   factory $SnAccountCopyWith(SnAccount value, $Res Function(SnAccount) _then) = _$SnAccountCopyWithImpl;
 @useResult
 $Res call({
- String id, String name, String nick, String language, String region, bool isSuperuser, String? automatedId, SnAccountProfile profile, SnWalletSubscriptionRef? perkSubscription, List<SnAccountBadge> badges, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, String name, String nick, String language, String region, bool isSuperuser, String? automatedId, SnAccountProfile profile, SnWalletSubscriptionRef? perkSubscription, List<SnAccountBadge> badges, List<SnContactMethod> contacts, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });
 
 
@@ -65,7 +65,7 @@ class _$SnAccountCopyWithImpl<$Res>
 
 /// Create a copy of SnAccount
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? name = null,Object? nick = null,Object? language = null,Object? region = null,Object? isSuperuser = null,Object? automatedId = freezed,Object? profile = null,Object? perkSubscription = freezed,Object? badges = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? name = null,Object? nick = null,Object? language = null,Object? region = null,Object? isSuperuser = null,Object? automatedId = freezed,Object? profile = null,Object? perkSubscription = freezed,Object? badges = null,Object? contacts = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
   return _then(_self.copyWith(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
@@ -77,7 +77,8 @@ as bool,automatedId: freezed == automatedId ? _self.automatedId : automatedId //
 as String?,profile: null == profile ? _self.profile : profile // ignore: cast_nullable_to_non_nullable
 as SnAccountProfile,perkSubscription: freezed == perkSubscription ? _self.perkSubscription : perkSubscription // ignore: cast_nullable_to_non_nullable
 as SnWalletSubscriptionRef?,badges: null == badges ? _self.badges : badges // ignore: cast_nullable_to_non_nullable
-as List<SnAccountBadge>,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as List<SnAccountBadge>,contacts: null == contacts ? _self.contacts : contacts // ignore: cast_nullable_to_non_nullable
+as List<SnContactMethod>,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
 as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
 as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,
@@ -183,10 +184,10 @@ return $default(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String name,  String nick,  String language,  String region,  bool isSuperuser,  String? automatedId,  SnAccountProfile profile,  SnWalletSubscriptionRef? perkSubscription,  List<SnAccountBadge> badges,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String name,  String nick,  String language,  String region,  bool isSuperuser,  String? automatedId,  SnAccountProfile profile,  SnWalletSubscriptionRef? perkSubscription,  List<SnAccountBadge> badges,  List<SnContactMethod> contacts,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _SnAccount() when $default != null:
-return $default(_that.id,_that.name,_that.nick,_that.language,_that.region,_that.isSuperuser,_that.automatedId,_that.profile,_that.perkSubscription,_that.badges,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+return $default(_that.id,_that.name,_that.nick,_that.language,_that.region,_that.isSuperuser,_that.automatedId,_that.profile,_that.perkSubscription,_that.badges,_that.contacts,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
   return orElse();
 
 }
@@ -204,10 +205,10 @@ return $default(_that.id,_that.name,_that.nick,_that.language,_that.region,_that
 /// }
 /// ```
 
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String name,  String nick,  String language,  String region,  bool isSuperuser,  String? automatedId,  SnAccountProfile profile,  SnWalletSubscriptionRef? perkSubscription,  List<SnAccountBadge> badges,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String name,  String nick,  String language,  String region,  bool isSuperuser,  String? automatedId,  SnAccountProfile profile,  SnWalletSubscriptionRef? perkSubscription,  List<SnAccountBadge> badges,  List<SnContactMethod> contacts,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
 switch (_that) {
 case _SnAccount():
-return $default(_that.id,_that.name,_that.nick,_that.language,_that.region,_that.isSuperuser,_that.automatedId,_that.profile,_that.perkSubscription,_that.badges,_that.createdAt,_that.updatedAt,_that.deletedAt);}
+return $default(_that.id,_that.name,_that.nick,_that.language,_that.region,_that.isSuperuser,_that.automatedId,_that.profile,_that.perkSubscription,_that.badges,_that.contacts,_that.createdAt,_that.updatedAt,_that.deletedAt);}
 }
 /// A variant of `when` that fallback to returning `null`
 ///
@@ -221,10 +222,10 @@ return $default(_that.id,_that.name,_that.nick,_that.language,_that.region,_that
 /// }
 /// ```
 
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String name,  String nick,  String language,  String region,  bool isSuperuser,  String? automatedId,  SnAccountProfile profile,  SnWalletSubscriptionRef? perkSubscription,  List<SnAccountBadge> badges,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String name,  String nick,  String language,  String region,  bool isSuperuser,  String? automatedId,  SnAccountProfile profile,  SnWalletSubscriptionRef? perkSubscription,  List<SnAccountBadge> badges,  List<SnContactMethod> contacts,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
 switch (_that) {
 case _SnAccount() when $default != null:
-return $default(_that.id,_that.name,_that.nick,_that.language,_that.region,_that.isSuperuser,_that.automatedId,_that.profile,_that.perkSubscription,_that.badges,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+return $default(_that.id,_that.name,_that.nick,_that.language,_that.region,_that.isSuperuser,_that.automatedId,_that.profile,_that.perkSubscription,_that.badges,_that.contacts,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
   return null;
 
 }
@@ -236,7 +237,7 @@ return $default(_that.id,_that.name,_that.nick,_that.language,_that.region,_that
 @JsonSerializable()
 
 class _SnAccount implements SnAccount {
-  const _SnAccount({required this.id, required this.name, required this.nick, required this.language, this.region = "", required this.isSuperuser, required this.automatedId, required this.profile, required this.perkSubscription, final  List<SnAccountBadge> badges = const [], required this.createdAt, required this.updatedAt, required this.deletedAt}): _badges = badges;
+  const _SnAccount({required this.id, required this.name, required this.nick, required this.language, this.region = "", required this.isSuperuser, required this.automatedId, required this.profile, required this.perkSubscription, final  List<SnAccountBadge> badges = const [], final  List<SnContactMethod> contacts = const [], required this.createdAt, required this.updatedAt, required this.deletedAt}): _badges = badges,_contacts = contacts;
   factory _SnAccount.fromJson(Map<String, dynamic> json) => _$SnAccountFromJson(json);
 
 @override final  String id;
@@ -255,6 +256,13 @@ class _SnAccount implements SnAccount {
   return EqualUnmodifiableListView(_badges);
 }
 
+ final  List<SnContactMethod> _contacts;
+@override@JsonKey() List<SnContactMethod> get contacts {
+  if (_contacts is EqualUnmodifiableListView) return _contacts;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableListView(_contacts);
+}
+
 @override final  DateTime createdAt;
 @override final  DateTime updatedAt;
 @override final  DateTime? deletedAt;
@@ -272,16 +280,16 @@ Map<String, dynamic> toJson() {
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnAccount&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.nick, nick) || other.nick == nick)&&(identical(other.language, language) || other.language == language)&&(identical(other.region, region) || other.region == region)&&(identical(other.isSuperuser, isSuperuser) || other.isSuperuser == isSuperuser)&&(identical(other.automatedId, automatedId) || other.automatedId == automatedId)&&(identical(other.profile, profile) || other.profile == profile)&&(identical(other.perkSubscription, perkSubscription) || other.perkSubscription == perkSubscription)&&const DeepCollectionEquality().equals(other._badges, _badges)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnAccount&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.nick, nick) || other.nick == nick)&&(identical(other.language, language) || other.language == language)&&(identical(other.region, region) || other.region == region)&&(identical(other.isSuperuser, isSuperuser) || other.isSuperuser == isSuperuser)&&(identical(other.automatedId, automatedId) || other.automatedId == automatedId)&&(identical(other.profile, profile) || other.profile == profile)&&(identical(other.perkSubscription, perkSubscription) || other.perkSubscription == perkSubscription)&&const DeepCollectionEquality().equals(other._badges, _badges)&&const DeepCollectionEquality().equals(other._contacts, _contacts)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hash(runtimeType,id,name,nick,language,region,isSuperuser,automatedId,profile,perkSubscription,const DeepCollectionEquality().hash(_badges),createdAt,updatedAt,deletedAt);
+int get hashCode => Object.hash(runtimeType,id,name,nick,language,region,isSuperuser,automatedId,profile,perkSubscription,const DeepCollectionEquality().hash(_badges),const DeepCollectionEquality().hash(_contacts),createdAt,updatedAt,deletedAt);
 
 @override
 String toString() {
-  return 'SnAccount(id: $id, name: $name, nick: $nick, language: $language, region: $region, isSuperuser: $isSuperuser, automatedId: $automatedId, profile: $profile, perkSubscription: $perkSubscription, badges: $badges, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+  return 'SnAccount(id: $id, name: $name, nick: $nick, language: $language, region: $region, isSuperuser: $isSuperuser, automatedId: $automatedId, profile: $profile, perkSubscription: $perkSubscription, badges: $badges, contacts: $contacts, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
 }
 
 
@@ -292,7 +300,7 @@ abstract mixin class _$SnAccountCopyWith<$Res> implements $SnAccountCopyWith<$Re
   factory _$SnAccountCopyWith(_SnAccount value, $Res Function(_SnAccount) _then) = __$SnAccountCopyWithImpl;
 @override @useResult
 $Res call({
- String id, String name, String nick, String language, String region, bool isSuperuser, String? automatedId, SnAccountProfile profile, SnWalletSubscriptionRef? perkSubscription, List<SnAccountBadge> badges, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, String name, String nick, String language, String region, bool isSuperuser, String? automatedId, SnAccountProfile profile, SnWalletSubscriptionRef? perkSubscription, List<SnAccountBadge> badges, List<SnContactMethod> contacts, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });
 
 
@@ -309,7 +317,7 @@ class __$SnAccountCopyWithImpl<$Res>
 
 /// Create a copy of SnAccount
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? name = null,Object? nick = null,Object? language = null,Object? region = null,Object? isSuperuser = null,Object? automatedId = freezed,Object? profile = null,Object? perkSubscription = freezed,Object? badges = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? name = null,Object? nick = null,Object? language = null,Object? region = null,Object? isSuperuser = null,Object? automatedId = freezed,Object? profile = null,Object? perkSubscription = freezed,Object? badges = null,Object? contacts = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
   return _then(_SnAccount(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
@@ -321,7 +329,8 @@ as bool,automatedId: freezed == automatedId ? _self.automatedId : automatedId //
 as String?,profile: null == profile ? _self.profile : profile // ignore: cast_nullable_to_non_nullable
 as SnAccountProfile,perkSubscription: freezed == perkSubscription ? _self.perkSubscription : perkSubscription // ignore: cast_nullable_to_non_nullable
 as SnWalletSubscriptionRef?,badges: null == badges ? _self._badges : badges // ignore: cast_nullable_to_non_nullable
-as List<SnAccountBadge>,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as List<SnAccountBadge>,contacts: null == contacts ? _self._contacts : contacts // ignore: cast_nullable_to_non_nullable
+as List<SnContactMethod>,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
 as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
 as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,
@@ -1627,7 +1636,7 @@ as DateTime?,
 /// @nodoc
 mixin _$SnContactMethod {
 
- String get id; int get type; DateTime? get verifiedAt; bool get isPrimary; String get content; String get accountId; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
+ String get id; int get type; DateTime? get verifiedAt; bool get isPrimary; bool get isPublic; String get content; String get accountId; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
 /// Create a copy of SnContactMethod
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -1640,16 +1649,16 @@ $SnContactMethodCopyWith<SnContactMethod> get copyWith => _$SnContactMethodCopyW
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnContactMethod&&(identical(other.id, id) || other.id == id)&&(identical(other.type, type) || other.type == type)&&(identical(other.verifiedAt, verifiedAt) || other.verifiedAt == verifiedAt)&&(identical(other.isPrimary, isPrimary) || other.isPrimary == isPrimary)&&(identical(other.content, content) || other.content == content)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnContactMethod&&(identical(other.id, id) || other.id == id)&&(identical(other.type, type) || other.type == type)&&(identical(other.verifiedAt, verifiedAt) || other.verifiedAt == verifiedAt)&&(identical(other.isPrimary, isPrimary) || other.isPrimary == isPrimary)&&(identical(other.isPublic, isPublic) || other.isPublic == isPublic)&&(identical(other.content, content) || other.content == content)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hash(runtimeType,id,type,verifiedAt,isPrimary,content,accountId,createdAt,updatedAt,deletedAt);
+int get hashCode => Object.hash(runtimeType,id,type,verifiedAt,isPrimary,isPublic,content,accountId,createdAt,updatedAt,deletedAt);
 
 @override
 String toString() {
-  return 'SnContactMethod(id: $id, type: $type, verifiedAt: $verifiedAt, isPrimary: $isPrimary, content: $content, accountId: $accountId, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+  return 'SnContactMethod(id: $id, type: $type, verifiedAt: $verifiedAt, isPrimary: $isPrimary, isPublic: $isPublic, content: $content, accountId: $accountId, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
 }
 
 
@@ -1660,7 +1669,7 @@ abstract mixin class $SnContactMethodCopyWith<$Res>  {
   factory $SnContactMethodCopyWith(SnContactMethod value, $Res Function(SnContactMethod) _then) = _$SnContactMethodCopyWithImpl;
 @useResult
 $Res call({
- String id, int type, DateTime? verifiedAt, bool isPrimary, String content, String accountId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, int type, DateTime? verifiedAt, bool isPrimary, bool isPublic, String content, String accountId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });
 
 
@@ -1677,12 +1686,13 @@ class _$SnContactMethodCopyWithImpl<$Res>
 
 /// Create a copy of SnContactMethod
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? type = null,Object? verifiedAt = freezed,Object? isPrimary = null,Object? content = null,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? type = null,Object? verifiedAt = freezed,Object? isPrimary = null,Object? isPublic = null,Object? content = null,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
   return _then(_self.copyWith(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
 as int,verifiedAt: freezed == verifiedAt ? _self.verifiedAt : verifiedAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,isPrimary: null == isPrimary ? _self.isPrimary : isPrimary // ignore: cast_nullable_to_non_nullable
+as bool,isPublic: null == isPublic ? _self.isPublic : isPublic // ignore: cast_nullable_to_non_nullable
 as bool,content: null == content ? _self.content : content // ignore: cast_nullable_to_non_nullable
 as String,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
 as String,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
@@ -1770,10 +1780,10 @@ return $default(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  int type,  DateTime? verifiedAt,  bool isPrimary,  String content,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  int type,  DateTime? verifiedAt,  bool isPrimary,  bool isPublic,  String content,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _SnContactMethod() when $default != null:
-return $default(_that.id,_that.type,_that.verifiedAt,_that.isPrimary,_that.content,_that.accountId,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+return $default(_that.id,_that.type,_that.verifiedAt,_that.isPrimary,_that.isPublic,_that.content,_that.accountId,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
   return orElse();
 
 }
@@ -1791,10 +1801,10 @@ return $default(_that.id,_that.type,_that.verifiedAt,_that.isPrimary,_that.conte
 /// }
 /// ```
 
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  int type,  DateTime? verifiedAt,  bool isPrimary,  String content,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  int type,  DateTime? verifiedAt,  bool isPrimary,  bool isPublic,  String content,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
 switch (_that) {
 case _SnContactMethod():
-return $default(_that.id,_that.type,_that.verifiedAt,_that.isPrimary,_that.content,_that.accountId,_that.createdAt,_that.updatedAt,_that.deletedAt);}
+return $default(_that.id,_that.type,_that.verifiedAt,_that.isPrimary,_that.isPublic,_that.content,_that.accountId,_that.createdAt,_that.updatedAt,_that.deletedAt);}
 }
 /// A variant of `when` that fallback to returning `null`
 ///
@@ -1808,10 +1818,10 @@ return $default(_that.id,_that.type,_that.verifiedAt,_that.isPrimary,_that.conte
 /// }
 /// ```
 
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  int type,  DateTime? verifiedAt,  bool isPrimary,  String content,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  int type,  DateTime? verifiedAt,  bool isPrimary,  bool isPublic,  String content,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
 switch (_that) {
 case _SnContactMethod() when $default != null:
-return $default(_that.id,_that.type,_that.verifiedAt,_that.isPrimary,_that.content,_that.accountId,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+return $default(_that.id,_that.type,_that.verifiedAt,_that.isPrimary,_that.isPublic,_that.content,_that.accountId,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
   return null;
 
 }
@@ -1823,13 +1833,14 @@ return $default(_that.id,_that.type,_that.verifiedAt,_that.isPrimary,_that.conte
 @JsonSerializable()
 
 class _SnContactMethod implements SnContactMethod {
-  const _SnContactMethod({required this.id, required this.type, required this.verifiedAt, required this.isPrimary, required this.content, required this.accountId, required this.createdAt, required this.updatedAt, required this.deletedAt});
+  const _SnContactMethod({required this.id, required this.type, required this.verifiedAt, required this.isPrimary, required this.isPublic, required this.content, required this.accountId, required this.createdAt, required this.updatedAt, required this.deletedAt});
   factory _SnContactMethod.fromJson(Map<String, dynamic> json) => _$SnContactMethodFromJson(json);
 
 @override final  String id;
 @override final  int type;
 @override final  DateTime? verifiedAt;
 @override final  bool isPrimary;
+@override final  bool isPublic;
 @override final  String content;
 @override final  String accountId;
 @override final  DateTime createdAt;
@@ -1849,16 +1860,16 @@ Map<String, dynamic> toJson() {
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnContactMethod&&(identical(other.id, id) || other.id == id)&&(identical(other.type, type) || other.type == type)&&(identical(other.verifiedAt, verifiedAt) || other.verifiedAt == verifiedAt)&&(identical(other.isPrimary, isPrimary) || other.isPrimary == isPrimary)&&(identical(other.content, content) || other.content == content)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnContactMethod&&(identical(other.id, id) || other.id == id)&&(identical(other.type, type) || other.type == type)&&(identical(other.verifiedAt, verifiedAt) || other.verifiedAt == verifiedAt)&&(identical(other.isPrimary, isPrimary) || other.isPrimary == isPrimary)&&(identical(other.isPublic, isPublic) || other.isPublic == isPublic)&&(identical(other.content, content) || other.content == content)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hash(runtimeType,id,type,verifiedAt,isPrimary,content,accountId,createdAt,updatedAt,deletedAt);
+int get hashCode => Object.hash(runtimeType,id,type,verifiedAt,isPrimary,isPublic,content,accountId,createdAt,updatedAt,deletedAt);
 
 @override
 String toString() {
-  return 'SnContactMethod(id: $id, type: $type, verifiedAt: $verifiedAt, isPrimary: $isPrimary, content: $content, accountId: $accountId, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+  return 'SnContactMethod(id: $id, type: $type, verifiedAt: $verifiedAt, isPrimary: $isPrimary, isPublic: $isPublic, content: $content, accountId: $accountId, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
 }
 
 
@@ -1869,7 +1880,7 @@ abstract mixin class _$SnContactMethodCopyWith<$Res> implements $SnContactMethod
   factory _$SnContactMethodCopyWith(_SnContactMethod value, $Res Function(_SnContactMethod) _then) = __$SnContactMethodCopyWithImpl;
 @override @useResult
 $Res call({
- String id, int type, DateTime? verifiedAt, bool isPrimary, String content, String accountId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, int type, DateTime? verifiedAt, bool isPrimary, bool isPublic, String content, String accountId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });
 
 
@@ -1886,12 +1897,13 @@ class __$SnContactMethodCopyWithImpl<$Res>
 
 /// Create a copy of SnContactMethod
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? type = null,Object? verifiedAt = freezed,Object? isPrimary = null,Object? content = null,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? type = null,Object? verifiedAt = freezed,Object? isPrimary = null,Object? isPublic = null,Object? content = null,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
   return _then(_SnContactMethod(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
 as int,verifiedAt: freezed == verifiedAt ? _self.verifiedAt : verifiedAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,isPrimary: null == isPrimary ? _self.isPrimary : isPrimary // ignore: cast_nullable_to_non_nullable
+as bool,isPublic: null == isPublic ? _self.isPublic : isPublic // ignore: cast_nullable_to_non_nullable
 as bool,content: null == content ? _self.content : content // ignore: cast_nullable_to_non_nullable
 as String,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
 as String,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable

lib/models/account.g.dart

@@ -26,6 +26,11 @@ _SnAccount _$SnAccountFromJson(Map<String, dynamic> json) => _SnAccount(
           ?.map((e) => SnAccountBadge.fromJson(e as Map<String, dynamic>))
           .toList() ??
       const [],
+  contacts:
+      (json['contacts'] as List<dynamic>?)
+          ?.map((e) => SnContactMethod.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      const [],
   createdAt: DateTime.parse(json['created_at'] as String),
   updatedAt: DateTime.parse(json['updated_at'] as String),
   deletedAt:
@@ -46,6 +51,7 @@ Map<String, dynamic> _$SnAccountToJson(_SnAccount instance) =>
       'profile': instance.profile.toJson(),
       'perk_subscription': instance.perkSubscription?.toJson(),
       'badges': instance.badges.map((e) => e.toJson()).toList(),
+      'contacts': instance.contacts.map((e) => e.toJson()).toList(),
       'created_at': instance.createdAt.toIso8601String(),
       'updated_at': instance.updatedAt.toIso8601String(),
       'deleted_at': instance.deletedAt?.toIso8601String(),
@@ -229,6 +235,7 @@ _SnContactMethod _$SnContactMethodFromJson(Map<String, dynamic> json) =>
               ? null
               : DateTime.parse(json['verified_at'] as String),
       isPrimary: json['is_primary'] as bool,
+      isPublic: json['is_public'] as bool,
       content: json['content'] as String,
       accountId: json['account_id'] as String,
       createdAt: DateTime.parse(json['created_at'] as String),
@@ -245,6 +252,7 @@ Map<String, dynamic> _$SnContactMethodToJson(_SnContactMethod instance) =>
       'type': instance.type,
       'verified_at': instance.verifiedAt?.toIso8601String(),
       'is_primary': instance.isPrimary,
+      'is_public': instance.isPublic,
       'content': instance.content,
       'account_id': instance.accountId,
       'created_at': instance.createdAt.toIso8601String(),

lib/models/auth.dart

@@ -14,11 +14,11 @@ sealed class AppToken with _$AppToken {
 @freezed
 sealed class GeoIpLocation with _$GeoIpLocation {
   const factory GeoIpLocation({
-    required double latitude,
-    required double longitude,
-    required String countryCode,
-    required String country,
-    required String city,
+    required double? latitude,
+    required double? longitude,
+    required String? countryCode,
+    required String? country,
+    required String? city,
   }) = _GeoIpLocation;
 
   factory GeoIpLocation.fromJson(Map<String, dynamic> json) =>
@@ -29,7 +29,7 @@ sealed class GeoIpLocation with _$GeoIpLocation {
 sealed class SnAuthChallenge with _$SnAuthChallenge {
   const factory SnAuthChallenge({
     required String id,
-    required DateTime expiredAt,
+    required DateTime? expiredAt,
     required int stepRemain,
     required int stepTotal,
     required int failedAttempts,
@@ -57,7 +57,7 @@ sealed class SnAuthSession with _$SnAuthSession {
     required String id,
     required String? label,
     required DateTime lastGrantedAt,
-    required DateTime expiredAt,
+    required DateTime? expiredAt,
     required String accountId,
     required String challengeId,
     required SnAuthChallenge challenge,

lib/models/auth.freezed.dart

@@ -272,7 +272,7 @@ as String,
 /// @nodoc
 mixin _$GeoIpLocation {
 
- double get latitude; double get longitude; String get countryCode; String get country; String get city;
+ double? get latitude; double? get longitude; String? get countryCode; String? get country; String? get city;
 /// Create a copy of GeoIpLocation
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -305,7 +305,7 @@ abstract mixin class $GeoIpLocationCopyWith<$Res>  {
   factory $GeoIpLocationCopyWith(GeoIpLocation value, $Res Function(GeoIpLocation) _then) = _$GeoIpLocationCopyWithImpl;
 @useResult
 $Res call({
- double latitude, double longitude, String countryCode, String country, String city
+ double? latitude, double? longitude, String? countryCode, String? country, String? city
 });
 
 
@@ -322,14 +322,14 @@ class _$GeoIpLocationCopyWithImpl<$Res>
 
 /// Create a copy of GeoIpLocation
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? latitude = null,Object? longitude = null,Object? countryCode = null,Object? country = null,Object? city = null,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? latitude = freezed,Object? longitude = freezed,Object? countryCode = freezed,Object? country = freezed,Object? city = freezed,}) {
   return _then(_self.copyWith(
-latitude: null == latitude ? _self.latitude : latitude // ignore: cast_nullable_to_non_nullable
-as double,longitude: null == longitude ? _self.longitude : longitude // ignore: cast_nullable_to_non_nullable
-as double,countryCode: null == countryCode ? _self.countryCode : countryCode // ignore: cast_nullable_to_non_nullable
-as String,country: null == country ? _self.country : country // ignore: cast_nullable_to_non_nullable
-as String,city: null == city ? _self.city : city // ignore: cast_nullable_to_non_nullable
-as String,
+latitude: freezed == latitude ? _self.latitude : latitude // ignore: cast_nullable_to_non_nullable
+as double?,longitude: freezed == longitude ? _self.longitude : longitude // ignore: cast_nullable_to_non_nullable
+as double?,countryCode: freezed == countryCode ? _self.countryCode : countryCode // ignore: cast_nullable_to_non_nullable
+as String?,country: freezed == country ? _self.country : country // ignore: cast_nullable_to_non_nullable
+as String?,city: freezed == city ? _self.city : city // ignore: cast_nullable_to_non_nullable
+as String?,
   ));
 }
 
@@ -411,7 +411,7 @@ return $default(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( double latitude,  double longitude,  String countryCode,  String country,  String city)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( double? latitude,  double? longitude,  String? countryCode,  String? country,  String? city)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _GeoIpLocation() when $default != null:
 return $default(_that.latitude,_that.longitude,_that.countryCode,_that.country,_that.city);case _:
@@ -432,7 +432,7 @@ return $default(_that.latitude,_that.longitude,_that.countryCode,_that.country,_
 /// }
 /// ```
 
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( double latitude,  double longitude,  String countryCode,  String country,  String city)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( double? latitude,  double? longitude,  String? countryCode,  String? country,  String? city)  $default,) {final _that = this;
 switch (_that) {
 case _GeoIpLocation():
 return $default(_that.latitude,_that.longitude,_that.countryCode,_that.country,_that.city);}
@@ -449,7 +449,7 @@ return $default(_that.latitude,_that.longitude,_that.countryCode,_that.country,_
 /// }
 /// ```
 
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( double latitude,  double longitude,  String countryCode,  String country,  String city)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( double? latitude,  double? longitude,  String? countryCode,  String? country,  String? city)?  $default,) {final _that = this;
 switch (_that) {
 case _GeoIpLocation() when $default != null:
 return $default(_that.latitude,_that.longitude,_that.countryCode,_that.country,_that.city);case _:
@@ -467,11 +467,11 @@ class _GeoIpLocation implements GeoIpLocation {
   const _GeoIpLocation({required this.latitude, required this.longitude, required this.countryCode, required this.country, required this.city});
   factory _GeoIpLocation.fromJson(Map<String, dynamic> json) => _$GeoIpLocationFromJson(json);
 
-@override final  double latitude;
-@override final  double longitude;
-@override final  String countryCode;
-@override final  String country;
-@override final  String city;
+@override final  double? latitude;
+@override final  double? longitude;
+@override final  String? countryCode;
+@override final  String? country;
+@override final  String? city;
 
 /// Create a copy of GeoIpLocation
 /// with the given fields replaced by the non-null parameter values.
@@ -506,7 +506,7 @@ abstract mixin class _$GeoIpLocationCopyWith<$Res> implements $GeoIpLocationCopy
   factory _$GeoIpLocationCopyWith(_GeoIpLocation value, $Res Function(_GeoIpLocation) _then) = __$GeoIpLocationCopyWithImpl;
 @override @useResult
 $Res call({
- double latitude, double longitude, String countryCode, String country, String city
+ double? latitude, double? longitude, String? countryCode, String? country, String? city
 });
 
 
@@ -523,14 +523,14 @@ class __$GeoIpLocationCopyWithImpl<$Res>
 
 /// Create a copy of GeoIpLocation
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? latitude = null,Object? longitude = null,Object? countryCode = null,Object? country = null,Object? city = null,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? latitude = freezed,Object? longitude = freezed,Object? countryCode = freezed,Object? country = freezed,Object? city = freezed,}) {
   return _then(_GeoIpLocation(
-latitude: null == latitude ? _self.latitude : latitude // ignore: cast_nullable_to_non_nullable
-as double,longitude: null == longitude ? _self.longitude : longitude // ignore: cast_nullable_to_non_nullable
-as double,countryCode: null == countryCode ? _self.countryCode : countryCode // ignore: cast_nullable_to_non_nullable
-as String,country: null == country ? _self.country : country // ignore: cast_nullable_to_non_nullable
-as String,city: null == city ? _self.city : city // ignore: cast_nullable_to_non_nullable
-as String,
+latitude: freezed == latitude ? _self.latitude : latitude // ignore: cast_nullable_to_non_nullable
+as double?,longitude: freezed == longitude ? _self.longitude : longitude // ignore: cast_nullable_to_non_nullable
+as double?,countryCode: freezed == countryCode ? _self.countryCode : countryCode // ignore: cast_nullable_to_non_nullable
+as String?,country: freezed == country ? _self.country : country // ignore: cast_nullable_to_non_nullable
+as String?,city: freezed == city ? _self.city : city // ignore: cast_nullable_to_non_nullable
+as String?,
   ));
 }
 
@@ -541,7 +541,7 @@ as String,
 /// @nodoc
 mixin _$SnAuthChallenge {
 
- String get id; DateTime get expiredAt; int get stepRemain; int get stepTotal; int get failedAttempts; int get type; List<String> get blacklistFactors; List<dynamic> get audiences; List<dynamic> get scopes; String get ipAddress; String get userAgent; String? get nonce; GeoIpLocation? get location; String get accountId; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
+ String get id; DateTime? get expiredAt; int get stepRemain; int get stepTotal; int get failedAttempts; int get type; List<String> get blacklistFactors; List<dynamic> get audiences; List<dynamic> get scopes; String get ipAddress; String get userAgent; String? get nonce; GeoIpLocation? get location; String get accountId; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
 /// Create a copy of SnAuthChallenge
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -574,7 +574,7 @@ abstract mixin class $SnAuthChallengeCopyWith<$Res>  {
   factory $SnAuthChallengeCopyWith(SnAuthChallenge value, $Res Function(SnAuthChallenge) _then) = _$SnAuthChallengeCopyWithImpl;
 @useResult
 $Res call({
- String id, DateTime expiredAt, int stepRemain, int stepTotal, int failedAttempts, int type, List<String> blacklistFactors, List<dynamic> audiences, List<dynamic> scopes, String ipAddress, String userAgent, String? nonce, GeoIpLocation? location, String accountId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, DateTime? expiredAt, int stepRemain, int stepTotal, int failedAttempts, int type, List<String> blacklistFactors, List<dynamic> audiences, List<dynamic> scopes, String ipAddress, String userAgent, String? nonce, GeoIpLocation? location, String accountId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });
 
 
@@ -591,11 +591,11 @@ class _$SnAuthChallengeCopyWithImpl<$Res>
 
 /// Create a copy of SnAuthChallenge
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? expiredAt = null,Object? stepRemain = null,Object? stepTotal = null,Object? failedAttempts = null,Object? type = null,Object? blacklistFactors = null,Object? audiences = null,Object? scopes = null,Object? ipAddress = null,Object? userAgent = null,Object? nonce = freezed,Object? location = freezed,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? expiredAt = freezed,Object? stepRemain = null,Object? stepTotal = null,Object? failedAttempts = null,Object? type = null,Object? blacklistFactors = null,Object? audiences = null,Object? scopes = null,Object? ipAddress = null,Object? userAgent = null,Object? nonce = freezed,Object? location = freezed,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
   return _then(_self.copyWith(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
-as String,expiredAt: null == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
-as DateTime,stepRemain: null == stepRemain ? _self.stepRemain : stepRemain // ignore: cast_nullable_to_non_nullable
+as String,expiredAt: freezed == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,stepRemain: null == stepRemain ? _self.stepRemain : stepRemain // ignore: cast_nullable_to_non_nullable
 as int,stepTotal: null == stepTotal ? _self.stepTotal : stepTotal // ignore: cast_nullable_to_non_nullable
 as int,failedAttempts: null == failedAttempts ? _self.failedAttempts : failedAttempts // ignore: cast_nullable_to_non_nullable
 as int,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
@@ -704,7 +704,7 @@ return $default(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  DateTime expiredAt,  int stepRemain,  int stepTotal,  int failedAttempts,  int type,  List<String> blacklistFactors,  List<dynamic> audiences,  List<dynamic> scopes,  String ipAddress,  String userAgent,  String? nonce,  GeoIpLocation? location,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  DateTime? expiredAt,  int stepRemain,  int stepTotal,  int failedAttempts,  int type,  List<String> blacklistFactors,  List<dynamic> audiences,  List<dynamic> scopes,  String ipAddress,  String userAgent,  String? nonce,  GeoIpLocation? location,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _SnAuthChallenge() when $default != null:
 return $default(_that.id,_that.expiredAt,_that.stepRemain,_that.stepTotal,_that.failedAttempts,_that.type,_that.blacklistFactors,_that.audiences,_that.scopes,_that.ipAddress,_that.userAgent,_that.nonce,_that.location,_that.accountId,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
@@ -725,7 +725,7 @@ return $default(_that.id,_that.expiredAt,_that.stepRemain,_that.stepTotal,_that.
 /// }
 /// ```
 
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  DateTime expiredAt,  int stepRemain,  int stepTotal,  int failedAttempts,  int type,  List<String> blacklistFactors,  List<dynamic> audiences,  List<dynamic> scopes,  String ipAddress,  String userAgent,  String? nonce,  GeoIpLocation? location,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  DateTime? expiredAt,  int stepRemain,  int stepTotal,  int failedAttempts,  int type,  List<String> blacklistFactors,  List<dynamic> audiences,  List<dynamic> scopes,  String ipAddress,  String userAgent,  String? nonce,  GeoIpLocation? location,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
 switch (_that) {
 case _SnAuthChallenge():
 return $default(_that.id,_that.expiredAt,_that.stepRemain,_that.stepTotal,_that.failedAttempts,_that.type,_that.blacklistFactors,_that.audiences,_that.scopes,_that.ipAddress,_that.userAgent,_that.nonce,_that.location,_that.accountId,_that.createdAt,_that.updatedAt,_that.deletedAt);}
@@ -742,7 +742,7 @@ return $default(_that.id,_that.expiredAt,_that.stepRemain,_that.stepTotal,_that.
 /// }
 /// ```
 
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  DateTime expiredAt,  int stepRemain,  int stepTotal,  int failedAttempts,  int type,  List<String> blacklistFactors,  List<dynamic> audiences,  List<dynamic> scopes,  String ipAddress,  String userAgent,  String? nonce,  GeoIpLocation? location,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  DateTime? expiredAt,  int stepRemain,  int stepTotal,  int failedAttempts,  int type,  List<String> blacklistFactors,  List<dynamic> audiences,  List<dynamic> scopes,  String ipAddress,  String userAgent,  String? nonce,  GeoIpLocation? location,  String accountId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
 switch (_that) {
 case _SnAuthChallenge() when $default != null:
 return $default(_that.id,_that.expiredAt,_that.stepRemain,_that.stepTotal,_that.failedAttempts,_that.type,_that.blacklistFactors,_that.audiences,_that.scopes,_that.ipAddress,_that.userAgent,_that.nonce,_that.location,_that.accountId,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
@@ -761,7 +761,7 @@ class _SnAuthChallenge implements SnAuthChallenge {
   factory _SnAuthChallenge.fromJson(Map<String, dynamic> json) => _$SnAuthChallengeFromJson(json);
 
 @override final  String id;
-@override final  DateTime expiredAt;
+@override final  DateTime? expiredAt;
 @override final  int stepRemain;
 @override final  int stepTotal;
 @override final  int failedAttempts;
@@ -829,7 +829,7 @@ abstract mixin class _$SnAuthChallengeCopyWith<$Res> implements $SnAuthChallenge
   factory _$SnAuthChallengeCopyWith(_SnAuthChallenge value, $Res Function(_SnAuthChallenge) _then) = __$SnAuthChallengeCopyWithImpl;
 @override @useResult
 $Res call({
- String id, DateTime expiredAt, int stepRemain, int stepTotal, int failedAttempts, int type, List<String> blacklistFactors, List<dynamic> audiences, List<dynamic> scopes, String ipAddress, String userAgent, String? nonce, GeoIpLocation? location, String accountId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, DateTime? expiredAt, int stepRemain, int stepTotal, int failedAttempts, int type, List<String> blacklistFactors, List<dynamic> audiences, List<dynamic> scopes, String ipAddress, String userAgent, String? nonce, GeoIpLocation? location, String accountId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });
 
 
@@ -846,11 +846,11 @@ class __$SnAuthChallengeCopyWithImpl<$Res>
 
 /// Create a copy of SnAuthChallenge
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? expiredAt = null,Object? stepRemain = null,Object? stepTotal = null,Object? failedAttempts = null,Object? type = null,Object? blacklistFactors = null,Object? audiences = null,Object? scopes = null,Object? ipAddress = null,Object? userAgent = null,Object? nonce = freezed,Object? location = freezed,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? expiredAt = freezed,Object? stepRemain = null,Object? stepTotal = null,Object? failedAttempts = null,Object? type = null,Object? blacklistFactors = null,Object? audiences = null,Object? scopes = null,Object? ipAddress = null,Object? userAgent = null,Object? nonce = freezed,Object? location = freezed,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
   return _then(_SnAuthChallenge(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
-as String,expiredAt: null == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
-as DateTime,stepRemain: null == stepRemain ? _self.stepRemain : stepRemain // ignore: cast_nullable_to_non_nullable
+as String,expiredAt: freezed == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,stepRemain: null == stepRemain ? _self.stepRemain : stepRemain // ignore: cast_nullable_to_non_nullable
 as int,stepTotal: null == stepTotal ? _self.stepTotal : stepTotal // ignore: cast_nullable_to_non_nullable
 as int,failedAttempts: null == failedAttempts ? _self.failedAttempts : failedAttempts // ignore: cast_nullable_to_non_nullable
 as int,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
@@ -888,7 +888,7 @@ $GeoIpLocationCopyWith<$Res>? get location {
 /// @nodoc
 mixin _$SnAuthSession {
 
- String get id; String? get label; DateTime get lastGrantedAt; DateTime get expiredAt; String get accountId; String get challengeId; SnAuthChallenge get challenge; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
+ String get id; String? get label; DateTime get lastGrantedAt; DateTime? get expiredAt; String get accountId; String get challengeId; SnAuthChallenge get challenge; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
 /// Create a copy of SnAuthSession
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -921,7 +921,7 @@ abstract mixin class $SnAuthSessionCopyWith<$Res>  {
   factory $SnAuthSessionCopyWith(SnAuthSession value, $Res Function(SnAuthSession) _then) = _$SnAuthSessionCopyWithImpl;
 @useResult
 $Res call({
- String id, String? label, DateTime lastGrantedAt, DateTime expiredAt, String accountId, String challengeId, SnAuthChallenge challenge, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, String? label, DateTime lastGrantedAt, DateTime? expiredAt, String accountId, String challengeId, SnAuthChallenge challenge, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });
 
 
@@ -938,13 +938,13 @@ class _$SnAuthSessionCopyWithImpl<$Res>
 
 /// Create a copy of SnAuthSession
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? label = freezed,Object? lastGrantedAt = null,Object? expiredAt = null,Object? accountId = null,Object? challengeId = null,Object? challenge = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? label = freezed,Object? lastGrantedAt = null,Object? expiredAt = freezed,Object? accountId = null,Object? challengeId = null,Object? challenge = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
   return _then(_self.copyWith(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,label: freezed == label ? _self.label : label // ignore: cast_nullable_to_non_nullable
 as String?,lastGrantedAt: null == lastGrantedAt ? _self.lastGrantedAt : lastGrantedAt // ignore: cast_nullable_to_non_nullable
-as DateTime,expiredAt: null == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
-as DateTime,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as DateTime,expiredAt: freezed == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
 as String,challengeId: null == challengeId ? _self.challengeId : challengeId // ignore: cast_nullable_to_non_nullable
 as String,challenge: null == challenge ? _self.challenge : challenge // ignore: cast_nullable_to_non_nullable
 as SnAuthChallenge,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
@@ -1041,7 +1041,7 @@ return $default(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String? label,  DateTime lastGrantedAt,  DateTime expiredAt,  String accountId,  String challengeId,  SnAuthChallenge challenge,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String? label,  DateTime lastGrantedAt,  DateTime? expiredAt,  String accountId,  String challengeId,  SnAuthChallenge challenge,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _SnAuthSession() when $default != null:
 return $default(_that.id,_that.label,_that.lastGrantedAt,_that.expiredAt,_that.accountId,_that.challengeId,_that.challenge,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
@@ -1062,7 +1062,7 @@ return $default(_that.id,_that.label,_that.lastGrantedAt,_that.expiredAt,_that.a
 /// }
 /// ```
 
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String? label,  DateTime lastGrantedAt,  DateTime expiredAt,  String accountId,  String challengeId,  SnAuthChallenge challenge,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String? label,  DateTime lastGrantedAt,  DateTime? expiredAt,  String accountId,  String challengeId,  SnAuthChallenge challenge,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
 switch (_that) {
 case _SnAuthSession():
 return $default(_that.id,_that.label,_that.lastGrantedAt,_that.expiredAt,_that.accountId,_that.challengeId,_that.challenge,_that.createdAt,_that.updatedAt,_that.deletedAt);}
@@ -1079,7 +1079,7 @@ return $default(_that.id,_that.label,_that.lastGrantedAt,_that.expiredAt,_that.a
 /// }
 /// ```
 
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String? label,  DateTime lastGrantedAt,  DateTime expiredAt,  String accountId,  String challengeId,  SnAuthChallenge challenge,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String? label,  DateTime lastGrantedAt,  DateTime? expiredAt,  String accountId,  String challengeId,  SnAuthChallenge challenge,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
 switch (_that) {
 case _SnAuthSession() when $default != null:
 return $default(_that.id,_that.label,_that.lastGrantedAt,_that.expiredAt,_that.accountId,_that.challengeId,_that.challenge,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
@@ -1100,7 +1100,7 @@ class _SnAuthSession implements SnAuthSession {
 @override final  String id;
 @override final  String? label;
 @override final  DateTime lastGrantedAt;
-@override final  DateTime expiredAt;
+@override final  DateTime? expiredAt;
 @override final  String accountId;
 @override final  String challengeId;
 @override final  SnAuthChallenge challenge;
@@ -1141,7 +1141,7 @@ abstract mixin class _$SnAuthSessionCopyWith<$Res> implements $SnAuthSessionCopy
   factory _$SnAuthSessionCopyWith(_SnAuthSession value, $Res Function(_SnAuthSession) _then) = __$SnAuthSessionCopyWithImpl;
 @override @useResult
 $Res call({
- String id, String? label, DateTime lastGrantedAt, DateTime expiredAt, String accountId, String challengeId, SnAuthChallenge challenge, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, String? label, DateTime lastGrantedAt, DateTime? expiredAt, String accountId, String challengeId, SnAuthChallenge challenge, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });
 
 
@@ -1158,13 +1158,13 @@ class __$SnAuthSessionCopyWithImpl<$Res>
 
 /// Create a copy of SnAuthSession
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? label = freezed,Object? lastGrantedAt = null,Object? expiredAt = null,Object? accountId = null,Object? challengeId = null,Object? challenge = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? label = freezed,Object? lastGrantedAt = null,Object? expiredAt = freezed,Object? accountId = null,Object? challengeId = null,Object? challenge = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
   return _then(_SnAuthSession(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,label: freezed == label ? _self.label : label // ignore: cast_nullable_to_non_nullable
 as String?,lastGrantedAt: null == lastGrantedAt ? _self.lastGrantedAt : lastGrantedAt // ignore: cast_nullable_to_non_nullable
-as DateTime,expiredAt: null == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
-as DateTime,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as DateTime,expiredAt: freezed == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
 as String,challengeId: null == challengeId ? _self.challengeId : challengeId // ignore: cast_nullable_to_non_nullable
 as String,challenge: null == challenge ? _self.challenge : challenge // ignore: cast_nullable_to_non_nullable
 as SnAuthChallenge,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable

lib/models/auth.g.dart

@@ -15,11 +15,11 @@ Map<String, dynamic> _$AppTokenToJson(_AppToken instance) => <String, dynamic>{
 
 _GeoIpLocation _$GeoIpLocationFromJson(Map<String, dynamic> json) =>
     _GeoIpLocation(
-      latitude: (json['latitude'] as num).toDouble(),
-      longitude: (json['longitude'] as num).toDouble(),
-      countryCode: json['country_code'] as String,
-      country: json['country'] as String,
-      city: json['city'] as String,
+      latitude: (json['latitude'] as num?)?.toDouble(),
+      longitude: (json['longitude'] as num?)?.toDouble(),
+      countryCode: json['country_code'] as String?,
+      country: json['country'] as String?,
+      city: json['city'] as String?,
     );
 
 Map<String, dynamic> _$GeoIpLocationToJson(_GeoIpLocation instance) =>
@@ -34,7 +34,10 @@ Map<String, dynamic> _$GeoIpLocationToJson(_GeoIpLocation instance) =>
 _SnAuthChallenge _$SnAuthChallengeFromJson(Map<String, dynamic> json) =>
     _SnAuthChallenge(
       id: json['id'] as String,
-      expiredAt: DateTime.parse(json['expired_at'] as String),
+      expiredAt:
+          json['expired_at'] == null
+              ? null
+              : DateTime.parse(json['expired_at'] as String),
       stepRemain: (json['step_remain'] as num).toInt(),
       stepTotal: (json['step_total'] as num).toInt(),
       failedAttempts: (json['failed_attempts'] as num).toInt(),
@@ -66,7 +69,7 @@ _SnAuthChallenge _$SnAuthChallengeFromJson(Map<String, dynamic> json) =>
 Map<String, dynamic> _$SnAuthChallengeToJson(_SnAuthChallenge instance) =>
     <String, dynamic>{
       'id': instance.id,
-      'expired_at': instance.expiredAt.toIso8601String(),
+      'expired_at': instance.expiredAt?.toIso8601String(),
       'step_remain': instance.stepRemain,
       'step_total': instance.stepTotal,
       'failed_attempts': instance.failedAttempts,
@@ -89,7 +92,10 @@ _SnAuthSession _$SnAuthSessionFromJson(Map<String, dynamic> json) =>
       id: json['id'] as String,
       label: json['label'] as String?,
       lastGrantedAt: DateTime.parse(json['last_granted_at'] as String),
-      expiredAt: DateTime.parse(json['expired_at'] as String),
+      expiredAt:
+          json['expired_at'] == null
+              ? null
+              : DateTime.parse(json['expired_at'] as String),
       accountId: json['account_id'] as String,
       challengeId: json['challenge_id'] as String,
       challenge: SnAuthChallenge.fromJson(
@@ -108,7 +114,7 @@ Map<String, dynamic> _$SnAuthSessionToJson(_SnAuthSession instance) =>
       'id': instance.id,
       'label': instance.label,
       'last_granted_at': instance.lastGrantedAt.toIso8601String(),
-      'expired_at': instance.expiredAt.toIso8601String(),
+      'expired_at': instance.expiredAt?.toIso8601String(),
       'account_id': instance.accountId,
       'challenge_id': instance.challengeId,
       'challenge': instance.challenge.toJson(),

lib/models/file_pool.dart

@@ -0,0 +1,53 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'file_pool.freezed.dart';
+part 'file_pool.g.dart';
+
+@freezed
+sealed class SnFilePool with _$SnFilePool {
+  const factory SnFilePool({
+    required String id,
+    required String name,
+    String? description,
+    Map<String, dynamic>? storageConfig,
+    Map<String, dynamic>? billingConfig,
+    Map<String, dynamic>? policyConfig,
+    bool? isHidden,
+    String? accountId,
+    String? resourceIdentifier,
+    DateTime? createdAt,
+    DateTime? updatedAt,
+    DateTime? deletedAt,
+  }) = _SnFilePool;
+
+  factory SnFilePool.fromJson(Map<String, dynamic> json) =>
+      _$SnFilePoolFromJson(json);
+}
+
+extension SnFilePoolList on List<SnFilePool> {
+  static List<SnFilePool> listFromResponse(dynamic data) {
+    if (data is List) {
+      return data
+          .whereType<Map<String, dynamic>>()
+          .map(SnFilePool.fromJson)
+          .toList();
+    }
+    throw ArgumentError('Unexpected response format: $data');
+  }
+
+  List<SnFilePool> filterValid() {
+    return where((p) {
+      final accept = p.policyConfig?['accept_types'];
+
+      if (accept is List) {
+        final acceptsOnlyMedia = accept.every((t) =>
+            t is String &&
+            (t.startsWith('image/') ||
+                t.startsWith('video/') ||
+                t.startsWith('audio/')));
+        if (acceptsOnlyMedia) return false;
+      }
+      return true;
+    }).toList();
+  }
+}

lib/models/file_pool.freezed.dart

@@ -0,0 +1,328 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'file_pool.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+
+/// @nodoc
+mixin _$SnFilePool {
+
+ String get id; String get name; String? get description; Map<String, dynamic>? get storageConfig; Map<String, dynamic>? get billingConfig; Map<String, dynamic>? get policyConfig; bool? get isHidden; String? get accountId; String? get resourceIdentifier; DateTime? get createdAt; DateTime? get updatedAt; DateTime? get deletedAt;
+/// Create a copy of SnFilePool
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$SnFilePoolCopyWith<SnFilePool> get copyWith => _$SnFilePoolCopyWithImpl<SnFilePool>(this as SnFilePool, _$identity);
+
+  /// Serializes this SnFilePool to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnFilePool&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.description, description) || other.description == description)&&const DeepCollectionEquality().equals(other.storageConfig, storageConfig)&&const DeepCollectionEquality().equals(other.billingConfig, billingConfig)&&const DeepCollectionEquality().equals(other.policyConfig, policyConfig)&&(identical(other.isHidden, isHidden) || other.isHidden == isHidden)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.resourceIdentifier, resourceIdentifier) || other.resourceIdentifier == resourceIdentifier)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,name,description,const DeepCollectionEquality().hash(storageConfig),const DeepCollectionEquality().hash(billingConfig),const DeepCollectionEquality().hash(policyConfig),isHidden,accountId,resourceIdentifier,createdAt,updatedAt,deletedAt);
+
+@override
+String toString() {
+  return 'SnFilePool(id: $id, name: $name, description: $description, storageConfig: $storageConfig, billingConfig: $billingConfig, policyConfig: $policyConfig, isHidden: $isHidden, accountId: $accountId, resourceIdentifier: $resourceIdentifier, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $SnFilePoolCopyWith<$Res>  {
+  factory $SnFilePoolCopyWith(SnFilePool value, $Res Function(SnFilePool) _then) = _$SnFilePoolCopyWithImpl;
+@useResult
+$Res call({
+ String id, String name, String? description, Map<String, dynamic>? storageConfig, Map<String, dynamic>? billingConfig, Map<String, dynamic>? policyConfig, bool? isHidden, String? accountId, String? resourceIdentifier, DateTime? createdAt, DateTime? updatedAt, DateTime? deletedAt
+});
+
+
+
+
+}
+/// @nodoc
+class _$SnFilePoolCopyWithImpl<$Res>
+    implements $SnFilePoolCopyWith<$Res> {
+  _$SnFilePoolCopyWithImpl(this._self, this._then);
+
+  final SnFilePool _self;
+  final $Res Function(SnFilePool) _then;
+
+/// Create a copy of SnFilePool
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? name = null,Object? description = freezed,Object? storageConfig = freezed,Object? billingConfig = freezed,Object? policyConfig = freezed,Object? isHidden = freezed,Object? accountId = freezed,Object? resourceIdentifier = freezed,Object? createdAt = freezed,Object? updatedAt = freezed,Object? deletedAt = freezed,}) {
+  return _then(_self.copyWith(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
+as String,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
+as String?,storageConfig: freezed == storageConfig ? _self.storageConfig : storageConfig // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,billingConfig: freezed == billingConfig ? _self.billingConfig : billingConfig // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,policyConfig: freezed == policyConfig ? _self.policyConfig : policyConfig // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,isHidden: freezed == isHidden ? _self.isHidden : isHidden // ignore: cast_nullable_to_non_nullable
+as bool?,accountId: freezed == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as String?,resourceIdentifier: freezed == resourceIdentifier ? _self.resourceIdentifier : resourceIdentifier // ignore: cast_nullable_to_non_nullable
+as String?,createdAt: freezed == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,updatedAt: freezed == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [SnFilePool].
+extension SnFilePoolPatterns on SnFilePool {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _SnFilePool value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _SnFilePool() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _SnFilePool value)  $default,){
+final _that = this;
+switch (_that) {
+case _SnFilePool():
+return $default(_that);}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _SnFilePool value)?  $default,){
+final _that = this;
+switch (_that) {
+case _SnFilePool() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String name,  String? description,  Map<String, dynamic>? storageConfig,  Map<String, dynamic>? billingConfig,  Map<String, dynamic>? policyConfig,  bool? isHidden,  String? accountId,  String? resourceIdentifier,  DateTime? createdAt,  DateTime? updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _SnFilePool() when $default != null:
+return $default(_that.id,_that.name,_that.description,_that.storageConfig,_that.billingConfig,_that.policyConfig,_that.isHidden,_that.accountId,_that.resourceIdentifier,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String name,  String? description,  Map<String, dynamic>? storageConfig,  Map<String, dynamic>? billingConfig,  Map<String, dynamic>? policyConfig,  bool? isHidden,  String? accountId,  String? resourceIdentifier,  DateTime? createdAt,  DateTime? updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
+switch (_that) {
+case _SnFilePool():
+return $default(_that.id,_that.name,_that.description,_that.storageConfig,_that.billingConfig,_that.policyConfig,_that.isHidden,_that.accountId,_that.resourceIdentifier,_that.createdAt,_that.updatedAt,_that.deletedAt);}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String name,  String? description,  Map<String, dynamic>? storageConfig,  Map<String, dynamic>? billingConfig,  Map<String, dynamic>? policyConfig,  bool? isHidden,  String? accountId,  String? resourceIdentifier,  DateTime? createdAt,  DateTime? updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
+switch (_that) {
+case _SnFilePool() when $default != null:
+return $default(_that.id,_that.name,_that.description,_that.storageConfig,_that.billingConfig,_that.policyConfig,_that.isHidden,_that.accountId,_that.resourceIdentifier,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _SnFilePool implements SnFilePool {
+  const _SnFilePool({required this.id, required this.name, this.description, final  Map<String, dynamic>? storageConfig, final  Map<String, dynamic>? billingConfig, final  Map<String, dynamic>? policyConfig, this.isHidden, this.accountId, this.resourceIdentifier, this.createdAt, this.updatedAt, this.deletedAt}): _storageConfig = storageConfig,_billingConfig = billingConfig,_policyConfig = policyConfig;
+  factory _SnFilePool.fromJson(Map<String, dynamic> json) => _$SnFilePoolFromJson(json);
+
+@override final  String id;
+@override final  String name;
+@override final  String? description;
+ final  Map<String, dynamic>? _storageConfig;
+@override Map<String, dynamic>? get storageConfig {
+  final value = _storageConfig;
+  if (value == null) return null;
+  if (_storageConfig is EqualUnmodifiableMapView) return _storageConfig;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableMapView(value);
+}
+
+ final  Map<String, dynamic>? _billingConfig;
+@override Map<String, dynamic>? get billingConfig {
+  final value = _billingConfig;
+  if (value == null) return null;
+  if (_billingConfig is EqualUnmodifiableMapView) return _billingConfig;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableMapView(value);
+}
+
+ final  Map<String, dynamic>? _policyConfig;
+@override Map<String, dynamic>? get policyConfig {
+  final value = _policyConfig;
+  if (value == null) return null;
+  if (_policyConfig is EqualUnmodifiableMapView) return _policyConfig;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableMapView(value);
+}
+
+@override final  bool? isHidden;
+@override final  String? accountId;
+@override final  String? resourceIdentifier;
+@override final  DateTime? createdAt;
+@override final  DateTime? updatedAt;
+@override final  DateTime? deletedAt;
+
+/// Create a copy of SnFilePool
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$SnFilePoolCopyWith<_SnFilePool> get copyWith => __$SnFilePoolCopyWithImpl<_SnFilePool>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$SnFilePoolToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnFilePool&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.description, description) || other.description == description)&&const DeepCollectionEquality().equals(other._storageConfig, _storageConfig)&&const DeepCollectionEquality().equals(other._billingConfig, _billingConfig)&&const DeepCollectionEquality().equals(other._policyConfig, _policyConfig)&&(identical(other.isHidden, isHidden) || other.isHidden == isHidden)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.resourceIdentifier, resourceIdentifier) || other.resourceIdentifier == resourceIdentifier)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,name,description,const DeepCollectionEquality().hash(_storageConfig),const DeepCollectionEquality().hash(_billingConfig),const DeepCollectionEquality().hash(_policyConfig),isHidden,accountId,resourceIdentifier,createdAt,updatedAt,deletedAt);
+
+@override
+String toString() {
+  return 'SnFilePool(id: $id, name: $name, description: $description, storageConfig: $storageConfig, billingConfig: $billingConfig, policyConfig: $policyConfig, isHidden: $isHidden, accountId: $accountId, resourceIdentifier: $resourceIdentifier, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$SnFilePoolCopyWith<$Res> implements $SnFilePoolCopyWith<$Res> {
+  factory _$SnFilePoolCopyWith(_SnFilePool value, $Res Function(_SnFilePool) _then) = __$SnFilePoolCopyWithImpl;
+@override @useResult
+$Res call({
+ String id, String name, String? description, Map<String, dynamic>? storageConfig, Map<String, dynamic>? billingConfig, Map<String, dynamic>? policyConfig, bool? isHidden, String? accountId, String? resourceIdentifier, DateTime? createdAt, DateTime? updatedAt, DateTime? deletedAt
+});
+
+
+
+
+}
+/// @nodoc
+class __$SnFilePoolCopyWithImpl<$Res>
+    implements _$SnFilePoolCopyWith<$Res> {
+  __$SnFilePoolCopyWithImpl(this._self, this._then);
+
+  final _SnFilePool _self;
+  final $Res Function(_SnFilePool) _then;
+
+/// Create a copy of SnFilePool
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? name = null,Object? description = freezed,Object? storageConfig = freezed,Object? billingConfig = freezed,Object? policyConfig = freezed,Object? isHidden = freezed,Object? accountId = freezed,Object? resourceIdentifier = freezed,Object? createdAt = freezed,Object? updatedAt = freezed,Object? deletedAt = freezed,}) {
+  return _then(_SnFilePool(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
+as String,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
+as String?,storageConfig: freezed == storageConfig ? _self._storageConfig : storageConfig // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,billingConfig: freezed == billingConfig ? _self._billingConfig : billingConfig // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,policyConfig: freezed == policyConfig ? _self._policyConfig : policyConfig // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,isHidden: freezed == isHidden ? _self.isHidden : isHidden // ignore: cast_nullable_to_non_nullable
+as bool?,accountId: freezed == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as String?,resourceIdentifier: freezed == resourceIdentifier ? _self.resourceIdentifier : resourceIdentifier // ignore: cast_nullable_to_non_nullable
+as String?,createdAt: freezed == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,updatedAt: freezed == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,
+  ));
+}
+
+
+}
+
+// dart format on

lib/models/file_pool.g.dart

@@ -0,0 +1,47 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'file_pool.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_SnFilePool _$SnFilePoolFromJson(Map<String, dynamic> json) => _SnFilePool(
+  id: json['id'] as String,
+  name: json['name'] as String,
+  description: json['description'] as String?,
+  storageConfig: json['storage_config'] as Map<String, dynamic>?,
+  billingConfig: json['billing_config'] as Map<String, dynamic>?,
+  policyConfig: json['policy_config'] as Map<String, dynamic>?,
+  isHidden: json['is_hidden'] as bool?,
+  accountId: json['account_id'] as String?,
+  resourceIdentifier: json['resource_identifier'] as String?,
+  createdAt:
+      json['created_at'] == null
+          ? null
+          : DateTime.parse(json['created_at'] as String),
+  updatedAt:
+      json['updated_at'] == null
+          ? null
+          : DateTime.parse(json['updated_at'] as String),
+  deletedAt:
+      json['deleted_at'] == null
+          ? null
+          : DateTime.parse(json['deleted_at'] as String),
+);
+
+Map<String, dynamic> _$SnFilePoolToJson(_SnFilePool instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'name': instance.name,
+      'description': instance.description,
+      'storage_config': instance.storageConfig,
+      'billing_config': instance.billingConfig,
+      'policy_config': instance.policyConfig,
+      'is_hidden': instance.isHidden,
+      'account_id': instance.accountId,
+      'resource_identifier': instance.resourceIdentifier,
+      'created_at': instance.createdAt?.toIso8601String(),
+      'updated_at': instance.updatedAt?.toIso8601String(),
+      'deleted_at': instance.deletedAt?.toIso8601String(),
+    };

lib/models/poll.dart

@@ -1,4 +1,5 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:island/models/account.dart';
 import 'package:island/models/publisher.dart';
 
 part 'poll.freezed.dart';
@@ -101,6 +102,7 @@ sealed class SnPollAnswer with _$SnPollAnswer {
     required DateTime createdAt,
     required DateTime updatedAt,
     required DateTime? deletedAt,
+    SnAccount? account,
   }) = _SnPollAnswer;
 
   factory SnPollAnswer.fromJson(Map<String, dynamic> json) =>

lib/models/poll.freezed.dart

@@ -1187,7 +1187,7 @@ as int,
 /// @nodoc
 mixin _$SnPollAnswer {
 
- String get id; Map<String, dynamic> get answer; String get accountId; String get pollId; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
+ String get id; Map<String, dynamic> get answer; String get accountId; String get pollId; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt; SnAccount? get account;
 /// Create a copy of SnPollAnswer
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -1200,16 +1200,16 @@ $SnPollAnswerCopyWith<SnPollAnswer> get copyWith => _$SnPollAnswerCopyWithImpl<S
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnPollAnswer&&(identical(other.id, id) || other.id == id)&&const DeepCollectionEquality().equals(other.answer, answer)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.pollId, pollId) || other.pollId == pollId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnPollAnswer&&(identical(other.id, id) || other.id == id)&&const DeepCollectionEquality().equals(other.answer, answer)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.pollId, pollId) || other.pollId == pollId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&(identical(other.account, account) || other.account == account));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hash(runtimeType,id,const DeepCollectionEquality().hash(answer),accountId,pollId,createdAt,updatedAt,deletedAt);
+int get hashCode => Object.hash(runtimeType,id,const DeepCollectionEquality().hash(answer),accountId,pollId,createdAt,updatedAt,deletedAt,account);
 
 @override
 String toString() {
-  return 'SnPollAnswer(id: $id, answer: $answer, accountId: $accountId, pollId: $pollId, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+  return 'SnPollAnswer(id: $id, answer: $answer, accountId: $accountId, pollId: $pollId, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, account: $account)';
 }
 
 
@@ -1220,11 +1220,11 @@ abstract mixin class $SnPollAnswerCopyWith<$Res>  {
   factory $SnPollAnswerCopyWith(SnPollAnswer value, $Res Function(SnPollAnswer) _then) = _$SnPollAnswerCopyWithImpl;
 @useResult
 $Res call({
- String id, Map<String, dynamic> answer, String accountId, String pollId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, Map<String, dynamic> answer, String accountId, String pollId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, SnAccount? account
 });
 
 
-
+$SnAccountCopyWith<$Res>? get account;
 
 }
 /// @nodoc
@@ -1237,7 +1237,7 @@ class _$SnPollAnswerCopyWithImpl<$Res>
 
 /// Create a copy of SnPollAnswer
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? answer = null,Object? accountId = null,Object? pollId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? answer = null,Object? accountId = null,Object? pollId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? account = freezed,}) {
   return _then(_self.copyWith(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,answer: null == answer ? _self.answer : answer // ignore: cast_nullable_to_non_nullable
@@ -1246,10 +1246,23 @@ as String,pollId: null == pollId ? _self.pollId : pollId // ignore: cast_nullabl
 as String,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
 as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
 as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
-as DateTime?,
+as DateTime?,account: freezed == account ? _self.account : account // ignore: cast_nullable_to_non_nullable
+as SnAccount?,
   ));
 }
+/// Create a copy of SnPollAnswer
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnAccountCopyWith<$Res>? get account {
+    if (_self.account == null) {
+    return null;
+  }
 
+  return $SnAccountCopyWith<$Res>(_self.account!, (value) {
+    return _then(_self.copyWith(account: value));
+  });
+}
 }
 
 
@@ -1328,10 +1341,10 @@ return $default(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  Map<String, dynamic> answer,  String accountId,  String pollId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  Map<String, dynamic> answer,  String accountId,  String pollId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt,  SnAccount? account)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _SnPollAnswer() when $default != null:
-return $default(_that.id,_that.answer,_that.accountId,_that.pollId,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+return $default(_that.id,_that.answer,_that.accountId,_that.pollId,_that.createdAt,_that.updatedAt,_that.deletedAt,_that.account);case _:
   return orElse();
 
 }
@@ -1349,10 +1362,10 @@ return $default(_that.id,_that.answer,_that.accountId,_that.pollId,_that.created
 /// }
 /// ```
 
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  Map<String, dynamic> answer,  String accountId,  String pollId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  Map<String, dynamic> answer,  String accountId,  String pollId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt,  SnAccount? account)  $default,) {final _that = this;
 switch (_that) {
 case _SnPollAnswer():
-return $default(_that.id,_that.answer,_that.accountId,_that.pollId,_that.createdAt,_that.updatedAt,_that.deletedAt);}
+return $default(_that.id,_that.answer,_that.accountId,_that.pollId,_that.createdAt,_that.updatedAt,_that.deletedAt,_that.account);}
 }
 /// A variant of `when` that fallback to returning `null`
 ///
@@ -1366,10 +1379,10 @@ return $default(_that.id,_that.answer,_that.accountId,_that.pollId,_that.created
 /// }
 /// ```
 
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  Map<String, dynamic> answer,  String accountId,  String pollId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  Map<String, dynamic> answer,  String accountId,  String pollId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt,  SnAccount? account)?  $default,) {final _that = this;
 switch (_that) {
 case _SnPollAnswer() when $default != null:
-return $default(_that.id,_that.answer,_that.accountId,_that.pollId,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+return $default(_that.id,_that.answer,_that.accountId,_that.pollId,_that.createdAt,_that.updatedAt,_that.deletedAt,_that.account);case _:
   return null;
 
 }
@@ -1381,7 +1394,7 @@ return $default(_that.id,_that.answer,_that.accountId,_that.pollId,_that.created
 @JsonSerializable()
 
 class _SnPollAnswer implements SnPollAnswer {
-  const _SnPollAnswer({required this.id, required final  Map<String, dynamic> answer, required this.accountId, required this.pollId, required this.createdAt, required this.updatedAt, required this.deletedAt}): _answer = answer;
+  const _SnPollAnswer({required this.id, required final  Map<String, dynamic> answer, required this.accountId, required this.pollId, required this.createdAt, required this.updatedAt, required this.deletedAt, this.account}): _answer = answer;
   factory _SnPollAnswer.fromJson(Map<String, dynamic> json) => _$SnPollAnswerFromJson(json);
 
 @override final  String id;
@@ -1397,6 +1410,7 @@ class _SnPollAnswer implements SnPollAnswer {
 @override final  DateTime createdAt;
 @override final  DateTime updatedAt;
 @override final  DateTime? deletedAt;
+@override final  SnAccount? account;
 
 /// Create a copy of SnPollAnswer
 /// with the given fields replaced by the non-null parameter values.
@@ -1411,16 +1425,16 @@ Map<String, dynamic> toJson() {
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnPollAnswer&&(identical(other.id, id) || other.id == id)&&const DeepCollectionEquality().equals(other._answer, _answer)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.pollId, pollId) || other.pollId == pollId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnPollAnswer&&(identical(other.id, id) || other.id == id)&&const DeepCollectionEquality().equals(other._answer, _answer)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.pollId, pollId) || other.pollId == pollId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&(identical(other.account, account) || other.account == account));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hash(runtimeType,id,const DeepCollectionEquality().hash(_answer),accountId,pollId,createdAt,updatedAt,deletedAt);
+int get hashCode => Object.hash(runtimeType,id,const DeepCollectionEquality().hash(_answer),accountId,pollId,createdAt,updatedAt,deletedAt,account);
 
 @override
 String toString() {
-  return 'SnPollAnswer(id: $id, answer: $answer, accountId: $accountId, pollId: $pollId, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+  return 'SnPollAnswer(id: $id, answer: $answer, accountId: $accountId, pollId: $pollId, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, account: $account)';
 }
 
 
@@ -1431,11 +1445,11 @@ abstract mixin class _$SnPollAnswerCopyWith<$Res> implements $SnPollAnswerCopyWi
   factory _$SnPollAnswerCopyWith(_SnPollAnswer value, $Res Function(_SnPollAnswer) _then) = __$SnPollAnswerCopyWithImpl;
 @override @useResult
 $Res call({
- String id, Map<String, dynamic> answer, String accountId, String pollId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, Map<String, dynamic> answer, String accountId, String pollId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, SnAccount? account
 });
 
 
-
+@override $SnAccountCopyWith<$Res>? get account;
 
 }
 /// @nodoc
@@ -1448,7 +1462,7 @@ class __$SnPollAnswerCopyWithImpl<$Res>
 
 /// Create a copy of SnPollAnswer
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? answer = null,Object? accountId = null,Object? pollId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? answer = null,Object? accountId = null,Object? pollId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? account = freezed,}) {
   return _then(_SnPollAnswer(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,answer: null == answer ? _self._answer : answer // ignore: cast_nullable_to_non_nullable
@@ -1457,11 +1471,24 @@ as String,pollId: null == pollId ? _self.pollId : pollId // ignore: cast_nullabl
 as String,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
 as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
 as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
-as DateTime?,
+as DateTime?,account: freezed == account ? _self.account : account // ignore: cast_nullable_to_non_nullable
+as SnAccount?,
   ));
 }
 
+/// Create a copy of SnPollAnswer
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnAccountCopyWith<$Res>? get account {
+    if (_self.account == null) {
+    return null;
+  }
 
+  return $SnAccountCopyWith<$Res>(_self.account!, (value) {
+    return _then(_self.copyWith(account: value));
+  });
+}
 }
 
 // dart format on

lib/models/poll.g.dart

@@ -144,6 +144,10 @@ _SnPollAnswer _$SnPollAnswerFromJson(Map<String, dynamic> json) =>
           json['deleted_at'] == null
               ? null
               : DateTime.parse(json['deleted_at'] as String),
+      account:
+          json['account'] == null
+              ? null
+              : SnAccount.fromJson(json['account'] as Map<String, dynamic>),
     );
 
 Map<String, dynamic> _$SnPollAnswerToJson(_SnPollAnswer instance) =>
@@ -155,4 +159,5 @@ Map<String, dynamic> _$SnPollAnswerToJson(_SnPollAnswer instance) =>
       'created_at': instance.createdAt.toIso8601String(),
       'updated_at': instance.updatedAt.toIso8601String(),
       'deleted_at': instance.deletedAt?.toIso8601String(),
+      'account': instance.account?.toJson(),
     };

lib/models/post.dart

@@ -22,11 +22,13 @@ sealed class SnPost with _$SnPost {
     String? slug,
     @Default(0) int type,
     Map<String, dynamic>? meta,
+    SnPostEmbedView? embedView,
     @Default(0) int viewsUnique,
     @Default(0) int viewsTotal,
     @Default(0) int upvotes,
     @Default(0) int downvotes,
     @Default(0) int repliesCount,
+    @Default(0) int awardedScore,
     int? pinMode,
     String? threadedPostId,
     SnPost? threadedPost,
@@ -105,3 +107,38 @@ const Map<String, ReactInfo> kReactionTemplates = {
   'pray': ReactInfo(icon: '🙏', attitude: 0),
   'heart': ReactInfo(icon: '❤️', attitude: 0),
 };
+
+enum PostEmbedViewRenderer {
+  @JsonValue(0)
+  webView,
+}
+
+@freezed
+sealed class SnPostEmbedView with _$SnPostEmbedView {
+  const factory SnPostEmbedView({
+    required String uri,
+    double? aspectRatio,
+    @Default(PostEmbedViewRenderer.webView) PostEmbedViewRenderer renderer,
+  }) = _SnPostEmbedView;
+
+  factory SnPostEmbedView.fromJson(Map<String, dynamic> json) =>
+      _$SnPostEmbedViewFromJson(json);
+}
+
+@freezed
+sealed class SnPostAward with _$SnPostAward {
+  const factory SnPostAward({
+    required String id,
+    required double amount,
+    required int attitude,
+    String? message,
+    required String postId,
+    required String accountId,
+    @Default(null) DateTime? createdAt,
+    @Default(null) DateTime? updatedAt,
+    DateTime? deletedAt,
+  }) = _SnPostAward;
+
+  factory SnPostAward.fromJson(Map<String, dynamic> json) =>
+      _$SnPostAwardFromJson(json);
+}

lib/models/post.freezed.dart

@@ -15,7 +15,7 @@ T _$identity<T>(T value) => value;
 /// @nodoc
 mixin _$SnPost {
 
- String get id; String? get title; String? get description; String? get language; DateTime? get editedAt; DateTime? get publishedAt; int get visibility; String? get content; String? get slug; int get type; Map<String, dynamic>? get meta; int get viewsUnique; int get viewsTotal; int get upvotes; int get downvotes; int get repliesCount; int? get pinMode; String? get threadedPostId; SnPost? get threadedPost; String? get repliedPostId; SnPost? get repliedPost; String? get forwardedPostId; SnPost? get forwardedPost; String? get realmId; SnRealm? get realm; List<SnCloudFile> get attachments; SnPublisher get publisher; Map<String, int> get reactionsCount; Map<String, bool> get reactionsMade; List<dynamic> get reactions; List<SnPostTag> get tags; List<SnPostCategory> get categories; List<dynamic> get collections; DateTime? get createdAt; DateTime? get updatedAt; DateTime? get deletedAt; bool get isTruncated;
+ String get id; String? get title; String? get description; String? get language; DateTime? get editedAt; DateTime? get publishedAt; int get visibility; String? get content; String? get slug; int get type; Map<String, dynamic>? get meta; SnPostEmbedView? get embedView; int get viewsUnique; int get viewsTotal; int get upvotes; int get downvotes; int get repliesCount; int get awardedScore; int? get pinMode; String? get threadedPostId; SnPost? get threadedPost; String? get repliedPostId; SnPost? get repliedPost; String? get forwardedPostId; SnPost? get forwardedPost; String? get realmId; SnRealm? get realm; List<SnCloudFile> get attachments; SnPublisher get publisher; Map<String, int> get reactionsCount; Map<String, bool> get reactionsMade; List<dynamic> get reactions; List<SnPostTag> get tags; List<SnPostCategory> get categories; List<dynamic> get collections; DateTime? get createdAt; DateTime? get updatedAt; DateTime? get deletedAt; bool get isTruncated;
 /// Create a copy of SnPost
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -28,16 +28,16 @@ $SnPostCopyWith<SnPost> get copyWith => _$SnPostCopyWithImpl<SnPost>(this as SnP
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnPost&&(identical(other.id, id) || other.id == id)&&(identical(other.title, title) || other.title == title)&&(identical(other.description, description) || other.description == description)&&(identical(other.language, language) || other.language == language)&&(identical(other.editedAt, editedAt) || other.editedAt == editedAt)&&(identical(other.publishedAt, publishedAt) || other.publishedAt == publishedAt)&&(identical(other.visibility, visibility) || other.visibility == visibility)&&(identical(other.content, content) || other.content == content)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.type, type) || other.type == type)&&const DeepCollectionEquality().equals(other.meta, meta)&&(identical(other.viewsUnique, viewsUnique) || other.viewsUnique == viewsUnique)&&(identical(other.viewsTotal, viewsTotal) || other.viewsTotal == viewsTotal)&&(identical(other.upvotes, upvotes) || other.upvotes == upvotes)&&(identical(other.downvotes, downvotes) || other.downvotes == downvotes)&&(identical(other.repliesCount, repliesCount) || other.repliesCount == repliesCount)&&(identical(other.pinMode, pinMode) || other.pinMode == pinMode)&&(identical(other.threadedPostId, threadedPostId) || other.threadedPostId == threadedPostId)&&(identical(other.threadedPost, threadedPost) || other.threadedPost == threadedPost)&&(identical(other.repliedPostId, repliedPostId) || other.repliedPostId == repliedPostId)&&(identical(other.repliedPost, repliedPost) || other.repliedPost == repliedPost)&&(identical(other.forwardedPostId, forwardedPostId) || other.forwardedPostId == forwardedPostId)&&(identical(other.forwardedPost, forwardedPost) || other.forwardedPost == forwardedPost)&&(identical(other.realmId, realmId) || other.realmId == realmId)&&(identical(other.realm, realm) || other.realm == realm)&&const DeepCollectionEquality().equals(other.attachments, attachments)&&(identical(other.publisher, publisher) || other.publisher == publisher)&&const DeepCollectionEquality().equals(other.reactionsCount, reactionsCount)&&const DeepCollectionEquality().equals(other.reactionsMade, reactionsMade)&&const DeepCollectionEquality().equals(other.reactions, reactions)&&const DeepCollectionEquality().equals(other.tags, tags)&&const DeepCollectionEquality().equals(other.categories, categories)&&const DeepCollectionEquality().equals(other.collections, collections)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&(identical(other.isTruncated, isTruncated) || other.isTruncated == isTruncated));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnPost&&(identical(other.id, id) || other.id == id)&&(identical(other.title, title) || other.title == title)&&(identical(other.description, description) || other.description == description)&&(identical(other.language, language) || other.language == language)&&(identical(other.editedAt, editedAt) || other.editedAt == editedAt)&&(identical(other.publishedAt, publishedAt) || other.publishedAt == publishedAt)&&(identical(other.visibility, visibility) || other.visibility == visibility)&&(identical(other.content, content) || other.content == content)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.type, type) || other.type == type)&&const DeepCollectionEquality().equals(other.meta, meta)&&(identical(other.embedView, embedView) || other.embedView == embedView)&&(identical(other.viewsUnique, viewsUnique) || other.viewsUnique == viewsUnique)&&(identical(other.viewsTotal, viewsTotal) || other.viewsTotal == viewsTotal)&&(identical(other.upvotes, upvotes) || other.upvotes == upvotes)&&(identical(other.downvotes, downvotes) || other.downvotes == downvotes)&&(identical(other.repliesCount, repliesCount) || other.repliesCount == repliesCount)&&(identical(other.awardedScore, awardedScore) || other.awardedScore == awardedScore)&&(identical(other.pinMode, pinMode) || other.pinMode == pinMode)&&(identical(other.threadedPostId, threadedPostId) || other.threadedPostId == threadedPostId)&&(identical(other.threadedPost, threadedPost) || other.threadedPost == threadedPost)&&(identical(other.repliedPostId, repliedPostId) || other.repliedPostId == repliedPostId)&&(identical(other.repliedPost, repliedPost) || other.repliedPost == repliedPost)&&(identical(other.forwardedPostId, forwardedPostId) || other.forwardedPostId == forwardedPostId)&&(identical(other.forwardedPost, forwardedPost) || other.forwardedPost == forwardedPost)&&(identical(other.realmId, realmId) || other.realmId == realmId)&&(identical(other.realm, realm) || other.realm == realm)&&const DeepCollectionEquality().equals(other.attachments, attachments)&&(identical(other.publisher, publisher) || other.publisher == publisher)&&const DeepCollectionEquality().equals(other.reactionsCount, reactionsCount)&&const DeepCollectionEquality().equals(other.reactionsMade, reactionsMade)&&const DeepCollectionEquality().equals(other.reactions, reactions)&&const DeepCollectionEquality().equals(other.tags, tags)&&const DeepCollectionEquality().equals(other.categories, categories)&&const DeepCollectionEquality().equals(other.collections, collections)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&(identical(other.isTruncated, isTruncated) || other.isTruncated == isTruncated));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hashAll([runtimeType,id,title,description,language,editedAt,publishedAt,visibility,content,slug,type,const DeepCollectionEquality().hash(meta),viewsUnique,viewsTotal,upvotes,downvotes,repliesCount,pinMode,threadedPostId,threadedPost,repliedPostId,repliedPost,forwardedPostId,forwardedPost,realmId,realm,const DeepCollectionEquality().hash(attachments),publisher,const DeepCollectionEquality().hash(reactionsCount),const DeepCollectionEquality().hash(reactionsMade),const DeepCollectionEquality().hash(reactions),const DeepCollectionEquality().hash(tags),const DeepCollectionEquality().hash(categories),const DeepCollectionEquality().hash(collections),createdAt,updatedAt,deletedAt,isTruncated]);
+int get hashCode => Object.hashAll([runtimeType,id,title,description,language,editedAt,publishedAt,visibility,content,slug,type,const DeepCollectionEquality().hash(meta),embedView,viewsUnique,viewsTotal,upvotes,downvotes,repliesCount,awardedScore,pinMode,threadedPostId,threadedPost,repliedPostId,repliedPost,forwardedPostId,forwardedPost,realmId,realm,const DeepCollectionEquality().hash(attachments),publisher,const DeepCollectionEquality().hash(reactionsCount),const DeepCollectionEquality().hash(reactionsMade),const DeepCollectionEquality().hash(reactions),const DeepCollectionEquality().hash(tags),const DeepCollectionEquality().hash(categories),const DeepCollectionEquality().hash(collections),createdAt,updatedAt,deletedAt,isTruncated]);
 
 @override
 String toString() {
-  return 'SnPost(id: $id, title: $title, description: $description, language: $language, editedAt: $editedAt, publishedAt: $publishedAt, visibility: $visibility, content: $content, slug: $slug, type: $type, meta: $meta, viewsUnique: $viewsUnique, viewsTotal: $viewsTotal, upvotes: $upvotes, downvotes: $downvotes, repliesCount: $repliesCount, pinMode: $pinMode, threadedPostId: $threadedPostId, threadedPost: $threadedPost, repliedPostId: $repliedPostId, repliedPost: $repliedPost, forwardedPostId: $forwardedPostId, forwardedPost: $forwardedPost, realmId: $realmId, realm: $realm, attachments: $attachments, publisher: $publisher, reactionsCount: $reactionsCount, reactionsMade: $reactionsMade, reactions: $reactions, tags: $tags, categories: $categories, collections: $collections, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, isTruncated: $isTruncated)';
+  return 'SnPost(id: $id, title: $title, description: $description, language: $language, editedAt: $editedAt, publishedAt: $publishedAt, visibility: $visibility, content: $content, slug: $slug, type: $type, meta: $meta, embedView: $embedView, viewsUnique: $viewsUnique, viewsTotal: $viewsTotal, upvotes: $upvotes, downvotes: $downvotes, repliesCount: $repliesCount, awardedScore: $awardedScore, pinMode: $pinMode, threadedPostId: $threadedPostId, threadedPost: $threadedPost, repliedPostId: $repliedPostId, repliedPost: $repliedPost, forwardedPostId: $forwardedPostId, forwardedPost: $forwardedPost, realmId: $realmId, realm: $realm, attachments: $attachments, publisher: $publisher, reactionsCount: $reactionsCount, reactionsMade: $reactionsMade, reactions: $reactions, tags: $tags, categories: $categories, collections: $collections, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, isTruncated: $isTruncated)';
 }
 
 
@@ -48,11 +48,11 @@ abstract mixin class $SnPostCopyWith<$Res>  {
   factory $SnPostCopyWith(SnPost value, $Res Function(SnPost) _then) = _$SnPostCopyWithImpl;
 @useResult
 $Res call({
- String id, String? title, String? description, String? language, DateTime? editedAt, DateTime? publishedAt, int visibility, String? content, String? slug, int type, Map<String, dynamic>? meta, int viewsUnique, int viewsTotal, int upvotes, int downvotes, int repliesCount, int? pinMode, String? threadedPostId, SnPost? threadedPost, String? repliedPostId, SnPost? repliedPost, String? forwardedPostId, SnPost? forwardedPost, String? realmId, SnRealm? realm, List<SnCloudFile> attachments, SnPublisher publisher, Map<String, int> reactionsCount, Map<String, bool> reactionsMade, List<dynamic> reactions, List<SnPostTag> tags, List<SnPostCategory> categories, List<dynamic> collections, DateTime? createdAt, DateTime? updatedAt, DateTime? deletedAt, bool isTruncated
+ String id, String? title, String? description, String? language, DateTime? editedAt, DateTime? publishedAt, int visibility, String? content, String? slug, int type, Map<String, dynamic>? meta, SnPostEmbedView? embedView, int viewsUnique, int viewsTotal, int upvotes, int downvotes, int repliesCount, int awardedScore, int? pinMode, String? threadedPostId, SnPost? threadedPost, String? repliedPostId, SnPost? repliedPost, String? forwardedPostId, SnPost? forwardedPost, String? realmId, SnRealm? realm, List<SnCloudFile> attachments, SnPublisher publisher, Map<String, int> reactionsCount, Map<String, bool> reactionsMade, List<dynamic> reactions, List<SnPostTag> tags, List<SnPostCategory> categories, List<dynamic> collections, DateTime? createdAt, DateTime? updatedAt, DateTime? deletedAt, bool isTruncated
 });
 
 
-$SnPostCopyWith<$Res>? get threadedPost;$SnPostCopyWith<$Res>? get repliedPost;$SnPostCopyWith<$Res>? get forwardedPost;$SnRealmCopyWith<$Res>? get realm;$SnPublisherCopyWith<$Res> get publisher;
+$SnPostEmbedViewCopyWith<$Res>? get embedView;$SnPostCopyWith<$Res>? get threadedPost;$SnPostCopyWith<$Res>? get repliedPost;$SnPostCopyWith<$Res>? get forwardedPost;$SnRealmCopyWith<$Res>? get realm;$SnPublisherCopyWith<$Res> get publisher;
 
 }
 /// @nodoc
@@ -65,7 +65,7 @@ class _$SnPostCopyWithImpl<$Res>
 
 /// Create a copy of SnPost
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? title = freezed,Object? description = freezed,Object? language = freezed,Object? editedAt = freezed,Object? publishedAt = freezed,Object? visibility = null,Object? content = freezed,Object? slug = freezed,Object? type = null,Object? meta = freezed,Object? viewsUnique = null,Object? viewsTotal = null,Object? upvotes = null,Object? downvotes = null,Object? repliesCount = null,Object? pinMode = freezed,Object? threadedPostId = freezed,Object? threadedPost = freezed,Object? repliedPostId = freezed,Object? repliedPost = freezed,Object? forwardedPostId = freezed,Object? forwardedPost = freezed,Object? realmId = freezed,Object? realm = freezed,Object? attachments = null,Object? publisher = null,Object? reactionsCount = null,Object? reactionsMade = null,Object? reactions = null,Object? tags = null,Object? categories = null,Object? collections = null,Object? createdAt = freezed,Object? updatedAt = freezed,Object? deletedAt = freezed,Object? isTruncated = null,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? title = freezed,Object? description = freezed,Object? language = freezed,Object? editedAt = freezed,Object? publishedAt = freezed,Object? visibility = null,Object? content = freezed,Object? slug = freezed,Object? type = null,Object? meta = freezed,Object? embedView = freezed,Object? viewsUnique = null,Object? viewsTotal = null,Object? upvotes = null,Object? downvotes = null,Object? repliesCount = null,Object? awardedScore = null,Object? pinMode = freezed,Object? threadedPostId = freezed,Object? threadedPost = freezed,Object? repliedPostId = freezed,Object? repliedPost = freezed,Object? forwardedPostId = freezed,Object? forwardedPost = freezed,Object? realmId = freezed,Object? realm = freezed,Object? attachments = null,Object? publisher = null,Object? reactionsCount = null,Object? reactionsMade = null,Object? reactions = null,Object? tags = null,Object? categories = null,Object? collections = null,Object? createdAt = freezed,Object? updatedAt = freezed,Object? deletedAt = freezed,Object? isTruncated = null,}) {
   return _then(_self.copyWith(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,title: freezed == title ? _self.title : title // ignore: cast_nullable_to_non_nullable
@@ -78,11 +78,13 @@ as int,content: freezed == content ? _self.content : content // ignore: cast_nul
 as String?,slug: freezed == slug ? _self.slug : slug // ignore: cast_nullable_to_non_nullable
 as String?,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
 as int,meta: freezed == meta ? _self.meta : meta // ignore: cast_nullable_to_non_nullable
-as Map<String, dynamic>?,viewsUnique: null == viewsUnique ? _self.viewsUnique : viewsUnique // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,embedView: freezed == embedView ? _self.embedView : embedView // ignore: cast_nullable_to_non_nullable
+as SnPostEmbedView?,viewsUnique: null == viewsUnique ? _self.viewsUnique : viewsUnique // ignore: cast_nullable_to_non_nullable
 as int,viewsTotal: null == viewsTotal ? _self.viewsTotal : viewsTotal // ignore: cast_nullable_to_non_nullable
 as int,upvotes: null == upvotes ? _self.upvotes : upvotes // ignore: cast_nullable_to_non_nullable
 as int,downvotes: null == downvotes ? _self.downvotes : downvotes // ignore: cast_nullable_to_non_nullable
 as int,repliesCount: null == repliesCount ? _self.repliesCount : repliesCount // ignore: cast_nullable_to_non_nullable
+as int,awardedScore: null == awardedScore ? _self.awardedScore : awardedScore // ignore: cast_nullable_to_non_nullable
 as int,pinMode: freezed == pinMode ? _self.pinMode : pinMode // ignore: cast_nullable_to_non_nullable
 as int?,threadedPostId: freezed == threadedPostId ? _self.threadedPostId : threadedPostId // ignore: cast_nullable_to_non_nullable
 as String?,threadedPost: freezed == threadedPost ? _self.threadedPost : threadedPost // ignore: cast_nullable_to_non_nullable
@@ -111,6 +113,18 @@ as bool,
 /// with the given fields replaced by the non-null parameter values.
 @override
 @pragma('vm:prefer-inline')
+$SnPostEmbedViewCopyWith<$Res>? get embedView {
+    if (_self.embedView == null) {
+    return null;
+  }
+
+  return $SnPostEmbedViewCopyWith<$Res>(_self.embedView!, (value) {
+    return _then(_self.copyWith(embedView: value));
+  });
+}/// Create a copy of SnPost
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
 $SnPostCopyWith<$Res>? get threadedPost {
     if (_self.threadedPost == null) {
     return null;
@@ -243,10 +257,10 @@ return $default(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String? title,  String? description,  String? language,  DateTime? editedAt,  DateTime? publishedAt,  int visibility,  String? content,  String? slug,  int type,  Map<String, dynamic>? meta,  int viewsUnique,  int viewsTotal,  int upvotes,  int downvotes,  int repliesCount,  int? pinMode,  String? threadedPostId,  SnPost? threadedPost,  String? repliedPostId,  SnPost? repliedPost,  String? forwardedPostId,  SnPost? forwardedPost,  String? realmId,  SnRealm? realm,  List<SnCloudFile> attachments,  SnPublisher publisher,  Map<String, int> reactionsCount,  Map<String, bool> reactionsMade,  List<dynamic> reactions,  List<SnPostTag> tags,  List<SnPostCategory> categories,  List<dynamic> collections,  DateTime? createdAt,  DateTime? updatedAt,  DateTime? deletedAt,  bool isTruncated)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String? title,  String? description,  String? language,  DateTime? editedAt,  DateTime? publishedAt,  int visibility,  String? content,  String? slug,  int type,  Map<String, dynamic>? meta,  SnPostEmbedView? embedView,  int viewsUnique,  int viewsTotal,  int upvotes,  int downvotes,  int repliesCount,  int awardedScore,  int? pinMode,  String? threadedPostId,  SnPost? threadedPost,  String? repliedPostId,  SnPost? repliedPost,  String? forwardedPostId,  SnPost? forwardedPost,  String? realmId,  SnRealm? realm,  List<SnCloudFile> attachments,  SnPublisher publisher,  Map<String, int> reactionsCount,  Map<String, bool> reactionsMade,  List<dynamic> reactions,  List<SnPostTag> tags,  List<SnPostCategory> categories,  List<dynamic> collections,  DateTime? createdAt,  DateTime? updatedAt,  DateTime? deletedAt,  bool isTruncated)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _SnPost() when $default != null:
-return $default(_that.id,_that.title,_that.description,_that.language,_that.editedAt,_that.publishedAt,_that.visibility,_that.content,_that.slug,_that.type,_that.meta,_that.viewsUnique,_that.viewsTotal,_that.upvotes,_that.downvotes,_that.repliesCount,_that.pinMode,_that.threadedPostId,_that.threadedPost,_that.repliedPostId,_that.repliedPost,_that.forwardedPostId,_that.forwardedPost,_that.realmId,_that.realm,_that.attachments,_that.publisher,_that.reactionsCount,_that.reactionsMade,_that.reactions,_that.tags,_that.categories,_that.collections,_that.createdAt,_that.updatedAt,_that.deletedAt,_that.isTruncated);case _:
+return $default(_that.id,_that.title,_that.description,_that.language,_that.editedAt,_that.publishedAt,_that.visibility,_that.content,_that.slug,_that.type,_that.meta,_that.embedView,_that.viewsUnique,_that.viewsTotal,_that.upvotes,_that.downvotes,_that.repliesCount,_that.awardedScore,_that.pinMode,_that.threadedPostId,_that.threadedPost,_that.repliedPostId,_that.repliedPost,_that.forwardedPostId,_that.forwardedPost,_that.realmId,_that.realm,_that.attachments,_that.publisher,_that.reactionsCount,_that.reactionsMade,_that.reactions,_that.tags,_that.categories,_that.collections,_that.createdAt,_that.updatedAt,_that.deletedAt,_that.isTruncated);case _:
   return orElse();
 
 }
@@ -264,10 +278,10 @@ return $default(_that.id,_that.title,_that.description,_that.language,_that.edit
 /// }
 /// ```
 
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String? title,  String? description,  String? language,  DateTime? editedAt,  DateTime? publishedAt,  int visibility,  String? content,  String? slug,  int type,  Map<String, dynamic>? meta,  int viewsUnique,  int viewsTotal,  int upvotes,  int downvotes,  int repliesCount,  int? pinMode,  String? threadedPostId,  SnPost? threadedPost,  String? repliedPostId,  SnPost? repliedPost,  String? forwardedPostId,  SnPost? forwardedPost,  String? realmId,  SnRealm? realm,  List<SnCloudFile> attachments,  SnPublisher publisher,  Map<String, int> reactionsCount,  Map<String, bool> reactionsMade,  List<dynamic> reactions,  List<SnPostTag> tags,  List<SnPostCategory> categories,  List<dynamic> collections,  DateTime? createdAt,  DateTime? updatedAt,  DateTime? deletedAt,  bool isTruncated)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String? title,  String? description,  String? language,  DateTime? editedAt,  DateTime? publishedAt,  int visibility,  String? content,  String? slug,  int type,  Map<String, dynamic>? meta,  SnPostEmbedView? embedView,  int viewsUnique,  int viewsTotal,  int upvotes,  int downvotes,  int repliesCount,  int awardedScore,  int? pinMode,  String? threadedPostId,  SnPost? threadedPost,  String? repliedPostId,  SnPost? repliedPost,  String? forwardedPostId,  SnPost? forwardedPost,  String? realmId,  SnRealm? realm,  List<SnCloudFile> attachments,  SnPublisher publisher,  Map<String, int> reactionsCount,  Map<String, bool> reactionsMade,  List<dynamic> reactions,  List<SnPostTag> tags,  List<SnPostCategory> categories,  List<dynamic> collections,  DateTime? createdAt,  DateTime? updatedAt,  DateTime? deletedAt,  bool isTruncated)  $default,) {final _that = this;
 switch (_that) {
 case _SnPost():
-return $default(_that.id,_that.title,_that.description,_that.language,_that.editedAt,_that.publishedAt,_that.visibility,_that.content,_that.slug,_that.type,_that.meta,_that.viewsUnique,_that.viewsTotal,_that.upvotes,_that.downvotes,_that.repliesCount,_that.pinMode,_that.threadedPostId,_that.threadedPost,_that.repliedPostId,_that.repliedPost,_that.forwardedPostId,_that.forwardedPost,_that.realmId,_that.realm,_that.attachments,_that.publisher,_that.reactionsCount,_that.reactionsMade,_that.reactions,_that.tags,_that.categories,_that.collections,_that.createdAt,_that.updatedAt,_that.deletedAt,_that.isTruncated);}
+return $default(_that.id,_that.title,_that.description,_that.language,_that.editedAt,_that.publishedAt,_that.visibility,_that.content,_that.slug,_that.type,_that.meta,_that.embedView,_that.viewsUnique,_that.viewsTotal,_that.upvotes,_that.downvotes,_that.repliesCount,_that.awardedScore,_that.pinMode,_that.threadedPostId,_that.threadedPost,_that.repliedPostId,_that.repliedPost,_that.forwardedPostId,_that.forwardedPost,_that.realmId,_that.realm,_that.attachments,_that.publisher,_that.reactionsCount,_that.reactionsMade,_that.reactions,_that.tags,_that.categories,_that.collections,_that.createdAt,_that.updatedAt,_that.deletedAt,_that.isTruncated);}
 }
 /// A variant of `when` that fallback to returning `null`
 ///
@@ -281,10 +295,10 @@ return $default(_that.id,_that.title,_that.description,_that.language,_that.edit
 /// }
 /// ```
 
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String? title,  String? description,  String? language,  DateTime? editedAt,  DateTime? publishedAt,  int visibility,  String? content,  String? slug,  int type,  Map<String, dynamic>? meta,  int viewsUnique,  int viewsTotal,  int upvotes,  int downvotes,  int repliesCount,  int? pinMode,  String? threadedPostId,  SnPost? threadedPost,  String? repliedPostId,  SnPost? repliedPost,  String? forwardedPostId,  SnPost? forwardedPost,  String? realmId,  SnRealm? realm,  List<SnCloudFile> attachments,  SnPublisher publisher,  Map<String, int> reactionsCount,  Map<String, bool> reactionsMade,  List<dynamic> reactions,  List<SnPostTag> tags,  List<SnPostCategory> categories,  List<dynamic> collections,  DateTime? createdAt,  DateTime? updatedAt,  DateTime? deletedAt,  bool isTruncated)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String? title,  String? description,  String? language,  DateTime? editedAt,  DateTime? publishedAt,  int visibility,  String? content,  String? slug,  int type,  Map<String, dynamic>? meta,  SnPostEmbedView? embedView,  int viewsUnique,  int viewsTotal,  int upvotes,  int downvotes,  int repliesCount,  int awardedScore,  int? pinMode,  String? threadedPostId,  SnPost? threadedPost,  String? repliedPostId,  SnPost? repliedPost,  String? forwardedPostId,  SnPost? forwardedPost,  String? realmId,  SnRealm? realm,  List<SnCloudFile> attachments,  SnPublisher publisher,  Map<String, int> reactionsCount,  Map<String, bool> reactionsMade,  List<dynamic> reactions,  List<SnPostTag> tags,  List<SnPostCategory> categories,  List<dynamic> collections,  DateTime? createdAt,  DateTime? updatedAt,  DateTime? deletedAt,  bool isTruncated)?  $default,) {final _that = this;
 switch (_that) {
 case _SnPost() when $default != null:
-return $default(_that.id,_that.title,_that.description,_that.language,_that.editedAt,_that.publishedAt,_that.visibility,_that.content,_that.slug,_that.type,_that.meta,_that.viewsUnique,_that.viewsTotal,_that.upvotes,_that.downvotes,_that.repliesCount,_that.pinMode,_that.threadedPostId,_that.threadedPost,_that.repliedPostId,_that.repliedPost,_that.forwardedPostId,_that.forwardedPost,_that.realmId,_that.realm,_that.attachments,_that.publisher,_that.reactionsCount,_that.reactionsMade,_that.reactions,_that.tags,_that.categories,_that.collections,_that.createdAt,_that.updatedAt,_that.deletedAt,_that.isTruncated);case _:
+return $default(_that.id,_that.title,_that.description,_that.language,_that.editedAt,_that.publishedAt,_that.visibility,_that.content,_that.slug,_that.type,_that.meta,_that.embedView,_that.viewsUnique,_that.viewsTotal,_that.upvotes,_that.downvotes,_that.repliesCount,_that.awardedScore,_that.pinMode,_that.threadedPostId,_that.threadedPost,_that.repliedPostId,_that.repliedPost,_that.forwardedPostId,_that.forwardedPost,_that.realmId,_that.realm,_that.attachments,_that.publisher,_that.reactionsCount,_that.reactionsMade,_that.reactions,_that.tags,_that.categories,_that.collections,_that.createdAt,_that.updatedAt,_that.deletedAt,_that.isTruncated);case _:
   return null;
 
 }
@@ -296,7 +310,7 @@ return $default(_that.id,_that.title,_that.description,_that.language,_that.edit
 @JsonSerializable()
 
 class _SnPost implements SnPost {
-  const _SnPost({required this.id, this.title, this.description, this.language, this.editedAt, this.publishedAt = null, this.visibility = 0, this.content, this.slug, this.type = 0, final  Map<String, dynamic>? meta, this.viewsUnique = 0, this.viewsTotal = 0, this.upvotes = 0, this.downvotes = 0, this.repliesCount = 0, this.pinMode, this.threadedPostId, this.threadedPost, this.repliedPostId, this.repliedPost, this.forwardedPostId, this.forwardedPost, this.realmId, this.realm, final  List<SnCloudFile> attachments = const [], required this.publisher, final  Map<String, int> reactionsCount = const {}, final  Map<String, bool> reactionsMade = const {}, final  List<dynamic> reactions = const [], final  List<SnPostTag> tags = const [], final  List<SnPostCategory> categories = const [], final  List<dynamic> collections = const [], this.createdAt = null, this.updatedAt = null, this.deletedAt, this.isTruncated = false}): _meta = meta,_attachments = attachments,_reactionsCount = reactionsCount,_reactionsMade = reactionsMade,_reactions = reactions,_tags = tags,_categories = categories,_collections = collections;
+  const _SnPost({required this.id, this.title, this.description, this.language, this.editedAt, this.publishedAt = null, this.visibility = 0, this.content, this.slug, this.type = 0, final  Map<String, dynamic>? meta, this.embedView, this.viewsUnique = 0, this.viewsTotal = 0, this.upvotes = 0, this.downvotes = 0, this.repliesCount = 0, this.awardedScore = 0, this.pinMode, this.threadedPostId, this.threadedPost, this.repliedPostId, this.repliedPost, this.forwardedPostId, this.forwardedPost, this.realmId, this.realm, final  List<SnCloudFile> attachments = const [], required this.publisher, final  Map<String, int> reactionsCount = const {}, final  Map<String, bool> reactionsMade = const {}, final  List<dynamic> reactions = const [], final  List<SnPostTag> tags = const [], final  List<SnPostCategory> categories = const [], final  List<dynamic> collections = const [], this.createdAt = null, this.updatedAt = null, this.deletedAt, this.isTruncated = false}): _meta = meta,_attachments = attachments,_reactionsCount = reactionsCount,_reactionsMade = reactionsMade,_reactions = reactions,_tags = tags,_categories = categories,_collections = collections;
   factory _SnPost.fromJson(Map<String, dynamic> json) => _$SnPostFromJson(json);
 
 @override final  String id;
@@ -318,11 +332,13 @@ class _SnPost implements SnPost {
   return EqualUnmodifiableMapView(value);
 }
 
+@override final  SnPostEmbedView? embedView;
 @override@JsonKey() final  int viewsUnique;
 @override@JsonKey() final  int viewsTotal;
 @override@JsonKey() final  int upvotes;
 @override@JsonKey() final  int downvotes;
 @override@JsonKey() final  int repliesCount;
+@override@JsonKey() final  int awardedScore;
 @override final  int? pinMode;
 @override final  String? threadedPostId;
 @override final  SnPost? threadedPost;
@@ -400,16 +416,16 @@ Map<String, dynamic> toJson() {
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnPost&&(identical(other.id, id) || other.id == id)&&(identical(other.title, title) || other.title == title)&&(identical(other.description, description) || other.description == description)&&(identical(other.language, language) || other.language == language)&&(identical(other.editedAt, editedAt) || other.editedAt == editedAt)&&(identical(other.publishedAt, publishedAt) || other.publishedAt == publishedAt)&&(identical(other.visibility, visibility) || other.visibility == visibility)&&(identical(other.content, content) || other.content == content)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.type, type) || other.type == type)&&const DeepCollectionEquality().equals(other._meta, _meta)&&(identical(other.viewsUnique, viewsUnique) || other.viewsUnique == viewsUnique)&&(identical(other.viewsTotal, viewsTotal) || other.viewsTotal == viewsTotal)&&(identical(other.upvotes, upvotes) || other.upvotes == upvotes)&&(identical(other.downvotes, downvotes) || other.downvotes == downvotes)&&(identical(other.repliesCount, repliesCount) || other.repliesCount == repliesCount)&&(identical(other.pinMode, pinMode) || other.pinMode == pinMode)&&(identical(other.threadedPostId, threadedPostId) || other.threadedPostId == threadedPostId)&&(identical(other.threadedPost, threadedPost) || other.threadedPost == threadedPost)&&(identical(other.repliedPostId, repliedPostId) || other.repliedPostId == repliedPostId)&&(identical(other.repliedPost, repliedPost) || other.repliedPost == repliedPost)&&(identical(other.forwardedPostId, forwardedPostId) || other.forwardedPostId == forwardedPostId)&&(identical(other.forwardedPost, forwardedPost) || other.forwardedPost == forwardedPost)&&(identical(other.realmId, realmId) || other.realmId == realmId)&&(identical(other.realm, realm) || other.realm == realm)&&const DeepCollectionEquality().equals(other._attachments, _attachments)&&(identical(other.publisher, publisher) || other.publisher == publisher)&&const DeepCollectionEquality().equals(other._reactionsCount, _reactionsCount)&&const DeepCollectionEquality().equals(other._reactionsMade, _reactionsMade)&&const DeepCollectionEquality().equals(other._reactions, _reactions)&&const DeepCollectionEquality().equals(other._tags, _tags)&&const DeepCollectionEquality().equals(other._categories, _categories)&&const DeepCollectionEquality().equals(other._collections, _collections)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&(identical(other.isTruncated, isTruncated) || other.isTruncated == isTruncated));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnPost&&(identical(other.id, id) || other.id == id)&&(identical(other.title, title) || other.title == title)&&(identical(other.description, description) || other.description == description)&&(identical(other.language, language) || other.language == language)&&(identical(other.editedAt, editedAt) || other.editedAt == editedAt)&&(identical(other.publishedAt, publishedAt) || other.publishedAt == publishedAt)&&(identical(other.visibility, visibility) || other.visibility == visibility)&&(identical(other.content, content) || other.content == content)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.type, type) || other.type == type)&&const DeepCollectionEquality().equals(other._meta, _meta)&&(identical(other.embedView, embedView) || other.embedView == embedView)&&(identical(other.viewsUnique, viewsUnique) || other.viewsUnique == viewsUnique)&&(identical(other.viewsTotal, viewsTotal) || other.viewsTotal == viewsTotal)&&(identical(other.upvotes, upvotes) || other.upvotes == upvotes)&&(identical(other.downvotes, downvotes) || other.downvotes == downvotes)&&(identical(other.repliesCount, repliesCount) || other.repliesCount == repliesCount)&&(identical(other.awardedScore, awardedScore) || other.awardedScore == awardedScore)&&(identical(other.pinMode, pinMode) || other.pinMode == pinMode)&&(identical(other.threadedPostId, threadedPostId) || other.threadedPostId == threadedPostId)&&(identical(other.threadedPost, threadedPost) || other.threadedPost == threadedPost)&&(identical(other.repliedPostId, repliedPostId) || other.repliedPostId == repliedPostId)&&(identical(other.repliedPost, repliedPost) || other.repliedPost == repliedPost)&&(identical(other.forwardedPostId, forwardedPostId) || other.forwardedPostId == forwardedPostId)&&(identical(other.forwardedPost, forwardedPost) || other.forwardedPost == forwardedPost)&&(identical(other.realmId, realmId) || other.realmId == realmId)&&(identical(other.realm, realm) || other.realm == realm)&&const DeepCollectionEquality().equals(other._attachments, _attachments)&&(identical(other.publisher, publisher) || other.publisher == publisher)&&const DeepCollectionEquality().equals(other._reactionsCount, _reactionsCount)&&const DeepCollectionEquality().equals(other._reactionsMade, _reactionsMade)&&const DeepCollectionEquality().equals(other._reactions, _reactions)&&const DeepCollectionEquality().equals(other._tags, _tags)&&const DeepCollectionEquality().equals(other._categories, _categories)&&const DeepCollectionEquality().equals(other._collections, _collections)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&(identical(other.isTruncated, isTruncated) || other.isTruncated == isTruncated));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hashAll([runtimeType,id,title,description,language,editedAt,publishedAt,visibility,content,slug,type,const DeepCollectionEquality().hash(_meta),viewsUnique,viewsTotal,upvotes,downvotes,repliesCount,pinMode,threadedPostId,threadedPost,repliedPostId,repliedPost,forwardedPostId,forwardedPost,realmId,realm,const DeepCollectionEquality().hash(_attachments),publisher,const DeepCollectionEquality().hash(_reactionsCount),const DeepCollectionEquality().hash(_reactionsMade),const DeepCollectionEquality().hash(_reactions),const DeepCollectionEquality().hash(_tags),const DeepCollectionEquality().hash(_categories),const DeepCollectionEquality().hash(_collections),createdAt,updatedAt,deletedAt,isTruncated]);
+int get hashCode => Object.hashAll([runtimeType,id,title,description,language,editedAt,publishedAt,visibility,content,slug,type,const DeepCollectionEquality().hash(_meta),embedView,viewsUnique,viewsTotal,upvotes,downvotes,repliesCount,awardedScore,pinMode,threadedPostId,threadedPost,repliedPostId,repliedPost,forwardedPostId,forwardedPost,realmId,realm,const DeepCollectionEquality().hash(_attachments),publisher,const DeepCollectionEquality().hash(_reactionsCount),const DeepCollectionEquality().hash(_reactionsMade),const DeepCollectionEquality().hash(_reactions),const DeepCollectionEquality().hash(_tags),const DeepCollectionEquality().hash(_categories),const DeepCollectionEquality().hash(_collections),createdAt,updatedAt,deletedAt,isTruncated]);
 
 @override
 String toString() {
-  return 'SnPost(id: $id, title: $title, description: $description, language: $language, editedAt: $editedAt, publishedAt: $publishedAt, visibility: $visibility, content: $content, slug: $slug, type: $type, meta: $meta, viewsUnique: $viewsUnique, viewsTotal: $viewsTotal, upvotes: $upvotes, downvotes: $downvotes, repliesCount: $repliesCount, pinMode: $pinMode, threadedPostId: $threadedPostId, threadedPost: $threadedPost, repliedPostId: $repliedPostId, repliedPost: $repliedPost, forwardedPostId: $forwardedPostId, forwardedPost: $forwardedPost, realmId: $realmId, realm: $realm, attachments: $attachments, publisher: $publisher, reactionsCount: $reactionsCount, reactionsMade: $reactionsMade, reactions: $reactions, tags: $tags, categories: $categories, collections: $collections, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, isTruncated: $isTruncated)';
+  return 'SnPost(id: $id, title: $title, description: $description, language: $language, editedAt: $editedAt, publishedAt: $publishedAt, visibility: $visibility, content: $content, slug: $slug, type: $type, meta: $meta, embedView: $embedView, viewsUnique: $viewsUnique, viewsTotal: $viewsTotal, upvotes: $upvotes, downvotes: $downvotes, repliesCount: $repliesCount, awardedScore: $awardedScore, pinMode: $pinMode, threadedPostId: $threadedPostId, threadedPost: $threadedPost, repliedPostId: $repliedPostId, repliedPost: $repliedPost, forwardedPostId: $forwardedPostId, forwardedPost: $forwardedPost, realmId: $realmId, realm: $realm, attachments: $attachments, publisher: $publisher, reactionsCount: $reactionsCount, reactionsMade: $reactionsMade, reactions: $reactions, tags: $tags, categories: $categories, collections: $collections, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, isTruncated: $isTruncated)';
 }
 
 
@@ -420,11 +436,11 @@ abstract mixin class _$SnPostCopyWith<$Res> implements $SnPostCopyWith<$Res> {
   factory _$SnPostCopyWith(_SnPost value, $Res Function(_SnPost) _then) = __$SnPostCopyWithImpl;
 @override @useResult
 $Res call({
- String id, String? title, String? description, String? language, DateTime? editedAt, DateTime? publishedAt, int visibility, String? content, String? slug, int type, Map<String, dynamic>? meta, int viewsUnique, int viewsTotal, int upvotes, int downvotes, int repliesCount, int? pinMode, String? threadedPostId, SnPost? threadedPost, String? repliedPostId, SnPost? repliedPost, String? forwardedPostId, SnPost? forwardedPost, String? realmId, SnRealm? realm, List<SnCloudFile> attachments, SnPublisher publisher, Map<String, int> reactionsCount, Map<String, bool> reactionsMade, List<dynamic> reactions, List<SnPostTag> tags, List<SnPostCategory> categories, List<dynamic> collections, DateTime? createdAt, DateTime? updatedAt, DateTime? deletedAt, bool isTruncated
+ String id, String? title, String? description, String? language, DateTime? editedAt, DateTime? publishedAt, int visibility, String? content, String? slug, int type, Map<String, dynamic>? meta, SnPostEmbedView? embedView, int viewsUnique, int viewsTotal, int upvotes, int downvotes, int repliesCount, int awardedScore, int? pinMode, String? threadedPostId, SnPost? threadedPost, String? repliedPostId, SnPost? repliedPost, String? forwardedPostId, SnPost? forwardedPost, String? realmId, SnRealm? realm, List<SnCloudFile> attachments, SnPublisher publisher, Map<String, int> reactionsCount, Map<String, bool> reactionsMade, List<dynamic> reactions, List<SnPostTag> tags, List<SnPostCategory> categories, List<dynamic> collections, DateTime? createdAt, DateTime? updatedAt, DateTime? deletedAt, bool isTruncated
 });
 
 
-@override $SnPostCopyWith<$Res>? get threadedPost;@override $SnPostCopyWith<$Res>? get repliedPost;@override $SnPostCopyWith<$Res>? get forwardedPost;@override $SnRealmCopyWith<$Res>? get realm;@override $SnPublisherCopyWith<$Res> get publisher;
+@override $SnPostEmbedViewCopyWith<$Res>? get embedView;@override $SnPostCopyWith<$Res>? get threadedPost;@override $SnPostCopyWith<$Res>? get repliedPost;@override $SnPostCopyWith<$Res>? get forwardedPost;@override $SnRealmCopyWith<$Res>? get realm;@override $SnPublisherCopyWith<$Res> get publisher;
 
 }
 /// @nodoc
@@ -437,7 +453,7 @@ class __$SnPostCopyWithImpl<$Res>
 
 /// Create a copy of SnPost
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? title = freezed,Object? description = freezed,Object? language = freezed,Object? editedAt = freezed,Object? publishedAt = freezed,Object? visibility = null,Object? content = freezed,Object? slug = freezed,Object? type = null,Object? meta = freezed,Object? viewsUnique = null,Object? viewsTotal = null,Object? upvotes = null,Object? downvotes = null,Object? repliesCount = null,Object? pinMode = freezed,Object? threadedPostId = freezed,Object? threadedPost = freezed,Object? repliedPostId = freezed,Object? repliedPost = freezed,Object? forwardedPostId = freezed,Object? forwardedPost = freezed,Object? realmId = freezed,Object? realm = freezed,Object? attachments = null,Object? publisher = null,Object? reactionsCount = null,Object? reactionsMade = null,Object? reactions = null,Object? tags = null,Object? categories = null,Object? collections = null,Object? createdAt = freezed,Object? updatedAt = freezed,Object? deletedAt = freezed,Object? isTruncated = null,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? title = freezed,Object? description = freezed,Object? language = freezed,Object? editedAt = freezed,Object? publishedAt = freezed,Object? visibility = null,Object? content = freezed,Object? slug = freezed,Object? type = null,Object? meta = freezed,Object? embedView = freezed,Object? viewsUnique = null,Object? viewsTotal = null,Object? upvotes = null,Object? downvotes = null,Object? repliesCount = null,Object? awardedScore = null,Object? pinMode = freezed,Object? threadedPostId = freezed,Object? threadedPost = freezed,Object? repliedPostId = freezed,Object? repliedPost = freezed,Object? forwardedPostId = freezed,Object? forwardedPost = freezed,Object? realmId = freezed,Object? realm = freezed,Object? attachments = null,Object? publisher = null,Object? reactionsCount = null,Object? reactionsMade = null,Object? reactions = null,Object? tags = null,Object? categories = null,Object? collections = null,Object? createdAt = freezed,Object? updatedAt = freezed,Object? deletedAt = freezed,Object? isTruncated = null,}) {
   return _then(_SnPost(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,title: freezed == title ? _self.title : title // ignore: cast_nullable_to_non_nullable
@@ -450,11 +466,13 @@ as int,content: freezed == content ? _self.content : content // ignore: cast_nul
 as String?,slug: freezed == slug ? _self.slug : slug // ignore: cast_nullable_to_non_nullable
 as String?,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
 as int,meta: freezed == meta ? _self._meta : meta // ignore: cast_nullable_to_non_nullable
-as Map<String, dynamic>?,viewsUnique: null == viewsUnique ? _self.viewsUnique : viewsUnique // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,embedView: freezed == embedView ? _self.embedView : embedView // ignore: cast_nullable_to_non_nullable
+as SnPostEmbedView?,viewsUnique: null == viewsUnique ? _self.viewsUnique : viewsUnique // ignore: cast_nullable_to_non_nullable
 as int,viewsTotal: null == viewsTotal ? _self.viewsTotal : viewsTotal // ignore: cast_nullable_to_non_nullable
 as int,upvotes: null == upvotes ? _self.upvotes : upvotes // ignore: cast_nullable_to_non_nullable
 as int,downvotes: null == downvotes ? _self.downvotes : downvotes // ignore: cast_nullable_to_non_nullable
 as int,repliesCount: null == repliesCount ? _self.repliesCount : repliesCount // ignore: cast_nullable_to_non_nullable
+as int,awardedScore: null == awardedScore ? _self.awardedScore : awardedScore // ignore: cast_nullable_to_non_nullable
 as int,pinMode: freezed == pinMode ? _self.pinMode : pinMode // ignore: cast_nullable_to_non_nullable
 as int?,threadedPostId: freezed == threadedPostId ? _self.threadedPostId : threadedPostId // ignore: cast_nullable_to_non_nullable
 as String?,threadedPost: freezed == threadedPost ? _self.threadedPost : threadedPost // ignore: cast_nullable_to_non_nullable
@@ -484,6 +502,18 @@ as bool,
 /// with the given fields replaced by the non-null parameter values.
 @override
 @pragma('vm:prefer-inline')
+$SnPostEmbedViewCopyWith<$Res>? get embedView {
+    if (_self.embedView == null) {
+    return null;
+  }
+
+  return $SnPostEmbedViewCopyWith<$Res>(_self.embedView!, (value) {
+    return _then(_self.copyWith(embedView: value));
+  });
+}/// Create a copy of SnPost
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
 $SnPostCopyWith<$Res>? get threadedPost {
     if (_self.threadedPost == null) {
     return null;
@@ -1324,6 +1354,550 @@ as int,
 }
 
 
+}
+
+
+/// @nodoc
+mixin _$SnPostEmbedView {
+
+ String get uri; double? get aspectRatio; PostEmbedViewRenderer get renderer;
+/// Create a copy of SnPostEmbedView
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$SnPostEmbedViewCopyWith<SnPostEmbedView> get copyWith => _$SnPostEmbedViewCopyWithImpl<SnPostEmbedView>(this as SnPostEmbedView, _$identity);
+
+  /// Serializes this SnPostEmbedView to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnPostEmbedView&&(identical(other.uri, uri) || other.uri == uri)&&(identical(other.aspectRatio, aspectRatio) || other.aspectRatio == aspectRatio)&&(identical(other.renderer, renderer) || other.renderer == renderer));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,uri,aspectRatio,renderer);
+
+@override
+String toString() {
+  return 'SnPostEmbedView(uri: $uri, aspectRatio: $aspectRatio, renderer: $renderer)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $SnPostEmbedViewCopyWith<$Res>  {
+  factory $SnPostEmbedViewCopyWith(SnPostEmbedView value, $Res Function(SnPostEmbedView) _then) = _$SnPostEmbedViewCopyWithImpl;
+@useResult
+$Res call({
+ String uri, double? aspectRatio, PostEmbedViewRenderer renderer
+});
+
+
+
+
+}
+/// @nodoc
+class _$SnPostEmbedViewCopyWithImpl<$Res>
+    implements $SnPostEmbedViewCopyWith<$Res> {
+  _$SnPostEmbedViewCopyWithImpl(this._self, this._then);
+
+  final SnPostEmbedView _self;
+  final $Res Function(SnPostEmbedView) _then;
+
+/// Create a copy of SnPostEmbedView
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? uri = null,Object? aspectRatio = freezed,Object? renderer = null,}) {
+  return _then(_self.copyWith(
+uri: null == uri ? _self.uri : uri // ignore: cast_nullable_to_non_nullable
+as String,aspectRatio: freezed == aspectRatio ? _self.aspectRatio : aspectRatio // ignore: cast_nullable_to_non_nullable
+as double?,renderer: null == renderer ? _self.renderer : renderer // ignore: cast_nullable_to_non_nullable
+as PostEmbedViewRenderer,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [SnPostEmbedView].
+extension SnPostEmbedViewPatterns on SnPostEmbedView {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _SnPostEmbedView value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _SnPostEmbedView() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _SnPostEmbedView value)  $default,){
+final _that = this;
+switch (_that) {
+case _SnPostEmbedView():
+return $default(_that);}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _SnPostEmbedView value)?  $default,){
+final _that = this;
+switch (_that) {
+case _SnPostEmbedView() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String uri,  double? aspectRatio,  PostEmbedViewRenderer renderer)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _SnPostEmbedView() when $default != null:
+return $default(_that.uri,_that.aspectRatio,_that.renderer);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String uri,  double? aspectRatio,  PostEmbedViewRenderer renderer)  $default,) {final _that = this;
+switch (_that) {
+case _SnPostEmbedView():
+return $default(_that.uri,_that.aspectRatio,_that.renderer);}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String uri,  double? aspectRatio,  PostEmbedViewRenderer renderer)?  $default,) {final _that = this;
+switch (_that) {
+case _SnPostEmbedView() when $default != null:
+return $default(_that.uri,_that.aspectRatio,_that.renderer);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _SnPostEmbedView implements SnPostEmbedView {
+  const _SnPostEmbedView({required this.uri, this.aspectRatio, this.renderer = PostEmbedViewRenderer.webView});
+  factory _SnPostEmbedView.fromJson(Map<String, dynamic> json) => _$SnPostEmbedViewFromJson(json);
+
+@override final  String uri;
+@override final  double? aspectRatio;
+@override@JsonKey() final  PostEmbedViewRenderer renderer;
+
+/// Create a copy of SnPostEmbedView
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$SnPostEmbedViewCopyWith<_SnPostEmbedView> get copyWith => __$SnPostEmbedViewCopyWithImpl<_SnPostEmbedView>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$SnPostEmbedViewToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnPostEmbedView&&(identical(other.uri, uri) || other.uri == uri)&&(identical(other.aspectRatio, aspectRatio) || other.aspectRatio == aspectRatio)&&(identical(other.renderer, renderer) || other.renderer == renderer));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,uri,aspectRatio,renderer);
+
+@override
+String toString() {
+  return 'SnPostEmbedView(uri: $uri, aspectRatio: $aspectRatio, renderer: $renderer)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$SnPostEmbedViewCopyWith<$Res> implements $SnPostEmbedViewCopyWith<$Res> {
+  factory _$SnPostEmbedViewCopyWith(_SnPostEmbedView value, $Res Function(_SnPostEmbedView) _then) = __$SnPostEmbedViewCopyWithImpl;
+@override @useResult
+$Res call({
+ String uri, double? aspectRatio, PostEmbedViewRenderer renderer
+});
+
+
+
+
+}
+/// @nodoc
+class __$SnPostEmbedViewCopyWithImpl<$Res>
+    implements _$SnPostEmbedViewCopyWith<$Res> {
+  __$SnPostEmbedViewCopyWithImpl(this._self, this._then);
+
+  final _SnPostEmbedView _self;
+  final $Res Function(_SnPostEmbedView) _then;
+
+/// Create a copy of SnPostEmbedView
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? uri = null,Object? aspectRatio = freezed,Object? renderer = null,}) {
+  return _then(_SnPostEmbedView(
+uri: null == uri ? _self.uri : uri // ignore: cast_nullable_to_non_nullable
+as String,aspectRatio: freezed == aspectRatio ? _self.aspectRatio : aspectRatio // ignore: cast_nullable_to_non_nullable
+as double?,renderer: null == renderer ? _self.renderer : renderer // ignore: cast_nullable_to_non_nullable
+as PostEmbedViewRenderer,
+  ));
+}
+
+
+}
+
+
+/// @nodoc
+mixin _$SnPostAward {
+
+ String get id; double get amount; int get attitude; String? get message; String get postId; String get accountId; DateTime? get createdAt; DateTime? get updatedAt; DateTime? get deletedAt;
+/// Create a copy of SnPostAward
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$SnPostAwardCopyWith<SnPostAward> get copyWith => _$SnPostAwardCopyWithImpl<SnPostAward>(this as SnPostAward, _$identity);
+
+  /// Serializes this SnPostAward to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnPostAward&&(identical(other.id, id) || other.id == id)&&(identical(other.amount, amount) || other.amount == amount)&&(identical(other.attitude, attitude) || other.attitude == attitude)&&(identical(other.message, message) || other.message == message)&&(identical(other.postId, postId) || other.postId == postId)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,amount,attitude,message,postId,accountId,createdAt,updatedAt,deletedAt);
+
+@override
+String toString() {
+  return 'SnPostAward(id: $id, amount: $amount, attitude: $attitude, message: $message, postId: $postId, accountId: $accountId, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $SnPostAwardCopyWith<$Res>  {
+  factory $SnPostAwardCopyWith(SnPostAward value, $Res Function(SnPostAward) _then) = _$SnPostAwardCopyWithImpl;
+@useResult
+$Res call({
+ String id, double amount, int attitude, String? message, String postId, String accountId, DateTime? createdAt, DateTime? updatedAt, DateTime? deletedAt
+});
+
+
+
+
+}
+/// @nodoc
+class _$SnPostAwardCopyWithImpl<$Res>
+    implements $SnPostAwardCopyWith<$Res> {
+  _$SnPostAwardCopyWithImpl(this._self, this._then);
+
+  final SnPostAward _self;
+  final $Res Function(SnPostAward) _then;
+
+/// Create a copy of SnPostAward
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? amount = null,Object? attitude = null,Object? message = freezed,Object? postId = null,Object? accountId = null,Object? createdAt = freezed,Object? updatedAt = freezed,Object? deletedAt = freezed,}) {
+  return _then(_self.copyWith(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,amount: null == amount ? _self.amount : amount // ignore: cast_nullable_to_non_nullable
+as double,attitude: null == attitude ? _self.attitude : attitude // ignore: cast_nullable_to_non_nullable
+as int,message: freezed == message ? _self.message : message // ignore: cast_nullable_to_non_nullable
+as String?,postId: null == postId ? _self.postId : postId // ignore: cast_nullable_to_non_nullable
+as String,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as String,createdAt: freezed == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,updatedAt: freezed == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [SnPostAward].
+extension SnPostAwardPatterns on SnPostAward {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _SnPostAward value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _SnPostAward() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _SnPostAward value)  $default,){
+final _that = this;
+switch (_that) {
+case _SnPostAward():
+return $default(_that);}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _SnPostAward value)?  $default,){
+final _that = this;
+switch (_that) {
+case _SnPostAward() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  double amount,  int attitude,  String? message,  String postId,  String accountId,  DateTime? createdAt,  DateTime? updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _SnPostAward() when $default != null:
+return $default(_that.id,_that.amount,_that.attitude,_that.message,_that.postId,_that.accountId,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  double amount,  int attitude,  String? message,  String postId,  String accountId,  DateTime? createdAt,  DateTime? updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
+switch (_that) {
+case _SnPostAward():
+return $default(_that.id,_that.amount,_that.attitude,_that.message,_that.postId,_that.accountId,_that.createdAt,_that.updatedAt,_that.deletedAt);}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  double amount,  int attitude,  String? message,  String postId,  String accountId,  DateTime? createdAt,  DateTime? updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
+switch (_that) {
+case _SnPostAward() when $default != null:
+return $default(_that.id,_that.amount,_that.attitude,_that.message,_that.postId,_that.accountId,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _SnPostAward implements SnPostAward {
+  const _SnPostAward({required this.id, required this.amount, required this.attitude, this.message, required this.postId, required this.accountId, this.createdAt = null, this.updatedAt = null, this.deletedAt});
+  factory _SnPostAward.fromJson(Map<String, dynamic> json) => _$SnPostAwardFromJson(json);
+
+@override final  String id;
+@override final  double amount;
+@override final  int attitude;
+@override final  String? message;
+@override final  String postId;
+@override final  String accountId;
+@override@JsonKey() final  DateTime? createdAt;
+@override@JsonKey() final  DateTime? updatedAt;
+@override final  DateTime? deletedAt;
+
+/// Create a copy of SnPostAward
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$SnPostAwardCopyWith<_SnPostAward> get copyWith => __$SnPostAwardCopyWithImpl<_SnPostAward>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$SnPostAwardToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnPostAward&&(identical(other.id, id) || other.id == id)&&(identical(other.amount, amount) || other.amount == amount)&&(identical(other.attitude, attitude) || other.attitude == attitude)&&(identical(other.message, message) || other.message == message)&&(identical(other.postId, postId) || other.postId == postId)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,amount,attitude,message,postId,accountId,createdAt,updatedAt,deletedAt);
+
+@override
+String toString() {
+  return 'SnPostAward(id: $id, amount: $amount, attitude: $attitude, message: $message, postId: $postId, accountId: $accountId, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$SnPostAwardCopyWith<$Res> implements $SnPostAwardCopyWith<$Res> {
+  factory _$SnPostAwardCopyWith(_SnPostAward value, $Res Function(_SnPostAward) _then) = __$SnPostAwardCopyWithImpl;
+@override @useResult
+$Res call({
+ String id, double amount, int attitude, String? message, String postId, String accountId, DateTime? createdAt, DateTime? updatedAt, DateTime? deletedAt
+});
+
+
+
+
+}
+/// @nodoc
+class __$SnPostAwardCopyWithImpl<$Res>
+    implements _$SnPostAwardCopyWith<$Res> {
+  __$SnPostAwardCopyWithImpl(this._self, this._then);
+
+  final _SnPostAward _self;
+  final $Res Function(_SnPostAward) _then;
+
+/// Create a copy of SnPostAward
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? amount = null,Object? attitude = null,Object? message = freezed,Object? postId = null,Object? accountId = null,Object? createdAt = freezed,Object? updatedAt = freezed,Object? deletedAt = freezed,}) {
+  return _then(_SnPostAward(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,amount: null == amount ? _self.amount : amount // ignore: cast_nullable_to_non_nullable
+as double,attitude: null == attitude ? _self.attitude : attitude // ignore: cast_nullable_to_non_nullable
+as int,message: freezed == message ? _self.message : message // ignore: cast_nullable_to_non_nullable
+as String?,postId: null == postId ? _self.postId : postId // ignore: cast_nullable_to_non_nullable
+as String,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as String,createdAt: freezed == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,updatedAt: freezed == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,
+  ));
+}
+
+
 }
 
 // dart format on

lib/models/post.g.dart

@@ -24,11 +24,18 @@ _SnPost _$SnPostFromJson(Map<String, dynamic> json) => _SnPost(
   slug: json['slug'] as String?,
   type: (json['type'] as num?)?.toInt() ?? 0,
   meta: json['meta'] as Map<String, dynamic>?,
+  embedView:
+      json['embed_view'] == null
+          ? null
+          : SnPostEmbedView.fromJson(
+            json['embed_view'] as Map<String, dynamic>,
+          ),
   viewsUnique: (json['views_unique'] as num?)?.toInt() ?? 0,
   viewsTotal: (json['views_total'] as num?)?.toInt() ?? 0,
   upvotes: (json['upvotes'] as num?)?.toInt() ?? 0,
   downvotes: (json['downvotes'] as num?)?.toInt() ?? 0,
   repliesCount: (json['replies_count'] as num?)?.toInt() ?? 0,
+  awardedScore: (json['awarded_score'] as num?)?.toInt() ?? 0,
   pinMode: (json['pin_mode'] as num?)?.toInt(),
   threadedPostId: json['threaded_post_id'] as String?,
   threadedPost:
@@ -105,11 +112,13 @@ Map<String, dynamic> _$SnPostToJson(_SnPost instance) => <String, dynamic>{
   'slug': instance.slug,
   'type': instance.type,
   'meta': instance.meta,
+  'embed_view': instance.embedView?.toJson(),
   'views_unique': instance.viewsUnique,
   'views_total': instance.viewsTotal,
   'upvotes': instance.upvotes,
   'downvotes': instance.downvotes,
   'replies_count': instance.repliesCount,
+  'awarded_score': instance.awardedScore,
   'pin_mode': instance.pinMode,
   'threaded_post_id': instance.threadedPostId,
   'threaded_post': instance.threadedPost?.toJson(),
@@ -166,3 +175,58 @@ Map<String, dynamic> _$SnSubscriptionStatusToJson(
   'publisher_id': instance.publisherId,
   'publisher_name': instance.publisherName,
 };
+
+_SnPostEmbedView _$SnPostEmbedViewFromJson(Map<String, dynamic> json) =>
+    _SnPostEmbedView(
+      uri: json['uri'] as String,
+      aspectRatio: (json['aspect_ratio'] as num?)?.toDouble(),
+      renderer:
+          $enumDecodeNullable(
+            _$PostEmbedViewRendererEnumMap,
+            json['renderer'],
+          ) ??
+          PostEmbedViewRenderer.webView,
+    );
+
+Map<String, dynamic> _$SnPostEmbedViewToJson(_SnPostEmbedView instance) =>
+    <String, dynamic>{
+      'uri': instance.uri,
+      'aspect_ratio': instance.aspectRatio,
+      'renderer': _$PostEmbedViewRendererEnumMap[instance.renderer]!,
+    };
+
+const _$PostEmbedViewRendererEnumMap = {PostEmbedViewRenderer.webView: 0};
+
+_SnPostAward _$SnPostAwardFromJson(Map<String, dynamic> json) => _SnPostAward(
+  id: json['id'] as String,
+  amount: (json['amount'] as num).toDouble(),
+  attitude: (json['attitude'] as num).toInt(),
+  message: json['message'] as String?,
+  postId: json['post_id'] as String,
+  accountId: json['account_id'] as String,
+  createdAt:
+      json['created_at'] == null
+          ? null
+          : DateTime.parse(json['created_at'] as String),
+  updatedAt:
+      json['updated_at'] == null
+          ? null
+          : DateTime.parse(json['updated_at'] as String),
+  deletedAt:
+      json['deleted_at'] == null
+          ? null
+          : DateTime.parse(json['deleted_at'] as String),
+);
+
+Map<String, dynamic> _$SnPostAwardToJson(_SnPostAward instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'amount': instance.amount,
+      'attitude': instance.attitude,
+      'message': instance.message,
+      'post_id': instance.postId,
+      'account_id': instance.accountId,
+      'created_at': instance.createdAt?.toIso8601String(),
+      'updated_at': instance.updatedAt?.toIso8601String(),
+      'deleted_at': instance.deletedAt?.toIso8601String(),
+    };

lib/models/wallet.dart

@@ -108,17 +108,14 @@ sealed class SnWalletOrder with _$SnWalletOrder {
     required String id,
     required int status,
     required String currency,
-    required dynamic remarks,
+    required String? remarks,
     required String appIdentifier,
     @Default({}) Map<String, dynamic> meta,
     required int amount,
     required DateTime expiredAt,
     required String? payeeWalletId,
-    required SnWallet? payeeWallet,
     required String? transactionId,
-    required SnTransaction? transaction,
     required String? issuerAppId,
-    required dynamic issuerApp,
     required DateTime createdAt,
     required DateTime updatedAt,
     required DateTime? deletedAt,

lib/models/wallet.freezed.dart

@@ -1554,7 +1554,7 @@ as String,
 /// @nodoc
 mixin _$SnWalletOrder {
 
- String get id; int get status; String get currency; dynamic get remarks; String get appIdentifier; Map<String, dynamic> get meta; int get amount; DateTime get expiredAt; String? get payeeWalletId; SnWallet? get payeeWallet; String? get transactionId; SnTransaction? get transaction; String? get issuerAppId; dynamic get issuerApp; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
+ String get id; int get status; String get currency; String? get remarks; String get appIdentifier; Map<String, dynamic> get meta; int get amount; DateTime get expiredAt; String? get payeeWalletId; String? get transactionId; String? get issuerAppId; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
 /// Create a copy of SnWalletOrder
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -1567,16 +1567,16 @@ $SnWalletOrderCopyWith<SnWalletOrder> get copyWith => _$SnWalletOrderCopyWithImp
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnWalletOrder&&(identical(other.id, id) || other.id == id)&&(identical(other.status, status) || other.status == status)&&(identical(other.currency, currency) || other.currency == currency)&&const DeepCollectionEquality().equals(other.remarks, remarks)&&(identical(other.appIdentifier, appIdentifier) || other.appIdentifier == appIdentifier)&&const DeepCollectionEquality().equals(other.meta, meta)&&(identical(other.amount, amount) || other.amount == amount)&&(identical(other.expiredAt, expiredAt) || other.expiredAt == expiredAt)&&(identical(other.payeeWalletId, payeeWalletId) || other.payeeWalletId == payeeWalletId)&&(identical(other.payeeWallet, payeeWallet) || other.payeeWallet == payeeWallet)&&(identical(other.transactionId, transactionId) || other.transactionId == transactionId)&&(identical(other.transaction, transaction) || other.transaction == transaction)&&(identical(other.issuerAppId, issuerAppId) || other.issuerAppId == issuerAppId)&&const DeepCollectionEquality().equals(other.issuerApp, issuerApp)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnWalletOrder&&(identical(other.id, id) || other.id == id)&&(identical(other.status, status) || other.status == status)&&(identical(other.currency, currency) || other.currency == currency)&&(identical(other.remarks, remarks) || other.remarks == remarks)&&(identical(other.appIdentifier, appIdentifier) || other.appIdentifier == appIdentifier)&&const DeepCollectionEquality().equals(other.meta, meta)&&(identical(other.amount, amount) || other.amount == amount)&&(identical(other.expiredAt, expiredAt) || other.expiredAt == expiredAt)&&(identical(other.payeeWalletId, payeeWalletId) || other.payeeWalletId == payeeWalletId)&&(identical(other.transactionId, transactionId) || other.transactionId == transactionId)&&(identical(other.issuerAppId, issuerAppId) || other.issuerAppId == issuerAppId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hash(runtimeType,id,status,currency,const DeepCollectionEquality().hash(remarks),appIdentifier,const DeepCollectionEquality().hash(meta),amount,expiredAt,payeeWalletId,payeeWallet,transactionId,transaction,issuerAppId,const DeepCollectionEquality().hash(issuerApp),createdAt,updatedAt,deletedAt);
+int get hashCode => Object.hash(runtimeType,id,status,currency,remarks,appIdentifier,const DeepCollectionEquality().hash(meta),amount,expiredAt,payeeWalletId,transactionId,issuerAppId,createdAt,updatedAt,deletedAt);
 
 @override
 String toString() {
-  return 'SnWalletOrder(id: $id, status: $status, currency: $currency, remarks: $remarks, appIdentifier: $appIdentifier, meta: $meta, amount: $amount, expiredAt: $expiredAt, payeeWalletId: $payeeWalletId, payeeWallet: $payeeWallet, transactionId: $transactionId, transaction: $transaction, issuerAppId: $issuerAppId, issuerApp: $issuerApp, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+  return 'SnWalletOrder(id: $id, status: $status, currency: $currency, remarks: $remarks, appIdentifier: $appIdentifier, meta: $meta, amount: $amount, expiredAt: $expiredAt, payeeWalletId: $payeeWalletId, transactionId: $transactionId, issuerAppId: $issuerAppId, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
 }
 
 
@@ -1587,11 +1587,11 @@ abstract mixin class $SnWalletOrderCopyWith<$Res>  {
   factory $SnWalletOrderCopyWith(SnWalletOrder value, $Res Function(SnWalletOrder) _then) = _$SnWalletOrderCopyWithImpl;
 @useResult
 $Res call({
- String id, int status, String currency, dynamic remarks, String appIdentifier, Map<String, dynamic> meta, int amount, DateTime expiredAt, String? payeeWalletId, SnWallet? payeeWallet, String? transactionId, SnTransaction? transaction, String? issuerAppId, dynamic issuerApp, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, int status, String currency, String? remarks, String appIdentifier, Map<String, dynamic> meta, int amount, DateTime expiredAt, String? payeeWalletId, String? transactionId, String? issuerAppId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });
 
 
-$SnWalletCopyWith<$Res>? get payeeWallet;$SnTransactionCopyWith<$Res>? get transaction;
+
 
 }
 /// @nodoc
@@ -1604,53 +1604,26 @@ class _$SnWalletOrderCopyWithImpl<$Res>
 
 /// Create a copy of SnWalletOrder
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? status = null,Object? currency = null,Object? remarks = freezed,Object? appIdentifier = null,Object? meta = null,Object? amount = null,Object? expiredAt = null,Object? payeeWalletId = freezed,Object? payeeWallet = freezed,Object? transactionId = freezed,Object? transaction = freezed,Object? issuerAppId = freezed,Object? issuerApp = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? status = null,Object? currency = null,Object? remarks = freezed,Object? appIdentifier = null,Object? meta = null,Object? amount = null,Object? expiredAt = null,Object? payeeWalletId = freezed,Object? transactionId = freezed,Object? issuerAppId = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
   return _then(_self.copyWith(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,status: null == status ? _self.status : status // ignore: cast_nullable_to_non_nullable
 as int,currency: null == currency ? _self.currency : currency // ignore: cast_nullable_to_non_nullable
 as String,remarks: freezed == remarks ? _self.remarks : remarks // ignore: cast_nullable_to_non_nullable
-as dynamic,appIdentifier: null == appIdentifier ? _self.appIdentifier : appIdentifier // ignore: cast_nullable_to_non_nullable
+as String?,appIdentifier: null == appIdentifier ? _self.appIdentifier : appIdentifier // ignore: cast_nullable_to_non_nullable
 as String,meta: null == meta ? _self.meta : meta // ignore: cast_nullable_to_non_nullable
 as Map<String, dynamic>,amount: null == amount ? _self.amount : amount // ignore: cast_nullable_to_non_nullable
 as int,expiredAt: null == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
 as DateTime,payeeWalletId: freezed == payeeWalletId ? _self.payeeWalletId : payeeWalletId // ignore: cast_nullable_to_non_nullable
-as String?,payeeWallet: freezed == payeeWallet ? _self.payeeWallet : payeeWallet // ignore: cast_nullable_to_non_nullable
-as SnWallet?,transactionId: freezed == transactionId ? _self.transactionId : transactionId // ignore: cast_nullable_to_non_nullable
-as String?,transaction: freezed == transaction ? _self.transaction : transaction // ignore: cast_nullable_to_non_nullable
-as SnTransaction?,issuerAppId: freezed == issuerAppId ? _self.issuerAppId : issuerAppId // ignore: cast_nullable_to_non_nullable
-as String?,issuerApp: freezed == issuerApp ? _self.issuerApp : issuerApp // ignore: cast_nullable_to_non_nullable
-as dynamic,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as String?,transactionId: freezed == transactionId ? _self.transactionId : transactionId // ignore: cast_nullable_to_non_nullable
+as String?,issuerAppId: freezed == issuerAppId ? _self.issuerAppId : issuerAppId // ignore: cast_nullable_to_non_nullable
+as String?,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
 as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
 as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,
   ));
 }
-/// Create a copy of SnWalletOrder
-/// with the given fields replaced by the non-null parameter values.
-@override
-@pragma('vm:prefer-inline')
-$SnWalletCopyWith<$Res>? get payeeWallet {
-    if (_self.payeeWallet == null) {
-    return null;
-  }
 
-  return $SnWalletCopyWith<$Res>(_self.payeeWallet!, (value) {
-    return _then(_self.copyWith(payeeWallet: value));
-  });
-}/// Create a copy of SnWalletOrder
-/// with the given fields replaced by the non-null parameter values.
-@override
-@pragma('vm:prefer-inline')
-$SnTransactionCopyWith<$Res>? get transaction {
-    if (_self.transaction == null) {
-    return null;
-  }
-
-  return $SnTransactionCopyWith<$Res>(_self.transaction!, (value) {
-    return _then(_self.copyWith(transaction: value));
-  });
-}
 }
 
 
@@ -1729,10 +1702,10 @@ return $default(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  int status,  String currency,  dynamic remarks,  String appIdentifier,  Map<String, dynamic> meta,  int amount,  DateTime expiredAt,  String? payeeWalletId,  SnWallet? payeeWallet,  String? transactionId,  SnTransaction? transaction,  String? issuerAppId,  dynamic issuerApp,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  int status,  String currency,  String? remarks,  String appIdentifier,  Map<String, dynamic> meta,  int amount,  DateTime expiredAt,  String? payeeWalletId,  String? transactionId,  String? issuerAppId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _SnWalletOrder() when $default != null:
-return $default(_that.id,_that.status,_that.currency,_that.remarks,_that.appIdentifier,_that.meta,_that.amount,_that.expiredAt,_that.payeeWalletId,_that.payeeWallet,_that.transactionId,_that.transaction,_that.issuerAppId,_that.issuerApp,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+return $default(_that.id,_that.status,_that.currency,_that.remarks,_that.appIdentifier,_that.meta,_that.amount,_that.expiredAt,_that.payeeWalletId,_that.transactionId,_that.issuerAppId,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
   return orElse();
 
 }
@@ -1750,10 +1723,10 @@ return $default(_that.id,_that.status,_that.currency,_that.remarks,_that.appIden
 /// }
 /// ```
 
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  int status,  String currency,  dynamic remarks,  String appIdentifier,  Map<String, dynamic> meta,  int amount,  DateTime expiredAt,  String? payeeWalletId,  SnWallet? payeeWallet,  String? transactionId,  SnTransaction? transaction,  String? issuerAppId,  dynamic issuerApp,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  int status,  String currency,  String? remarks,  String appIdentifier,  Map<String, dynamic> meta,  int amount,  DateTime expiredAt,  String? payeeWalletId,  String? transactionId,  String? issuerAppId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
 switch (_that) {
 case _SnWalletOrder():
-return $default(_that.id,_that.status,_that.currency,_that.remarks,_that.appIdentifier,_that.meta,_that.amount,_that.expiredAt,_that.payeeWalletId,_that.payeeWallet,_that.transactionId,_that.transaction,_that.issuerAppId,_that.issuerApp,_that.createdAt,_that.updatedAt,_that.deletedAt);}
+return $default(_that.id,_that.status,_that.currency,_that.remarks,_that.appIdentifier,_that.meta,_that.amount,_that.expiredAt,_that.payeeWalletId,_that.transactionId,_that.issuerAppId,_that.createdAt,_that.updatedAt,_that.deletedAt);}
 }
 /// A variant of `when` that fallback to returning `null`
 ///
@@ -1767,10 +1740,10 @@ return $default(_that.id,_that.status,_that.currency,_that.remarks,_that.appIden
 /// }
 /// ```
 
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  int status,  String currency,  dynamic remarks,  String appIdentifier,  Map<String, dynamic> meta,  int amount,  DateTime expiredAt,  String? payeeWalletId,  SnWallet? payeeWallet,  String? transactionId,  SnTransaction? transaction,  String? issuerAppId,  dynamic issuerApp,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  int status,  String currency,  String? remarks,  String appIdentifier,  Map<String, dynamic> meta,  int amount,  DateTime expiredAt,  String? payeeWalletId,  String? transactionId,  String? issuerAppId,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
 switch (_that) {
 case _SnWalletOrder() when $default != null:
-return $default(_that.id,_that.status,_that.currency,_that.remarks,_that.appIdentifier,_that.meta,_that.amount,_that.expiredAt,_that.payeeWalletId,_that.payeeWallet,_that.transactionId,_that.transaction,_that.issuerAppId,_that.issuerApp,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+return $default(_that.id,_that.status,_that.currency,_that.remarks,_that.appIdentifier,_that.meta,_that.amount,_that.expiredAt,_that.payeeWalletId,_that.transactionId,_that.issuerAppId,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
   return null;
 
 }
@@ -1782,13 +1755,13 @@ return $default(_that.id,_that.status,_that.currency,_that.remarks,_that.appIden
 @JsonSerializable()
 
 class _SnWalletOrder implements SnWalletOrder {
-  const _SnWalletOrder({required this.id, required this.status, required this.currency, required this.remarks, required this.appIdentifier, final  Map<String, dynamic> meta = const {}, required this.amount, required this.expiredAt, required this.payeeWalletId, required this.payeeWallet, required this.transactionId, required this.transaction, required this.issuerAppId, required this.issuerApp, required this.createdAt, required this.updatedAt, required this.deletedAt}): _meta = meta;
+  const _SnWalletOrder({required this.id, required this.status, required this.currency, required this.remarks, required this.appIdentifier, final  Map<String, dynamic> meta = const {}, required this.amount, required this.expiredAt, required this.payeeWalletId, required this.transactionId, required this.issuerAppId, required this.createdAt, required this.updatedAt, required this.deletedAt}): _meta = meta;
   factory _SnWalletOrder.fromJson(Map<String, dynamic> json) => _$SnWalletOrderFromJson(json);
 
 @override final  String id;
 @override final  int status;
 @override final  String currency;
-@override final  dynamic remarks;
+@override final  String? remarks;
 @override final  String appIdentifier;
  final  Map<String, dynamic> _meta;
 @override@JsonKey() Map<String, dynamic> get meta {
@@ -1800,11 +1773,8 @@ class _SnWalletOrder implements SnWalletOrder {
 @override final  int amount;
 @override final  DateTime expiredAt;
 @override final  String? payeeWalletId;
-@override final  SnWallet? payeeWallet;
 @override final  String? transactionId;
-@override final  SnTransaction? transaction;
 @override final  String? issuerAppId;
-@override final  dynamic issuerApp;
 @override final  DateTime createdAt;
 @override final  DateTime updatedAt;
 @override final  DateTime? deletedAt;
@@ -1822,16 +1792,16 @@ Map<String, dynamic> toJson() {
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnWalletOrder&&(identical(other.id, id) || other.id == id)&&(identical(other.status, status) || other.status == status)&&(identical(other.currency, currency) || other.currency == currency)&&const DeepCollectionEquality().equals(other.remarks, remarks)&&(identical(other.appIdentifier, appIdentifier) || other.appIdentifier == appIdentifier)&&const DeepCollectionEquality().equals(other._meta, _meta)&&(identical(other.amount, amount) || other.amount == amount)&&(identical(other.expiredAt, expiredAt) || other.expiredAt == expiredAt)&&(identical(other.payeeWalletId, payeeWalletId) || other.payeeWalletId == payeeWalletId)&&(identical(other.payeeWallet, payeeWallet) || other.payeeWallet == payeeWallet)&&(identical(other.transactionId, transactionId) || other.transactionId == transactionId)&&(identical(other.transaction, transaction) || other.transaction == transaction)&&(identical(other.issuerAppId, issuerAppId) || other.issuerAppId == issuerAppId)&&const DeepCollectionEquality().equals(other.issuerApp, issuerApp)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnWalletOrder&&(identical(other.id, id) || other.id == id)&&(identical(other.status, status) || other.status == status)&&(identical(other.currency, currency) || other.currency == currency)&&(identical(other.remarks, remarks) || other.remarks == remarks)&&(identical(other.appIdentifier, appIdentifier) || other.appIdentifier == appIdentifier)&&const DeepCollectionEquality().equals(other._meta, _meta)&&(identical(other.amount, amount) || other.amount == amount)&&(identical(other.expiredAt, expiredAt) || other.expiredAt == expiredAt)&&(identical(other.payeeWalletId, payeeWalletId) || other.payeeWalletId == payeeWalletId)&&(identical(other.transactionId, transactionId) || other.transactionId == transactionId)&&(identical(other.issuerAppId, issuerAppId) || other.issuerAppId == issuerAppId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hash(runtimeType,id,status,currency,const DeepCollectionEquality().hash(remarks),appIdentifier,const DeepCollectionEquality().hash(_meta),amount,expiredAt,payeeWalletId,payeeWallet,transactionId,transaction,issuerAppId,const DeepCollectionEquality().hash(issuerApp),createdAt,updatedAt,deletedAt);
+int get hashCode => Object.hash(runtimeType,id,status,currency,remarks,appIdentifier,const DeepCollectionEquality().hash(_meta),amount,expiredAt,payeeWalletId,transactionId,issuerAppId,createdAt,updatedAt,deletedAt);
 
 @override
 String toString() {
-  return 'SnWalletOrder(id: $id, status: $status, currency: $currency, remarks: $remarks, appIdentifier: $appIdentifier, meta: $meta, amount: $amount, expiredAt: $expiredAt, payeeWalletId: $payeeWalletId, payeeWallet: $payeeWallet, transactionId: $transactionId, transaction: $transaction, issuerAppId: $issuerAppId, issuerApp: $issuerApp, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+  return 'SnWalletOrder(id: $id, status: $status, currency: $currency, remarks: $remarks, appIdentifier: $appIdentifier, meta: $meta, amount: $amount, expiredAt: $expiredAt, payeeWalletId: $payeeWalletId, transactionId: $transactionId, issuerAppId: $issuerAppId, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
 }
 
 
@@ -1842,11 +1812,11 @@ abstract mixin class _$SnWalletOrderCopyWith<$Res> implements $SnWalletOrderCopy
   factory _$SnWalletOrderCopyWith(_SnWalletOrder value, $Res Function(_SnWalletOrder) _then) = __$SnWalletOrderCopyWithImpl;
 @override @useResult
 $Res call({
- String id, int status, String currency, dynamic remarks, String appIdentifier, Map<String, dynamic> meta, int amount, DateTime expiredAt, String? payeeWalletId, SnWallet? payeeWallet, String? transactionId, SnTransaction? transaction, String? issuerAppId, dynamic issuerApp, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, int status, String currency, String? remarks, String appIdentifier, Map<String, dynamic> meta, int amount, DateTime expiredAt, String? payeeWalletId, String? transactionId, String? issuerAppId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });
 
 
-@override $SnWalletCopyWith<$Res>? get payeeWallet;@override $SnTransactionCopyWith<$Res>? get transaction;
+
 
 }
 /// @nodoc
@@ -1859,54 +1829,27 @@ class __$SnWalletOrderCopyWithImpl<$Res>
 
 /// Create a copy of SnWalletOrder
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? status = null,Object? currency = null,Object? remarks = freezed,Object? appIdentifier = null,Object? meta = null,Object? amount = null,Object? expiredAt = null,Object? payeeWalletId = freezed,Object? payeeWallet = freezed,Object? transactionId = freezed,Object? transaction = freezed,Object? issuerAppId = freezed,Object? issuerApp = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? status = null,Object? currency = null,Object? remarks = freezed,Object? appIdentifier = null,Object? meta = null,Object? amount = null,Object? expiredAt = null,Object? payeeWalletId = freezed,Object? transactionId = freezed,Object? issuerAppId = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
   return _then(_SnWalletOrder(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,status: null == status ? _self.status : status // ignore: cast_nullable_to_non_nullable
 as int,currency: null == currency ? _self.currency : currency // ignore: cast_nullable_to_non_nullable
 as String,remarks: freezed == remarks ? _self.remarks : remarks // ignore: cast_nullable_to_non_nullable
-as dynamic,appIdentifier: null == appIdentifier ? _self.appIdentifier : appIdentifier // ignore: cast_nullable_to_non_nullable
+as String?,appIdentifier: null == appIdentifier ? _self.appIdentifier : appIdentifier // ignore: cast_nullable_to_non_nullable
 as String,meta: null == meta ? _self._meta : meta // ignore: cast_nullable_to_non_nullable
 as Map<String, dynamic>,amount: null == amount ? _self.amount : amount // ignore: cast_nullable_to_non_nullable
 as int,expiredAt: null == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
 as DateTime,payeeWalletId: freezed == payeeWalletId ? _self.payeeWalletId : payeeWalletId // ignore: cast_nullable_to_non_nullable
-as String?,payeeWallet: freezed == payeeWallet ? _self.payeeWallet : payeeWallet // ignore: cast_nullable_to_non_nullable
-as SnWallet?,transactionId: freezed == transactionId ? _self.transactionId : transactionId // ignore: cast_nullable_to_non_nullable
-as String?,transaction: freezed == transaction ? _self.transaction : transaction // ignore: cast_nullable_to_non_nullable
-as SnTransaction?,issuerAppId: freezed == issuerAppId ? _self.issuerAppId : issuerAppId // ignore: cast_nullable_to_non_nullable
-as String?,issuerApp: freezed == issuerApp ? _self.issuerApp : issuerApp // ignore: cast_nullable_to_non_nullable
-as dynamic,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as String?,transactionId: freezed == transactionId ? _self.transactionId : transactionId // ignore: cast_nullable_to_non_nullable
+as String?,issuerAppId: freezed == issuerAppId ? _self.issuerAppId : issuerAppId // ignore: cast_nullable_to_non_nullable
+as String?,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
 as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
 as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,
   ));
 }
 
-/// Create a copy of SnWalletOrder
-/// with the given fields replaced by the non-null parameter values.
-@override
-@pragma('vm:prefer-inline')
-$SnWalletCopyWith<$Res>? get payeeWallet {
-    if (_self.payeeWallet == null) {
-    return null;
-  }
 
-  return $SnWalletCopyWith<$Res>(_self.payeeWallet!, (value) {
-    return _then(_self.copyWith(payeeWallet: value));
-  });
-}/// Create a copy of SnWalletOrder
-/// with the given fields replaced by the non-null parameter values.
-@override
-@pragma('vm:prefer-inline')
-$SnTransactionCopyWith<$Res>? get transaction {
-    if (_self.transaction == null) {
-    return null;
-  }
-
-  return $SnTransactionCopyWith<$Res>(_self.transaction!, (value) {
-    return _then(_self.copyWith(transaction: value));
-  });
-}
 }
 
 // dart format on

lib/models/wallet.g.dart

@@ -195,25 +195,14 @@ _SnWalletOrder _$SnWalletOrderFromJson(Map<String, dynamic> json) =>
       id: json['id'] as String,
       status: (json['status'] as num).toInt(),
       currency: json['currency'] as String,
-      remarks: json['remarks'],
+      remarks: json['remarks'] as String?,
       appIdentifier: json['app_identifier'] as String,
       meta: json['meta'] as Map<String, dynamic>? ?? const {},
       amount: (json['amount'] as num).toInt(),
       expiredAt: DateTime.parse(json['expired_at'] as String),
       payeeWalletId: json['payee_wallet_id'] as String?,
-      payeeWallet:
-          json['payee_wallet'] == null
-              ? null
-              : SnWallet.fromJson(json['payee_wallet'] as Map<String, dynamic>),
       transactionId: json['transaction_id'] as String?,
-      transaction:
-          json['transaction'] == null
-              ? null
-              : SnTransaction.fromJson(
-                json['transaction'] as Map<String, dynamic>,
-              ),
       issuerAppId: json['issuer_app_id'] as String?,
-      issuerApp: json['issuer_app'],
       createdAt: DateTime.parse(json['created_at'] as String),
       updatedAt: DateTime.parse(json['updated_at'] as String),
       deletedAt:
@@ -233,11 +222,8 @@ Map<String, dynamic> _$SnWalletOrderToJson(_SnWalletOrder instance) =>
       'amount': instance.amount,
       'expired_at': instance.expiredAt.toIso8601String(),
       'payee_wallet_id': instance.payeeWalletId,
-      'payee_wallet': instance.payeeWallet?.toJson(),
       'transaction_id': instance.transactionId,
-      'transaction': instance.transaction?.toJson(),
       'issuer_app_id': instance.issuerAppId,
-      'issuer_app': instance.issuerApp,
       'created_at': instance.createdAt.toIso8601String(),
       'updated_at': instance.updatedAt.toIso8601String(),
       'deleted_at': instance.deletedAt?.toIso8601String(),

lib/pods/activity/activity_rpc.dart

@@ -0,0 +1,456 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:developer' as developer;
+import 'dart:io';
+import 'package:flutter/foundation.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/pods/network.dart';
+import 'package:shelf/shelf.dart';
+import 'package:shelf/shelf_io.dart' as shelf_io;
+import 'package:shelf_web_socket/shelf_web_socket.dart';
+import 'package:web_socket_channel/web_socket_channel.dart';
+
+// Conditional imports for IPC server - use web stubs on web platform
+import 'ipc_server.dart' if (dart.library.html) 'ipc_server.web.dart';
+
+const String kRpcLogPrefix = 'arRPC.websocket';
+const String kRpcIpcLogPrefix = 'arRPC.ipc';
+
+// IPC Constants
+const String kIpcBasePath = 'discord-ipc';
+
+// IPC Packet Types
+class IpcTypes {
+  static const int handshake = 0;
+  static const int frame = 1;
+  static const int close = 2;
+  static const int ping = 3;
+  static const int pong = 4;
+}
+
+// IPC Close Codes
+class IpcCloseCodes {
+  static const int closeNormal = 1000;
+  static const int closeUnsupported = 1003;
+  static const int closeAbnormal = 1006;
+}
+
+// IPC Error Codes
+class IpcErrorCodes {
+  static const int invalidClientId = 4000;
+  static const int invalidOrigin = 4001;
+  static const int rateLimited = 4002;
+  static const int tokenRevoked = 4003;
+  static const int invalidVersion = 4004;
+  static const int invalidEncoding = 4005;
+}
+
+// Reference https://github.com/OpenAsar/arrpc/blob/main/src/transports/ipc.js
+class ActivityRpcServer {
+  static const List<int> portRange = [6463, 6472]; // Ports 6463–6472
+  Map<String, Function>
+  handlers; // {connection: (socket), message: (socket, data), close: (socket)}
+  HttpServer? _httpServer;
+  IpcServer? _ipcServer;
+  final List<WebSocketChannel> _wsSockets = [];
+
+  ActivityRpcServer(this.handlers);
+
+  void updateHandlers(Map<String, Function> newHandlers) {
+    handlers = newHandlers;
+  }
+
+  // Start the server
+  Future<void> start() async {
+    int port = portRange[0];
+    bool wsSuccess = false;
+
+    // Start WebSocket server
+    while (port <= portRange[1]) {
+      developer.log('Trying port $port', name: kRpcLogPrefix);
+      try {
+        _httpServer = await HttpServer.bind(InternetAddress.loopbackIPv4, port);
+        developer.log('Listening on $port', name: kRpcLogPrefix);
+
+        shelf_io.serveRequests(_httpServer!, (Request request) async {
+          developer.log('New request', name: kRpcLogPrefix);
+          if (request.headers['upgrade']?.toLowerCase() == 'websocket') {
+            final handler = webSocketHandler((WebSocketChannel channel, _) {
+              _wsSockets.add(channel);
+              _onWsConnection(channel, request);
+            });
+            return handler(request);
+          }
+          developer.log(
+            'New request disposed due to not websocket',
+            name: kRpcLogPrefix,
+          );
+          return Response.notFound('Not a WebSocket request');
+        });
+        wsSuccess = true;
+        break;
+      } catch (e) {
+        if (e is SocketException && e.osError?.errorCode == 98) {
+          developer.log('$port in use!', name: kRpcLogPrefix);
+        } else {
+          developer.log('HTTP error: $e', name: kRpcLogPrefix);
+        }
+        port++;
+        await Future.delayed(Duration(milliseconds: 100)); // Add delay
+      }
+    }
+
+    if (!wsSuccess) {
+      throw Exception(
+        'Failed to bind to any port in range ${portRange[0]}–${portRange[1]}',
+      );
+    }
+
+    // Start IPC server
+    final shouldStartIpc = !Platform.isMacOS && !kIsWeb;
+    if (shouldStartIpc) {
+      try {
+        _ipcServer = MultiPlatformIpcServer();
+
+        // Set up IPC handlers
+        _ipcServer!.handlePacket = (socket, packet, _) {
+          _handleIpcPacket(socket, packet);
+        };
+
+        await _ipcServer!.start();
+      } catch (e) {
+        developer.log('IPC server error: $e', name: kRpcIpcLogPrefix);
+      }
+    } else {
+      developer.log(
+        'IPC server disabled on macOS or web in production mode',
+        name: kRpcIpcLogPrefix,
+      );
+    }
+  }
+
+  // Stop the server
+  Future<void> stop() async {
+    // Stop WebSocket server
+    for (var socket in _wsSockets) {
+      try {
+        await socket.sink.close();
+      } catch (e) {
+        developer.log('Error closing WebSocket: $e', name: kRpcLogPrefix);
+      }
+    }
+    _wsSockets.clear();
+    await _httpServer?.close(force: true);
+
+    // Stop IPC server
+    await _ipcServer?.stop();
+
+    developer.log('Servers stopped', name: kRpcLogPrefix);
+  }
+
+  // Handle new WebSocket connection
+  void _onWsConnection(WebSocketChannel socket, Request request) {
+    final uri = request.url;
+    final params = uri.queryParameters;
+    final ver = int.tryParse(params['v'] ?? '1') ?? 1;
+    final encoding = params['encoding'] ?? 'json';
+    final clientId = params['client_id'] ?? '';
+    final origin = request.headers['origin'] ?? '';
+
+    developer.log(
+      'New WS connection! origin: $origin, params: $params',
+      name: kRpcLogPrefix,
+    );
+
+    if (origin.isNotEmpty &&
+        ![
+          'https://discord.com',
+          'https://ptb.discord.com',
+          'https://canary.discord.com',
+        ].contains(origin)) {
+      developer.log('Disallowed origin: $origin', name: kRpcLogPrefix);
+      socket.sink.close();
+      return;
+    }
+
+    if (encoding != 'json') {
+      developer.log(
+        'Unsupported encoding requested: $encoding',
+        name: kRpcLogPrefix,
+      );
+      socket.sink.close();
+      return;
+    }
+
+    if (ver != 1) {
+      developer.log('Unsupported version requested: $ver', name: kRpcLogPrefix);
+      socket.sink.close();
+      return;
+    }
+
+    final socketWithMeta = _WsSocketWrapper(socket, clientId, encoding);
+
+    socket.stream.listen(
+      (data) => _onWsMessage(socketWithMeta, data),
+      onError: (e) {
+        developer.log('WS socket error: $e', name: kRpcLogPrefix);
+      },
+      onDone: () {
+        developer.log('WS socket closed', name: kRpcLogPrefix);
+        handlers['close']?.call(socketWithMeta);
+        _wsSockets.remove(socket);
+      },
+    );
+
+    handlers['connection']?.call(socketWithMeta);
+  }
+
+  // Handle incoming WebSocket message
+  Future<void> _onWsMessage(_WsSocketWrapper socket, dynamic data) async {
+    if (data is! String) {
+      developer.log(
+        'Invalid WebSocket message: not a string',
+        name: kRpcLogPrefix,
+      );
+      return;
+    }
+    try {
+      final jsonData = await compute(jsonDecode, data);
+      if (jsonData is! Map<String, dynamic>) {
+        developer.log(
+          'Invalid WebSocket message: not a JSON object',
+          name: kRpcLogPrefix,
+        );
+        return;
+      }
+      developer.log('WS message: $jsonData', name: kRpcLogPrefix);
+      handlers['message']?.call(socket, jsonData);
+    } catch (e) {
+      developer.log('WS message parse error: $e', name: kRpcLogPrefix);
+    }
+  }
+
+  // Handle IPC packet
+  void _handleIpcPacket(IpcSocketWrapper socket, IpcPacket packet) {
+    switch (packet.type) {
+      case IpcTypes.ping:
+        developer.log('IPC ping received', name: kRpcIpcLogPrefix);
+        socket.sendPong(packet.data);
+        break;
+
+      case IpcTypes.pong:
+        developer.log('IPC pong received', name: kRpcIpcLogPrefix);
+        break;
+
+      case IpcTypes.handshake:
+        if (socket.handshook) {
+          throw Exception('Already handshook');
+        }
+        socket.handshook = true;
+        _onIpcHandshake(socket, packet.data);
+        break;
+
+      case IpcTypes.frame:
+        if (!socket.handshook) {
+          throw Exception('Need to handshake first');
+        }
+        developer.log('IPC frame: ${packet.data}', name: kRpcIpcLogPrefix);
+        handlers['message']?.call(socket, packet.data);
+        break;
+
+      case IpcTypes.close:
+        socket.close();
+        break;
+
+      default:
+        throw Exception('Invalid packet type: ${packet.type}');
+    }
+  }
+
+  // Handle IPC handshake
+  void _onIpcHandshake(IpcSocketWrapper socket, Map<String, dynamic> params) {
+    developer.log('IPC handshake: $params', name: kRpcIpcLogPrefix);
+
+    final ver = int.tryParse(params['v']?.toString() ?? '1') ?? 1;
+    final clientId = params['client_id']?.toString() ?? '';
+
+    if (ver != 1) {
+      developer.log(
+        'IPC unsupported version requested: $ver',
+        name: kRpcIpcLogPrefix,
+      );
+      socket.closeWithCode(IpcErrorCodes.invalidVersion);
+      return;
+    }
+
+    if (clientId.isEmpty) {
+      developer.log('IPC client ID required', name: kRpcIpcLogPrefix);
+      socket.closeWithCode(IpcErrorCodes.invalidClientId);
+      return;
+    }
+
+    socket.clientId = clientId;
+
+    handlers['connection']?.call(socket);
+  }
+}
+
+// WebSocket wrapper
+class _WsSocketWrapper {
+  final WebSocketChannel channel;
+  final String clientId;
+  final String encoding;
+
+  _WsSocketWrapper(this.channel, this.clientId, this.encoding);
+
+  void send(Map<String, dynamic> msg) {
+    developer.log('WS sending: $msg', name: kRpcLogPrefix);
+    channel.sink.add(jsonEncode(msg));
+  }
+}
+
+// State management for server status and activities
+class ServerState {
+  final String status;
+  final List<String> activities;
+
+  ServerState({required this.status, this.activities = const []});
+
+  ServerState copyWith({String? status, List<String>? activities}) {
+    return ServerState(
+      status: status ?? this.status,
+      activities: activities ?? this.activities,
+    );
+  }
+}
+
+class ServerStateNotifier extends StateNotifier<ServerState> {
+  final ActivityRpcServer server;
+
+  ServerStateNotifier(this.server)
+    : super(ServerState(status: 'Server not started'));
+
+  Future<void> start() async {
+    if (!Platform.isAndroid && !Platform.isIOS && !kIsWeb) {
+      try {
+        await server.start();
+        state = state.copyWith(status: 'Server running');
+      } catch (e) {
+        state = state.copyWith(status: 'Server failed: $e');
+      }
+    } else {
+      state = state.copyWith(status: 'Server disabled on mobile/web');
+    }
+  }
+
+  void updateStatus(String status) {
+    state = state.copyWith(status: status);
+  }
+
+  void addActivity(String activity) {
+    state = state.copyWith(activities: [...state.activities, activity]);
+  }
+}
+
+// Providers
+final rpcServerStateProvider =
+    StateNotifierProvider<ServerStateNotifier, ServerState>((ref) {
+      final server = ActivityRpcServer({});
+      final notifier = ServerStateNotifier(server);
+      server.updateHandlers({
+        'connection': (socket) {
+          final clientId =
+              socket is _WsSocketWrapper
+                  ? socket.clientId
+                  : (socket as IpcSocketWrapper).clientId;
+          notifier.updateStatus('Client connected (ID: $clientId)');
+          socket.send({
+            'cmd': 'DISPATCH',
+            'data': {
+              'v': 1,
+              'config': {
+                'cdn_host': 'fake.cdn',
+                'api_endpoint': '//fake.api',
+                'environment': 'dev',
+              },
+              'user': {
+                'id': 'fake_user_id',
+                'username': 'FakeUser',
+                'discriminator': '0001',
+                'avatar': null,
+                'bot': false,
+              },
+            },
+            'evt': 'READY',
+            'nonce': '12345',
+          });
+        },
+        'message': (socket, dynamic data) async {
+          if (data['cmd'] == 'SET_ACTIVITY') {
+            notifier.addActivity(
+              'Activity: ${data['args']['activity']['details'] ?? 'Unknown'}',
+            );
+            final label = data['args']['activity']['details'] ?? 'Unknown';
+            final appId = socket.clientId;
+            try {
+              await setRemoteActivityStatus(ref, label, appId);
+            } catch (e) {
+              developer.log(
+                'Failed to set remote activity status: $e',
+                name: kRpcLogPrefix,
+              );
+            }
+            socket.send({
+              'cmd': 'SET_ACTIVITY',
+              'data': data['args']['activity'],
+              'evt': null,
+              'nonce': data['nonce'],
+            });
+          }
+        },
+        'close': (socket) async {
+          notifier.updateStatus('Client disconnected');
+          final appId = socket.clientId;
+          try {
+            await unsetRemoteActivityStatus(ref, appId);
+          } catch (e) {
+            developer.log(
+              'Failed to unset remote activity status: $e',
+              name: kRpcLogPrefix,
+            );
+          }
+        },
+      });
+      return notifier;
+    });
+
+final rpcServerProvider = Provider<ActivityRpcServer>((ref) {
+  final notifier = ref.watch(rpcServerStateProvider.notifier);
+  return notifier.server;
+});
+
+Future<void> setRemoteActivityStatus(
+  Ref ref,
+  String label,
+  String appId,
+) async {
+  final apiClient = ref.read(apiClientProvider);
+  await apiClient.post(
+    '/id/accounts/me/statuses',
+    data: {
+      'is_invisible': false,
+      'is_not_disturb': false,
+      'is_automated': true,
+      'label': label,
+      'app_identifier': appId,
+    },
+  );
+}
+
+Future<void> unsetRemoteActivityStatus(Ref ref, String appId) async {
+  final apiClient = ref.read(apiClientProvider);
+  await apiClient.delete(
+    '/id/accounts/me/statuses',
+    queryParameters: {'app': appId},
+  );
+}

lib/pods/activity/ipc_server.dart

@@ -0,0 +1,297 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:developer' as developer;
+import 'dart:io';
+import 'dart:typed_data';
+import 'package:dart_ipc/dart_ipc.dart';
+import 'package:path/path.dart' as path;
+
+const String kRpcIpcLogPrefix = 'arRPC.ipc';
+
+// IPC Packet Types
+class IpcTypes {
+  static const int handshake = 0;
+  static const int frame = 1;
+  static const int close = 2;
+  static const int ping = 3;
+  static const int pong = 4;
+}
+
+// IPC Close Codes
+class IpcCloseCodes {
+  static const int closeNormal = 1000;
+  static const int closeUnsupported = 1003;
+  static const int closeAbnormal = 1006;
+}
+
+// IPC Error Codes
+class IpcErrorCodes {
+  static const int invalidClientId = 4000;
+  static const int invalidOrigin = 4001;
+  static const int rateLimited = 4002;
+  static const int tokenRevoked = 4003;
+  static const int invalidVersion = 4004;
+  static const int invalidEncoding = 4005;
+}
+
+// IPC Packet structure
+class IpcPacket {
+  final int type;
+  final Map<String, dynamic> data;
+
+  IpcPacket(this.type, this.data);
+}
+
+// Abstract base class for IPC server
+abstract class IpcServer {
+  final List<IpcSocketWrapper> _sockets = [];
+
+  // Encode IPC packet
+  static Uint8List encodeIpcPacket(int type, Map<String, dynamic> data) {
+    final jsonData = jsonEncode(data);
+    final dataBytes = utf8.encode(jsonData);
+    final dataSize = dataBytes.length;
+
+    final buffer = ByteData(8 + dataSize);
+    buffer.setInt32(0, type, Endian.little);
+    buffer.setInt32(4, dataSize, Endian.little);
+    buffer.buffer.asUint8List().setRange(8, 8 + dataSize, dataBytes);
+
+    return buffer.buffer.asUint8List();
+  }
+
+  Future<void> start();
+  Future<void> stop();
+
+  void addSocket(IpcSocketWrapper socket) {
+    _sockets.add(socket);
+  }
+
+  void removeSocket(IpcSocketWrapper socket) {
+    _sockets.remove(socket);
+  }
+
+  List<IpcSocketWrapper> get sockets => _sockets;
+
+  void Function(
+    IpcSocketWrapper socket,
+    IpcPacket packet,
+    Map<String, Function> handlers,
+  )?
+  handlePacket;
+}
+
+// Abstract base class for IPC socket wrapper
+abstract class IpcSocketWrapper {
+  String clientId = '';
+  bool handshook = false;
+  final List<int> _buffer = [];
+
+  void addData(List<int> data) {
+    _buffer.addAll(data);
+  }
+
+  void send(Map<String, dynamic> msg);
+  void sendPong(dynamic data);
+  void close();
+  void closeWithCode(int code, [String message = '']);
+
+  List<IpcPacket> readPackets() {
+    final packets = <IpcPacket>[];
+
+    while (_buffer.length >= 8) {
+      final buffer = Uint8List.fromList(_buffer);
+      final byteData = ByteData.view(buffer.buffer);
+
+      final type = byteData.getInt32(0, Endian.little);
+      final dataSize = byteData.getInt32(4, Endian.little);
+
+      if (_buffer.length < 8 + dataSize) break;
+
+      final dataBytes = _buffer.sublist(8, 8 + dataSize);
+      final jsonStr = utf8.decode(dataBytes);
+      final jsonData = jsonDecode(jsonStr);
+
+      packets.add(IpcPacket(type, jsonData));
+
+      _buffer.removeRange(0, 8 + dataSize);
+    }
+
+    return packets;
+  }
+}
+
+// Multiplatform IPC Server implementation using dart_ipc
+class MultiPlatformIpcServer extends IpcServer {
+  StreamSubscription? _serverSubscription;
+
+  @override
+  Future<void> start() async {
+    try {
+      final ipcPath = Platform.isWindows
+          ? r'\\.\pipe\discord-ipc-0'
+          : await _findAvailableUnixIpcPath();
+
+      final serverSocket = await bind(ipcPath);
+      developer.log(
+        'IPC listening at $ipcPath',
+        name: kRpcIpcLogPrefix,
+      );
+
+      _serverSubscription = serverSocket.listen((socket) {
+        final socketWrapper = MultiPlatformIpcSocketWrapper(socket);
+        addSocket(socketWrapper);
+        developer.log(
+          'New IPC connection!',
+          name: kRpcIpcLogPrefix,
+        );
+        _handleIpcData(socketWrapper);
+      });
+    } catch (e) {
+      throw Exception('Failed to start IPC server: $e');
+    }
+  }
+
+  @override
+  Future<void> stop() async {
+    for (var socket in sockets) {
+      try {
+        socket.close();
+      } catch (e) {
+        developer.log('Error closing IPC socket: $e', name: kRpcIpcLogPrefix);
+      }
+    }
+    sockets.clear();
+    _serverSubscription?.cancel();
+  }
+
+  // Handle incoming IPC data
+  void _handleIpcData(MultiPlatformIpcSocketWrapper socket) {
+    final startTime = DateTime.now();
+    socket.socket.listen((data) {
+      final readStart = DateTime.now();
+      socket.addData(data);
+      final readDuration = DateTime.now().difference(readStart).inMicroseconds;
+      developer.log(
+        'Read data took $readDuration microseconds',
+        name: kRpcIpcLogPrefix,
+      );
+
+      final packets = socket.readPackets();
+      for (final packet in packets) {
+        handlePacket?.call(socket, packet, {});
+      }
+    }, onDone: () {
+      developer.log('IPC connection closed', name: kRpcIpcLogPrefix);
+      socket.close();
+    }, onError: (e) {
+      developer.log('IPC data error: $e', name: kRpcIpcLogPrefix);
+      socket.closeWithCode(IpcCloseCodes.closeUnsupported, e.toString());
+    });
+    final totalDuration = DateTime.now().difference(startTime).inMicroseconds;
+    developer.log(
+      '_handleIpcData took $totalDuration microseconds',
+      name: kRpcIpcLogPrefix,
+    );
+  }
+
+  Future<String> _getMacOsSystemTmpDir() async {
+    final result = await Process.run('getconf', ['DARWIN_USER_TEMP_DIR']);
+    return (result.stdout as String).trim();
+  }
+
+  // Find available IPC socket path for Unix-like systems
+  Future<String> _findAvailableUnixIpcPath() async {
+    // Build list of directories to try, with macOS-specific handling
+    final baseDirs = <String>[];
+
+    if (Platform.isMacOS) {
+      try {
+        final macTempDir = await _getMacOsSystemTmpDir();
+        if (macTempDir.isNotEmpty) {
+          baseDirs.add(macTempDir);
+        }
+      } catch (e) {
+        developer.log(
+          'Failed to get macOS system temp dir: $e',
+          name: kRpcIpcLogPrefix,
+        );
+      }
+    }
+
+    // Add other standard directories
+    final otherDirs = [
+      Platform.environment['XDG_RUNTIME_DIR'],
+      Platform.environment['TMPDIR'],
+      Platform.environment['TMP'],
+      Platform.environment['TEMP'],
+      '/tmp',
+    ];
+
+    baseDirs.addAll(
+      otherDirs.where((dir) => dir != null && dir.isNotEmpty).cast<String>(),
+    );
+
+    for (final baseDir in baseDirs) {
+      for (int i = 0; i < 10; i++) {
+        final socketPath = path.join(baseDir, 'discord-ipc-$i');
+        try {
+          final socket = await bind(socketPath);
+          socket.close();
+          try {
+            await File(socketPath).delete();
+          } catch (_) {}
+          developer.log(
+            'IPC socket will be created at: $socketPath',
+            name: kRpcIpcLogPrefix,
+          );
+          return socketPath;
+        } catch (e) {
+          if (i == 0) {
+            developer.log(
+              'IPC path $socketPath not available: $e',
+              name: kRpcIpcLogPrefix,
+            );
+          }
+          continue;
+        }
+      }
+    }
+    throw Exception(
+      'No available IPC socket paths found in any temp directory',
+    );
+  }
+}
+
+// Multiplatform IPC Socket Wrapper
+class MultiPlatformIpcSocketWrapper extends IpcSocketWrapper {
+  final dynamic socket;
+
+  MultiPlatformIpcSocketWrapper(this.socket);
+
+  @override
+  void send(Map<String, dynamic> msg) {
+    developer.log('IPC sending: $msg', name: kRpcIpcLogPrefix);
+    final packet = IpcServer.encodeIpcPacket(IpcTypes.frame, msg);
+    socket.add(packet);
+  }
+
+  @override
+  void sendPong(dynamic data) {
+    final packet = IpcServer.encodeIpcPacket(IpcTypes.pong, data ?? {});
+    socket.add(packet);
+  }
+
+  @override
+  void close() {
+    socket.close();
+  }
+
+  @override
+  void closeWithCode(int code, [String message = '']) {
+    final closeData = {'code': code, 'message': message};
+    final packet = IpcServer.encodeIpcPacket(IpcTypes.close, closeData);
+    socket.add(packet);
+    socket.close();
+  }
+}

lib/pods/activity/ipc_server.web.dart

@@ -0,0 +1,61 @@
+// Stub implementation for web platform
+// This file provides empty implementations to avoid import errors on web
+
+// IPC Packet Types
+class IpcTypes {
+  static const int handshake = 0;
+  static const int frame = 1;
+  static const int close = 2;
+  static const int ping = 3;
+  static const int pong = 4;
+}
+
+// IPC Close Codes
+class IpcCloseCodes {
+  static const int closeNormal = 1000;
+  static const int closeUnsupported = 1003;
+  static const int closeAbnormal = 1006;
+}
+
+// IPC Error Codes
+class IpcErrorCodes {
+  static const int invalidClientId = 4000;
+  static const int invalidOrigin = 4001;
+  static const int rateLimited = 4002;
+  static const int tokenRevoked = 4003;
+  static const int invalidVersion = 4004;
+  static const int invalidEncoding = 4005;
+}
+
+// IPC Packet structure
+class IpcPacket {
+  final int type;
+  final Map<String, dynamic> data;
+
+  IpcPacket(this.type, this.data);
+}
+
+class IpcServer {
+  Future<void> start() async {}
+  Future<void> stop() async {}
+  void Function(dynamic, dynamic, dynamic)? handlePacket;
+  void addSocket(dynamic socket) {}
+  void removeSocket(dynamic socket) {}
+  List<dynamic> get sockets => [];
+}
+
+class IpcSocketWrapper {
+  String clientId = '';
+  bool handshook = false;
+
+  void addData(List<int> data) {}
+  void send(Map<String, dynamic> msg) {}
+  void sendPong(dynamic data) {}
+  void close() {}
+  void closeWithCode(int code, [String message = '']) {}
+  List<dynamic> readPackets() => [];
+}
+
+class MultiPlatformIpcServer extends IpcServer {}
+
+class MultiPlatformIpcSocketWrapper extends IpcSocketWrapper {}

lib/pods/config.dart

@@ -25,6 +25,7 @@ const kAppSoundEffects = 'app_sound_effects';
 const kAppAprilFoolFeatures = 'app_april_fool_features';
 const kAppWindowSize = 'app_window_size';
 const kAppEnterToSend = 'app_enter_to_send';
+const kAppDefaultPoolId = 'app_default_pool_id';
 const kFeaturedPostsCollapsedId =
     'featured_posts_collapsed_id'; // Key for storing the ID of the collapsed featured post
 
@@ -65,6 +66,7 @@ sealed class AppSettings with _$AppSettings {
     required String? customFonts,
     required int? appColorScheme, // The color stored via the int type
     required Size? windowSize, // The window size for desktop platforms
+    required String? defaultPoolId,
   }) = _AppSettings;
 }
 
@@ -84,6 +86,7 @@ class AppSettingsNotifier extends _$AppSettingsNotifier {
       customFonts: prefs.getString(kAppCustomFonts),
       appColorScheme: prefs.getInt(kAppColorSchemeStoreKey),
       windowSize: _getWindowSizeFromPrefs(prefs),
+      defaultPoolId: prefs.getString(kAppDefaultPoolId),
     );
   }
 
@@ -103,6 +106,15 @@ class AppSettingsNotifier extends _$AppSettingsNotifier {
     }
     return null;
   }
+  void setDefaultPoolId(String? value) {
+    final prefs = ref.read(sharedPreferencesProvider);
+    if (value != null) {
+      prefs.setString(kAppDefaultPoolId, value);
+    } else {
+      prefs.remove(kAppDefaultPoolId);
+    }
+    state = state.copyWith(defaultPoolId: value);
+  }
 
   void setAutoTranslate(bool value) {
     final prefs = ref.read(sharedPreferencesProvider);

lib/pods/config.freezed.dart

@@ -15,7 +15,8 @@ T _$identity<T>(T value) => value;
 mixin _$AppSettings {
 
  bool get autoTranslate; bool get dataSavingMode; bool get soundEffects; bool get aprilFoolFeatures; bool get enterToSend; bool get appBarTransparent; bool get showBackgroundImage; String? get customFonts; int? get appColorScheme;// The color stored via the int type
- Size? get windowSize;
+ Size? get windowSize;// The window size for desktop platforms
+ String? get defaultPoolId;
 /// Create a copy of AppSettings
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -26,16 +27,16 @@ $AppSettingsCopyWith<AppSettings> get copyWith => _$AppSettingsCopyWithImpl<AppS
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is AppSettings&&(identical(other.autoTranslate, autoTranslate) || other.autoTranslate == autoTranslate)&&(identical(other.dataSavingMode, dataSavingMode) || other.dataSavingMode == dataSavingMode)&&(identical(other.soundEffects, soundEffects) || other.soundEffects == soundEffects)&&(identical(other.aprilFoolFeatures, aprilFoolFeatures) || other.aprilFoolFeatures == aprilFoolFeatures)&&(identical(other.enterToSend, enterToSend) || other.enterToSend == enterToSend)&&(identical(other.appBarTransparent, appBarTransparent) || other.appBarTransparent == appBarTransparent)&&(identical(other.showBackgroundImage, showBackgroundImage) || other.showBackgroundImage == showBackgroundImage)&&(identical(other.customFonts, customFonts) || other.customFonts == customFonts)&&(identical(other.appColorScheme, appColorScheme) || other.appColorScheme == appColorScheme)&&(identical(other.windowSize, windowSize) || other.windowSize == windowSize));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is AppSettings&&(identical(other.autoTranslate, autoTranslate) || other.autoTranslate == autoTranslate)&&(identical(other.dataSavingMode, dataSavingMode) || other.dataSavingMode == dataSavingMode)&&(identical(other.soundEffects, soundEffects) || other.soundEffects == soundEffects)&&(identical(other.aprilFoolFeatures, aprilFoolFeatures) || other.aprilFoolFeatures == aprilFoolFeatures)&&(identical(other.enterToSend, enterToSend) || other.enterToSend == enterToSend)&&(identical(other.appBarTransparent, appBarTransparent) || other.appBarTransparent == appBarTransparent)&&(identical(other.showBackgroundImage, showBackgroundImage) || other.showBackgroundImage == showBackgroundImage)&&(identical(other.customFonts, customFonts) || other.customFonts == customFonts)&&(identical(other.appColorScheme, appColorScheme) || other.appColorScheme == appColorScheme)&&(identical(other.windowSize, windowSize) || other.windowSize == windowSize)&&(identical(other.defaultPoolId, defaultPoolId) || other.defaultPoolId == defaultPoolId));
 }
 
 
 @override
-int get hashCode => Object.hash(runtimeType,autoTranslate,dataSavingMode,soundEffects,aprilFoolFeatures,enterToSend,appBarTransparent,showBackgroundImage,customFonts,appColorScheme,windowSize);
+int get hashCode => Object.hash(runtimeType,autoTranslate,dataSavingMode,soundEffects,aprilFoolFeatures,enterToSend,appBarTransparent,showBackgroundImage,customFonts,appColorScheme,windowSize,defaultPoolId);
 
 @override
 String toString() {
-  return 'AppSettings(autoTranslate: $autoTranslate, dataSavingMode: $dataSavingMode, soundEffects: $soundEffects, aprilFoolFeatures: $aprilFoolFeatures, enterToSend: $enterToSend, appBarTransparent: $appBarTransparent, showBackgroundImage: $showBackgroundImage, customFonts: $customFonts, appColorScheme: $appColorScheme, windowSize: $windowSize)';
+  return 'AppSettings(autoTranslate: $autoTranslate, dataSavingMode: $dataSavingMode, soundEffects: $soundEffects, aprilFoolFeatures: $aprilFoolFeatures, enterToSend: $enterToSend, appBarTransparent: $appBarTransparent, showBackgroundImage: $showBackgroundImage, customFonts: $customFonts, appColorScheme: $appColorScheme, windowSize: $windowSize, defaultPoolId: $defaultPoolId)';
 }
 
 
@@ -46,7 +47,7 @@ abstract mixin class $AppSettingsCopyWith<$Res>  {
   factory $AppSettingsCopyWith(AppSettings value, $Res Function(AppSettings) _then) = _$AppSettingsCopyWithImpl;
 @useResult
 $Res call({
- bool autoTranslate, bool dataSavingMode, bool soundEffects, bool aprilFoolFeatures, bool enterToSend, bool appBarTransparent, bool showBackgroundImage, String? customFonts, int? appColorScheme, Size? windowSize
+ bool autoTranslate, bool dataSavingMode, bool soundEffects, bool aprilFoolFeatures, bool enterToSend, bool appBarTransparent, bool showBackgroundImage, String? customFonts, int? appColorScheme, Size? windowSize, String? defaultPoolId
 });
 
 
@@ -63,7 +64,7 @@ class _$AppSettingsCopyWithImpl<$Res>
 
 /// Create a copy of AppSettings
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? autoTranslate = null,Object? dataSavingMode = null,Object? soundEffects = null,Object? aprilFoolFeatures = null,Object? enterToSend = null,Object? appBarTransparent = null,Object? showBackgroundImage = null,Object? customFonts = freezed,Object? appColorScheme = freezed,Object? windowSize = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? autoTranslate = null,Object? dataSavingMode = null,Object? soundEffects = null,Object? aprilFoolFeatures = null,Object? enterToSend = null,Object? appBarTransparent = null,Object? showBackgroundImage = null,Object? customFonts = freezed,Object? appColorScheme = freezed,Object? windowSize = freezed,Object? defaultPoolId = freezed,}) {
   return _then(_self.copyWith(
 autoTranslate: null == autoTranslate ? _self.autoTranslate : autoTranslate // ignore: cast_nullable_to_non_nullable
 as bool,dataSavingMode: null == dataSavingMode ? _self.dataSavingMode : dataSavingMode // ignore: cast_nullable_to_non_nullable
@@ -75,7 +76,8 @@ as bool,showBackgroundImage: null == showBackgroundImage ? _self.showBackgroundI
 as bool,customFonts: freezed == customFonts ? _self.customFonts : customFonts // ignore: cast_nullable_to_non_nullable
 as String?,appColorScheme: freezed == appColorScheme ? _self.appColorScheme : appColorScheme // ignore: cast_nullable_to_non_nullable
 as int?,windowSize: freezed == windowSize ? _self.windowSize : windowSize // ignore: cast_nullable_to_non_nullable
-as Size?,
+as Size?,defaultPoolId: freezed == defaultPoolId ? _self.defaultPoolId : defaultPoolId // ignore: cast_nullable_to_non_nullable
+as String?,
   ));
 }
 
@@ -157,10 +159,10 @@ return $default(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( bool autoTranslate,  bool dataSavingMode,  bool soundEffects,  bool aprilFoolFeatures,  bool enterToSend,  bool appBarTransparent,  bool showBackgroundImage,  String? customFonts,  int? appColorScheme,  Size? windowSize)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( bool autoTranslate,  bool dataSavingMode,  bool soundEffects,  bool aprilFoolFeatures,  bool enterToSend,  bool appBarTransparent,  bool showBackgroundImage,  String? customFonts,  int? appColorScheme,  Size? windowSize,  String? defaultPoolId)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _AppSettings() when $default != null:
-return $default(_that.autoTranslate,_that.dataSavingMode,_that.soundEffects,_that.aprilFoolFeatures,_that.enterToSend,_that.appBarTransparent,_that.showBackgroundImage,_that.customFonts,_that.appColorScheme,_that.windowSize);case _:
+return $default(_that.autoTranslate,_that.dataSavingMode,_that.soundEffects,_that.aprilFoolFeatures,_that.enterToSend,_that.appBarTransparent,_that.showBackgroundImage,_that.customFonts,_that.appColorScheme,_that.windowSize,_that.defaultPoolId);case _:
   return orElse();
 
 }
@@ -178,10 +180,10 @@ return $default(_that.autoTranslate,_that.dataSavingMode,_that.soundEffects,_tha
 /// }
 /// ```
 
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( bool autoTranslate,  bool dataSavingMode,  bool soundEffects,  bool aprilFoolFeatures,  bool enterToSend,  bool appBarTransparent,  bool showBackgroundImage,  String? customFonts,  int? appColorScheme,  Size? windowSize)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( bool autoTranslate,  bool dataSavingMode,  bool soundEffects,  bool aprilFoolFeatures,  bool enterToSend,  bool appBarTransparent,  bool showBackgroundImage,  String? customFonts,  int? appColorScheme,  Size? windowSize,  String? defaultPoolId)  $default,) {final _that = this;
 switch (_that) {
 case _AppSettings():
-return $default(_that.autoTranslate,_that.dataSavingMode,_that.soundEffects,_that.aprilFoolFeatures,_that.enterToSend,_that.appBarTransparent,_that.showBackgroundImage,_that.customFonts,_that.appColorScheme,_that.windowSize);}
+return $default(_that.autoTranslate,_that.dataSavingMode,_that.soundEffects,_that.aprilFoolFeatures,_that.enterToSend,_that.appBarTransparent,_that.showBackgroundImage,_that.customFonts,_that.appColorScheme,_that.windowSize,_that.defaultPoolId);}
 }
 /// A variant of `when` that fallback to returning `null`
 ///
@@ -195,10 +197,10 @@ return $default(_that.autoTranslate,_that.dataSavingMode,_that.soundEffects,_tha
 /// }
 /// ```
 
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( bool autoTranslate,  bool dataSavingMode,  bool soundEffects,  bool aprilFoolFeatures,  bool enterToSend,  bool appBarTransparent,  bool showBackgroundImage,  String? customFonts,  int? appColorScheme,  Size? windowSize)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( bool autoTranslate,  bool dataSavingMode,  bool soundEffects,  bool aprilFoolFeatures,  bool enterToSend,  bool appBarTransparent,  bool showBackgroundImage,  String? customFonts,  int? appColorScheme,  Size? windowSize,  String? defaultPoolId)?  $default,) {final _that = this;
 switch (_that) {
 case _AppSettings() when $default != null:
-return $default(_that.autoTranslate,_that.dataSavingMode,_that.soundEffects,_that.aprilFoolFeatures,_that.enterToSend,_that.appBarTransparent,_that.showBackgroundImage,_that.customFonts,_that.appColorScheme,_that.windowSize);case _:
+return $default(_that.autoTranslate,_that.dataSavingMode,_that.soundEffects,_that.aprilFoolFeatures,_that.enterToSend,_that.appBarTransparent,_that.showBackgroundImage,_that.customFonts,_that.appColorScheme,_that.windowSize,_that.defaultPoolId);case _:
   return null;
 
 }
@@ -210,7 +212,7 @@ return $default(_that.autoTranslate,_that.dataSavingMode,_that.soundEffects,_tha
 
 
 class _AppSettings implements AppSettings {
-  const _AppSettings({required this.autoTranslate, required this.dataSavingMode, required this.soundEffects, required this.aprilFoolFeatures, required this.enterToSend, required this.appBarTransparent, required this.showBackgroundImage, required this.customFonts, required this.appColorScheme, required this.windowSize});
+  const _AppSettings({required this.autoTranslate, required this.dataSavingMode, required this.soundEffects, required this.aprilFoolFeatures, required this.enterToSend, required this.appBarTransparent, required this.showBackgroundImage, required this.customFonts, required this.appColorScheme, required this.windowSize, required this.defaultPoolId});
   
 
 @override final  bool autoTranslate;
@@ -224,6 +226,8 @@ class _AppSettings implements AppSettings {
 @override final  int? appColorScheme;
 // The color stored via the int type
 @override final  Size? windowSize;
+// The window size for desktop platforms
+@override final  String? defaultPoolId;
 
 /// Create a copy of AppSettings
 /// with the given fields replaced by the non-null parameter values.
@@ -235,16 +239,16 @@ _$AppSettingsCopyWith<_AppSettings> get copyWith => __$AppSettingsCopyWithImpl<_
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _AppSettings&&(identical(other.autoTranslate, autoTranslate) || other.autoTranslate == autoTranslate)&&(identical(other.dataSavingMode, dataSavingMode) || other.dataSavingMode == dataSavingMode)&&(identical(other.soundEffects, soundEffects) || other.soundEffects == soundEffects)&&(identical(other.aprilFoolFeatures, aprilFoolFeatures) || other.aprilFoolFeatures == aprilFoolFeatures)&&(identical(other.enterToSend, enterToSend) || other.enterToSend == enterToSend)&&(identical(other.appBarTransparent, appBarTransparent) || other.appBarTransparent == appBarTransparent)&&(identical(other.showBackgroundImage, showBackgroundImage) || other.showBackgroundImage == showBackgroundImage)&&(identical(other.customFonts, customFonts) || other.customFonts == customFonts)&&(identical(other.appColorScheme, appColorScheme) || other.appColorScheme == appColorScheme)&&(identical(other.windowSize, windowSize) || other.windowSize == windowSize));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _AppSettings&&(identical(other.autoTranslate, autoTranslate) || other.autoTranslate == autoTranslate)&&(identical(other.dataSavingMode, dataSavingMode) || other.dataSavingMode == dataSavingMode)&&(identical(other.soundEffects, soundEffects) || other.soundEffects == soundEffects)&&(identical(other.aprilFoolFeatures, aprilFoolFeatures) || other.aprilFoolFeatures == aprilFoolFeatures)&&(identical(other.enterToSend, enterToSend) || other.enterToSend == enterToSend)&&(identical(other.appBarTransparent, appBarTransparent) || other.appBarTransparent == appBarTransparent)&&(identical(other.showBackgroundImage, showBackgroundImage) || other.showBackgroundImage == showBackgroundImage)&&(identical(other.customFonts, customFonts) || other.customFonts == customFonts)&&(identical(other.appColorScheme, appColorScheme) || other.appColorScheme == appColorScheme)&&(identical(other.windowSize, windowSize) || other.windowSize == windowSize)&&(identical(other.defaultPoolId, defaultPoolId) || other.defaultPoolId == defaultPoolId));
 }
 
 
 @override
-int get hashCode => Object.hash(runtimeType,autoTranslate,dataSavingMode,soundEffects,aprilFoolFeatures,enterToSend,appBarTransparent,showBackgroundImage,customFonts,appColorScheme,windowSize);
+int get hashCode => Object.hash(runtimeType,autoTranslate,dataSavingMode,soundEffects,aprilFoolFeatures,enterToSend,appBarTransparent,showBackgroundImage,customFonts,appColorScheme,windowSize,defaultPoolId);
 
 @override
 String toString() {
-  return 'AppSettings(autoTranslate: $autoTranslate, dataSavingMode: $dataSavingMode, soundEffects: $soundEffects, aprilFoolFeatures: $aprilFoolFeatures, enterToSend: $enterToSend, appBarTransparent: $appBarTransparent, showBackgroundImage: $showBackgroundImage, customFonts: $customFonts, appColorScheme: $appColorScheme, windowSize: $windowSize)';
+  return 'AppSettings(autoTranslate: $autoTranslate, dataSavingMode: $dataSavingMode, soundEffects: $soundEffects, aprilFoolFeatures: $aprilFoolFeatures, enterToSend: $enterToSend, appBarTransparent: $appBarTransparent, showBackgroundImage: $showBackgroundImage, customFonts: $customFonts, appColorScheme: $appColorScheme, windowSize: $windowSize, defaultPoolId: $defaultPoolId)';
 }
 
 
@@ -255,7 +259,7 @@ abstract mixin class _$AppSettingsCopyWith<$Res> implements $AppSettingsCopyWith
   factory _$AppSettingsCopyWith(_AppSettings value, $Res Function(_AppSettings) _then) = __$AppSettingsCopyWithImpl;
 @override @useResult
 $Res call({
- bool autoTranslate, bool dataSavingMode, bool soundEffects, bool aprilFoolFeatures, bool enterToSend, bool appBarTransparent, bool showBackgroundImage, String? customFonts, int? appColorScheme, Size? windowSize
+ bool autoTranslate, bool dataSavingMode, bool soundEffects, bool aprilFoolFeatures, bool enterToSend, bool appBarTransparent, bool showBackgroundImage, String? customFonts, int? appColorScheme, Size? windowSize, String? defaultPoolId
 });
 
 
@@ -272,7 +276,7 @@ class __$AppSettingsCopyWithImpl<$Res>
 
 /// Create a copy of AppSettings
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? autoTranslate = null,Object? dataSavingMode = null,Object? soundEffects = null,Object? aprilFoolFeatures = null,Object? enterToSend = null,Object? appBarTransparent = null,Object? showBackgroundImage = null,Object? customFonts = freezed,Object? appColorScheme = freezed,Object? windowSize = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? autoTranslate = null,Object? dataSavingMode = null,Object? soundEffects = null,Object? aprilFoolFeatures = null,Object? enterToSend = null,Object? appBarTransparent = null,Object? showBackgroundImage = null,Object? customFonts = freezed,Object? appColorScheme = freezed,Object? windowSize = freezed,Object? defaultPoolId = freezed,}) {
   return _then(_AppSettings(
 autoTranslate: null == autoTranslate ? _self.autoTranslate : autoTranslate // ignore: cast_nullable_to_non_nullable
 as bool,dataSavingMode: null == dataSavingMode ? _self.dataSavingMode : dataSavingMode // ignore: cast_nullable_to_non_nullable
@@ -284,7 +288,8 @@ as bool,showBackgroundImage: null == showBackgroundImage ? _self.showBackgroundI
 as bool,customFonts: freezed == customFonts ? _self.customFonts : customFonts // ignore: cast_nullable_to_non_nullable
 as String?,appColorScheme: freezed == appColorScheme ? _self.appColorScheme : appColorScheme // ignore: cast_nullable_to_non_nullable
 as int?,windowSize: freezed == windowSize ? _self.windowSize : windowSize // ignore: cast_nullable_to_non_nullable
-as Size?,
+as Size?,defaultPoolId: freezed == defaultPoolId ? _self.defaultPoolId : defaultPoolId // ignore: cast_nullable_to_non_nullable
+as String?,
   ));
 }
 

lib/pods/config.g.dart

@@ -7,7 +7,7 @@ part of 'config.dart';
 // **************************************************************************
 
 String _$appSettingsNotifierHash() =>
-    r'cd18bff2614a94e3523634e6c577cefad0367eba';
+    r'a623ad859b71f42d0527b7f8b75bd37a6fd5d5c7';
 
 /// See also [AppSettingsNotifier].
 @ProviderFor(AppSettingsNotifier)

lib/pods/pool_provider.dart

@@ -0,0 +1,28 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/file_pool.dart';
+import 'package:island/pods/config.dart';
+import 'package:island/pods/network.dart';
+
+final poolsProvider = FutureProvider<List<SnFilePool>>((ref) async {
+  final dio = ref.watch(apiClientProvider);
+  final response = await dio.get('/drive/pools');
+  final pools = SnFilePoolList.listFromResponse(response.data);
+  return pools.filterValid();
+});
+
+String resolveDefaultPoolId(WidgetRef ref, List<SnFilePool> pools) {
+  final settings = ref.watch(appSettingsNotifierProvider);
+  final validPools = pools.filterValid();
+
+  final configuredId = settings.defaultPoolId;
+  if (configuredId != null && validPools.any((p) => p.id == configuredId)) {
+    return configuredId;
+  }
+
+  if (validPools.isNotEmpty) {
+    return validPools.first.id;
+  }
+
+  // DEFAULT: Solar Network Driver
+  return '500e5ed8-bd44-4359-bc0a-ec85e2adf447'; }
+

lib/pods/userinfo.dart

@@ -30,7 +30,7 @@ class UserInfoNotifier extends StateNotifier<AsyncValue<SnAccount?>> {
       final user = SnAccount.fromJson(response.data);
       state = AsyncValue.data(user);
 
-      if (kIsWeb || !Platform.isLinux) {
+      if (kIsWeb || !(Platform.isLinux || Platform.isWindows)) {
         FirebaseAnalytics.instance.setUserId(id: user.id);
       }
     } catch (error, stackTrace) {
@@ -44,9 +44,12 @@ class UserInfoNotifier extends StateNotifier<AsyncValue<SnAccount?>> {
                       : 'failedToLoadUserInfoNetwork')
                   .tr()
                   .trim(),
-              '${error.response!.statusCode}\n${error.response?.headers}',
-              jsonEncode(error.response?.data),
-            ].join('\n\n'),
+              '',
+              '${error.response?.statusCode ?? 'Network Error'}',
+              if (error.response?.headers != null) error.response?.headers,
+              if (error.response?.data != null)
+                jsonEncode(error.response?.data),
+            ].join('\n'),
             iconStyle: IconStyle.error,
             neutralButtonTitle: 'retry'.tr(),
             negativeButtonTitle: 'okay'.tr(),
@@ -87,7 +90,7 @@ class UserInfoNotifier extends StateNotifier<AsyncValue<SnAccount?>> {
     final prefs = _ref.read(sharedPreferencesProvider);
     await prefs.remove(kTokenPairStoreKey);
     _ref.invalidate(tokenProvider);
-    if (kIsWeb || !Platform.isLinux) {
+    if (kIsWeb || !(Platform.isLinux || Platform.isWindows)) {
       FirebaseAnalytics.instance.setUserId(id: null);
     }
   }

lib/route.dart

@@ -89,8 +89,7 @@ bool get _supportsAnalytics =>
     kIsWeb ||
     Platform.isAndroid ||
     Platform.isIOS ||
-    Platform.isMacOS ||
-    Platform.isWindows;
+    Platform.isMacOS;
 
 // Provider for the router
 final routerProvider = Provider<GoRouter>((ref) {

lib/screens/about.dart

@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:island/services/udid.native.dart';
+import 'package:island/services/udid.dart' as udid;
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
 import 'package:material_symbols_icons/symbols.dart';
@@ -68,7 +68,7 @@ class _AboutScreenState extends ConsumerState<AboutScreen> {
     try {
       final deviceInfoPlugin = DeviceInfoPlugin();
       _deviceInfo = await deviceInfoPlugin.deviceInfo;
-      _deviceUdid = await getUdid();
+      _deviceUdid = await udid.getUdid();
       if (mounted) {
         setState(() {});
       }
@@ -174,12 +174,20 @@ class _AboutScreenState extends ConsumerState<AboutScreen> {
                             context,
                             title: 'Device Information',
                             children: [
-                              _buildInfoItem(
-                                context,
-                                icon: Symbols.label,
-                                label: 'aboutDeviceName'.tr(),
-                                value:
-                                    _deviceInfo?.data['name'] ?? 'unknown'.tr(),
+                              FutureBuilder<String>(
+                                future: udid.getDeviceName(),
+                                builder: (context, snapshot) {
+                                  final value =
+                                      snapshot.hasData
+                                          ? snapshot.data!
+                                          : 'unknown'.tr();
+                                  return _buildInfoItem(
+                                    context,
+                                    icon: Symbols.label,
+                                    label: 'aboutDeviceName'.tr(),
+                                    value: value,
+                                  );
+                                },
                               ),
                               _buildInfoItem(
                                 context,

lib/screens/account/leveling.dart

@@ -789,11 +789,8 @@ class LevelingScreen extends HookConsumerWidget {
       if (context.mounted) showLoadingModal(context);
 
       if (paidOrder != null) {
-        await client.post(
-          '/id/subscriptions/order/handle',
-          data: {'order_id': paidOrder.id},
-        );
-
+        // Wait for server to handle order
+        await Future.delayed(const Duration(seconds: 1));
         ref.invalidate(accountStellarSubscriptionProvider);
         ref.read(userInfoProvider.notifier).fetchUser();
         if (context.mounted) {

lib/screens/account/me/account_settings.dart

@@ -4,6 +4,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/auth.dart';
 import 'package:island/models/account.dart';
@@ -479,6 +480,7 @@ class AccountSettingsScreen extends HookConsumerWidget {
                       );
                     },
                   ),
+                  const Gap(8),
                 ]
                 : null,
       ),

lib/screens/account/me/profile_update.dart

@@ -66,7 +66,7 @@ class UpdateProfileScreen extends HookConsumerWidget {
         final token = await getToken(ref.watch(tokenProvider));
         if (token == null) throw ArgumentError('Token is null');
         final cloudFile =
-            await putMediaToCloud(
+            await putFileToCloud(
               fileData: UniversalFile(
                 data: result,
                 type: UniversalFileType.image,

lib/screens/account/me/settings_contacts.dart

@@ -62,6 +62,32 @@ class ContactMethodSheet extends HookConsumerWidget {
       }
     }
 
+    Future<void> makeContactMethodPublic() async {
+      try {
+        showLoadingModal(context);
+        final client = ref.read(apiClientProvider);
+        await client.post('/id/accounts/me/contacts/${contact.id}/public');
+        if (context.mounted) Navigator.pop(context, true);
+      } catch (err) {
+        showErrorAlert(err);
+      } finally {
+        if (context.mounted) hideLoadingModal(context);
+      }
+    }
+
+    Future<void> makeContactMethodPrivate() async {
+      try {
+        showLoadingModal(context);
+        final client = ref.read(apiClientProvider);
+        await client.delete('/id/accounts/me/contacts/${contact.id}/public');
+        if (context.mounted) Navigator.pop(context, true);
+      } catch (err) {
+        showErrorAlert(err);
+      } finally {
+        if (context.mounted) hideLoadingModal(context);
+      }
+    }
+
     return SheetScaffold(
       titleText: 'contactMethod'.tr(),
       child: Column(
@@ -111,6 +137,27 @@ class ContactMethodSheet extends HookConsumerWidget {
                         backgroundColor: Theme.of(context).colorScheme.tertiary,
                       ),
                     ),
+                  if (contact.isPublic)
+                    Padding(
+                      padding: const EdgeInsets.only(left: 8.0),
+                      child: Badge(
+                        label: Text('contactMethodPublic'.tr()),
+                        textColor: Theme.of(context).colorScheme.onPrimary,
+                        backgroundColor: Theme.of(context).colorScheme.primary,
+                      ),
+                    ),
+                  if (!contact.isPublic)
+                    Padding(
+                      padding: const EdgeInsets.only(left: 8.0),
+                      child: Badge(
+                        label: Text('contactMethodPrivate'.tr()),
+                        textColor: Theme.of(context).colorScheme.onSurface,
+                        backgroundColor:
+                            Theme.of(
+                              context,
+                            ).colorScheme.surfaceContainerHighest,
+                      ),
+                    ),
                 ],
               ),
             ],
@@ -130,6 +177,20 @@ class ContactMethodSheet extends HookConsumerWidget {
               onTap: setContactMethodAsPrimary,
               contentPadding: EdgeInsets.symmetric(horizontal: 20),
             ),
+          if (contact.verifiedAt != null && !contact.isPublic)
+            ListTile(
+              leading: const Icon(Symbols.public),
+              title: Text('contactMethodMakePublic').tr(),
+              onTap: makeContactMethodPublic,
+              contentPadding: EdgeInsets.symmetric(horizontal: 20),
+            ),
+          if (contact.verifiedAt != null && contact.isPublic)
+            ListTile(
+              leading: const Icon(Symbols.visibility_off),
+              title: Text('contactMethodMakePrivate').tr(),
+              onTap: makeContactMethodPrivate,
+              contentPadding: EdgeInsets.symmetric(horizontal: 20),
+            ),
           ListTile(
             leading: const Icon(Symbols.delete),
             title: Text('contactMethodDelete').tr(),

lib/screens/account/profile.dart

@@ -32,7 +32,7 @@ import 'package:island/widgets/content/cloud_files.dart';
 import 'package:island/widgets/content/markdown.dart';
 import 'package:island/widgets/safety/abuse_report_helper.dart';
 import 'package:material_symbols_icons/symbols.dart';
-import 'package:palette_generator/palette_generator.dart';
+import 'package:island/services/color_extraction.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:share_plus/share_plus.dart';
 import 'package:styled_widget/styled_widget.dart';
@@ -321,6 +321,59 @@ class _AccountProfileLinks extends StatelessWidget {
   }
 }
 
+class _AccountProfileContacts extends StatelessWidget {
+  final SnAccount data;
+
+  const _AccountProfileContacts({required this.data});
+
+  @override
+  Widget build(BuildContext context) {
+    final publicContacts = data.contacts.where((c) => c.isPublic).toList();
+    if (publicContacts.isEmpty) return const SizedBox.shrink();
+
+    return Card(
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            'contactMethod',
+          ).tr().bold().padding(horizontal: 24, top: 12, bottom: 4),
+          for (final contact in publicContacts)
+            ListTile(
+              title: Text(contact.content),
+              subtitle: Text(switch (contact.type) {
+                0 => 'contactMethodTypeEmail'.tr(),
+                1 => 'contactMethodTypePhone'.tr(),
+                _ => 'contactMethodTypeAddress'.tr(),
+              }),
+              leading: Icon(switch (contact.type) {
+                0 => Symbols.mail,
+                1 => Symbols.phone,
+                _ => Symbols.home,
+              }),
+              contentPadding: EdgeInsets.symmetric(horizontal: 24),
+              trailing: const Icon(Symbols.chevron_right),
+              shape: RoundedRectangleBorder(
+                borderRadius: const BorderRadius.all(Radius.circular(8)),
+              ),
+              onTap: () {
+                switch (contact.type) {
+                  case 0:
+                    launchUrlString('mailto:${contact.content}');
+                  case 1:
+                    launchUrlString('tel:${contact.content}');
+                  default:
+                    // For address, maybe copy to clipboard or do nothing
+                    Clipboard.setData(ClipboardData(text: contact.content));
+                }
+              },
+            ),
+        ],
+      ),
+    );
+  }
+}
+
 class _AccountPublisherList extends StatelessWidget {
   final List<SnPublisher> publishers;
 
@@ -528,14 +581,14 @@ Future<Color?> accountAppbarForcegroundColor(Ref ref, String uname) async {
   try {
     final account = await ref.watch(accountProvider(uname).future);
     if (account.profile.background == null) return null;
-    final palette = await PaletteGenerator.fromImageProvider(
+    final colors = await ColorExtractionService.getColorsFromImage(
       CloudImageWidget.provider(
         fileId: account.profile.background!.id,
         serverUrl: ref.watch(serverUrlProvider),
       ),
     );
-    final dominantColor = palette.dominantColor?.color;
-    if (dominantColor == null) return null;
+    if (colors.isEmpty) return null;
+    final dominantColor = colors.first;
     return dominantColor.computeLuminance() > 0.5 ? Colors.black : Colors.white;
   } catch (_) {
     return null;
@@ -792,6 +845,10 @@ class AccountProfileScreen extends HookConsumerWidget {
                               SliverToBoxAdapter(
                                 child: _AccountProfileLinks(data: data),
                               ),
+                            if (data.contacts.any((c) => c.isPublic))
+                              SliverToBoxAdapter(
+                                child: _AccountProfileContacts(data: data),
+                              ),
                             SliverToBoxAdapter(
                               child: _AccountProfileDetail(data: data),
                             ),
@@ -916,6 +973,12 @@ class AccountProfileScreen extends HookConsumerWidget {
                             data: data,
                           ).padding(horizontal: 4),
                         ),
+                      if (data.contacts.any((c) => c.isPublic))
+                        SliverToBoxAdapter(
+                          child: _AccountProfileContacts(
+                            data: data,
+                          ).padding(horizontal: 4),
+                        ),
                       SliverToBoxAdapter(
                         child: _AccountPublisherList(
                           publishers: accountPublishers.value ?? [],

lib/screens/account/profile.g.dart

@@ -268,7 +268,7 @@ class _AccountBadgesProviderElement
 }
 
 String _$accountAppbarForcegroundColorHash() =>
-    r'8ee0cae10817b77fb09548a482f5247662b4374c';
+    r'127fcc7fd6ec6a41ac4a6975276b5271aa4fa7d0';
 
 /// See also [accountAppbarForcegroundColor].
 @ProviderFor(accountAppbarForcegroundColor)

lib/screens/auth/captcha.config.dart

@@ -1,17 +1,10 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:island/pods/network.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'captcha.config.g.dart';
 
 @riverpod
 Future<String> captchaUrl(Ref ref) async {
-  final apiClient = ref.watch(apiClientProvider);
-  final resp = await apiClient.get('/.well-known/services');
-  final serviceMapping = await resp.data;
-  var baseUrl = serviceMapping['DysonNetwork.Pass'] as String;
-  // The backend using self-signed certicates on development
-  // Which mobile simulator might not accept, use this to avoid errors
-  if (baseUrl.contains('https://localhost')) baseUrl = 'http://localhost:5216';
-  return '$baseUrl/captcha';
+  const baseUrl = "https://solian.app";
+  return '$baseUrl/auth/captcha';
 }

lib/screens/auth/captcha.config.g.dart

@@ -6,7 +6,7 @@ part of 'captcha.config.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$captchaUrlHash() => r'bbed0d18272dd205069642b3c6583ea2eef735d1';
+String _$captchaUrlHash() => r'd46bc43032cef504547cd528a40c23cf76f27cc8';
 
 /// See also [captchaUrl].
 @ProviderFor(captchaUrl)

lib/screens/auth/login.dart

@@ -1,9 +1,6 @@
 import 'dart:convert';
-import 'dart:io';
 import 'dart:math' as math;
-
 import 'package:animations/animations.dart';
-import 'package:device_info_plus/device_info_plus.dart';
 import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/foundation.dart';
@@ -42,22 +39,6 @@ final Map<int, (String, String, IconData)> kFactorTypes = {
   4: ('authFactorPin', 'authFactorPinDescription', Symbols.nest_secure_alarm),
 };
 
-Future<String?> getDeviceName() async {
-  if (kIsWeb) return null;
-  String? name;
-  if (Platform.isIOS) {
-    final deviceInfo = await DeviceInfoPlugin().iosInfo;
-    name = deviceInfo.name;
-  } else if (Platform.isAndroid) {
-    final deviceInfo = await DeviceInfoPlugin().androidInfo;
-    name = deviceInfo.name;
-  } else if (Platform.isWindows) {
-    final deviceInfo = await DeviceInfoPlugin().windowsInfo;
-    name = deviceInfo.computerName;
-  }
-  return name;
-}
-
 class LoginScreen extends HookConsumerWidget {
   const LoginScreen({super.key});
 

lib/screens/chat/chat.dart

@@ -543,7 +543,7 @@ class EditChatScreen extends HookConsumerWidget {
         final token = await getToken(ref.watch(tokenProvider));
         if (token == null) throw ArgumentError('Token is null');
         final cloudFile =
-            await putMediaToCloud(
+            await putFileToCloud(
               fileData: UniversalFile(
                 data: result,
                 type: UniversalFileType.image,

lib/screens/chat/room.dart

@@ -289,7 +289,6 @@ class MessagesNotifier extends _$MessagesNotifier {
   bool? _withAttachments;
 
   late final String _roomId;
-  int _currentPage = 0;
   static const int _pageSize = 20;
   bool _hasMore = true;
   bool _isSyncing = false;
@@ -565,47 +564,46 @@ class MessagesNotifier extends _$MessagesNotifier {
     }
   }
 
-  Future<void> loadInitial() async {
-    developer.log('Loading initial messages', name: 'MessagesNotifier');
-    if (_searchQuery == null || _searchQuery!.isEmpty) {
-      syncMessages();
-    }
-    final messages = await _getCachedMessages(offset: 0, take: 100);
-    _currentPage = 0;
-    _hasMore = messages.length == _pageSize;
-    state = AsyncValue.data(messages);
+Future<void> loadInitial() async {
+  developer.log('Loading initial messages', name: 'MessagesNotifier');
+  if (_searchQuery == null || _searchQuery!.isEmpty) {
+    syncMessages();
   }
 
-  Future<void> loadMore() async {
-    if (!_hasMore || state is AsyncLoading) return;
-    developer.log('Loading more messages', name: 'MessagesNotifier');
+  final messages = await _getCachedMessages(offset: 0, take: _pageSize);
 
-    try {
-      final currentMessages = state.value ?? [];
-      _currentPage++;
-      final newMessages = await listMessages(
-        offset: _currentPage * _pageSize,
-        take: _pageSize,
-      );
+  _hasMore = messages.length == _pageSize;
 
-      if (newMessages.isEmpty || newMessages.length < _pageSize) {
-        _hasMore = false;
-      }
+  state = AsyncValue.data(messages);
+}
 
-      state = AsyncValue.data(
-        _sortMessages([...currentMessages, ...newMessages]),
-      );
-    } catch (err, stackTrace) {
-      developer.log(
-        'Error loading more messages',
-        name: 'MessagesNotifier',
-        error: err,
-        stackTrace: stackTrace,
-      );
-      showErrorAlert(err);
-      _currentPage--;
+Future<void> loadMore() async {
+  if (!_hasMore || state is AsyncLoading) return;
+  developer.log('Loading more messages', name: 'MessagesNotifier');
+
+  try {
+    final currentMessages = state.value ?? [];
+    final offset = currentMessages.length;
+
+    final newMessages = await listMessages(offset: offset, take: _pageSize);
+
+    if (newMessages.isEmpty || newMessages.length < _pageSize) {
+      _hasMore = false;
     }
+
+    state = AsyncValue.data(
+      _sortMessages([...currentMessages, ...newMessages]),
+    );
+  } catch (err, stackTrace) {
+    developer.log(
+      'Error loading more messages',
+      name: 'MessagesNotifier',
+      error: err,
+      stackTrace: stackTrace,
+    );
+    showErrorAlert(err);
   }
+}
 
   Future<void> sendMessage(
     String content,
@@ -651,7 +649,7 @@ class MessagesNotifier extends _$MessagesNotifier {
       var cloudAttachments = List.empty(growable: true);
       for (var idx = 0; idx < attachments.length; idx++) {
         final cloudFile =
-            await putMediaToCloud(
+            await putFileToCloud(
               fileData: attachments[idx],
               atk: token,
               baseUrl: baseUrl,

lib/screens/chat/room.g.dart

@@ -6,7 +6,7 @@ part of 'room.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$messagesNotifierHash() => r'fc3b66dfb8dd3fc55d142dae5c5e7bdc67eca5d4';
+String _$messagesNotifierHash() => r'82a91344328ec44dfe934c80a4a770431d864bff';
 
 /// Copied from Dart SDK
 class _SystemHash {

lib/screens/chat/room_detail.dart

@@ -727,7 +727,11 @@ class _ChatMemberListSheet extends HookConsumerWidget {
                         children: [
                           Flexible(child: Text(member.account.nick)),
                           if (member.status != null)
-                            AccountStatusLabel(status: member.status!),
+                            AccountStatusLabel(
+                              status: member.status!,
+                              maxLines: 1,
+                              overflow: TextOverflow.ellipsis,
+                            ),
                           if (member.joinedAt == null)
                             const Icon(Symbols.pending_actions, size: 20),
                         ],

lib/screens/creators/poll/poll_list.dart

@@ -1,3 +1,4 @@
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:go_router/go_router.dart';
@@ -10,6 +11,7 @@ import 'package:material_symbols_icons/symbols.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';
 import 'package:island/widgets/extended_refresh_indicator.dart';
+import 'package:styled_widget/styled_widget.dart';
 
 part 'poll_list.g.dart';
 
@@ -117,14 +119,14 @@ class CreatorPollListScreen extends HookConsumerWidget {
   }
 }
 
-class _CreatorPollItem extends StatelessWidget {
+class _CreatorPollItem extends HookConsumerWidget {
   final String pubName;
   const _CreatorPollItem({required this.pollWithStats, required this.pubName});
 
   final SnPollWithStats pollWithStats;
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
     final theme = Theme.of(context);
     final ended = pollWithStats.endedAt;
     final endedText =
@@ -167,7 +169,7 @@ class _CreatorPollItem extends StatelessWidget {
                     children: [
                       const Icon(Symbols.edit),
                       const Gap(16),
-                      Text('Edit'),
+                      Text('edit').tr(),
                     ],
                   ),
                   onTap: () {
@@ -177,6 +179,61 @@ class _CreatorPollItem extends StatelessWidget {
                     );
                   },
                 ),
+                PopupMenuItem(
+                  child: Row(
+                    children: [
+                      const Icon(Symbols.delete, color: Colors.red),
+                      const Gap(16),
+                      Text('delete').tr().textColor(Colors.red),
+                    ],
+                  ),
+                  onTap: () async {
+                    final confirmed = await showDialog<bool>(
+                      context: context,
+                      builder:
+                          (context) => AlertDialog(
+                            title: Text('Delete Poll'),
+                            content: Text(
+                              'Are you sure you want to delete this poll?',
+                            ),
+                            actions: [
+                              TextButton(
+                                onPressed:
+                                    () => Navigator.of(context).pop(false),
+                                child: Text('Cancel'),
+                              ),
+                              TextButton(
+                                onPressed:
+                                    () => Navigator.of(context).pop(true),
+                                child: Text('Delete'),
+                              ),
+                            ],
+                          ),
+                    );
+                    if (confirmed == true) {
+                      try {
+                        final client = ref.read(apiClientProvider);
+                        await client.delete(
+                          '/sphere/polls/${pollWithStats.id}',
+                        );
+                        ref.invalidate(pollListNotifierProvider(pubName));
+                        if (context.mounted) {
+                          ScaffoldMessenger.of(context).showSnackBar(
+                            SnackBar(
+                              content: Text('Poll deleted successfully'),
+                            ),
+                          );
+                        }
+                      } catch (e) {
+                        if (context.mounted) {
+                          ScaffoldMessenger.of(context).showSnackBar(
+                            SnackBar(content: Text('Failed to delete poll')),
+                          );
+                        }
+                      }
+                    }
+                  },
+                ),
               ],
         ),
         onTap: () {

lib/screens/creators/publishers.dart

@@ -78,6 +78,7 @@ class EditPublisherScreen extends HookConsumerWidget {
       result = await cropImage(
         context,
         image: result,
+        replacePath: true,
         allowedAspectRatios: [
           if (position == 'background')
             CropAspectRatio(height: 7, width: 16)
@@ -98,7 +99,7 @@ class EditPublisherScreen extends HookConsumerWidget {
         final token = await getToken(ref.watch(tokenProvider));
         if (token == null) throw ArgumentError('Token is null');
         final cloudFile =
-            await putMediaToCloud(
+            await putFileToCloud(
               fileData: UniversalFile(
                 data: result,
                 type: UniversalFileType.image,

lib/screens/developers/edit_app.dart

@@ -141,7 +141,7 @@ class EditAppScreen extends HookConsumerWidget {
         final token = await getToken(ref.watch(tokenProvider));
         if (token == null) throw ArgumentError('Token is null');
         final cloudFile =
-            await putMediaToCloud(
+            await putFileToCloud(
               fileData: UniversalFile(
                 data: result,
                 type: UniversalFileType.image,

lib/screens/developers/edit_bot.dart

@@ -127,7 +127,7 @@ class EditBotScreen extends HookConsumerWidget {
         final token = await getToken(ref.watch(tokenProvider));
         if (token == null) throw ArgumentError('Token is null');
         final cloudFile =
-            await putMediaToCloud(
+            await putFileToCloud(
               fileData: UniversalFile(
                 data: result,
                 type: UniversalFileType.image,

lib/screens/notification.dart

@@ -39,7 +39,7 @@ class NotificationUnreadCountNotifier
 
     try {
       final client = ref.read(apiClientProvider);
-      final response = await client.get('/pusher/notifications/count');
+      final response = await client.get('/ring/notifications/count');
       return (response.data as num).toInt();
     } catch (_) {
       return 0;
@@ -89,7 +89,7 @@ class NotificationListNotifier extends _$NotificationListNotifier
     final queryParams = {'offset': offset, 'take': _pageSize};
 
     final response = await client.get(
-      '/pusher/notifications',
+      '/ring/notifications',
       queryParameters: queryParams,
     );
     final total = int.parse(response.headers.value('X-Total') ?? '0');
@@ -121,7 +121,7 @@ class NotificationScreen extends HookConsumerWidget {
     Future<void> markAllRead() async {
       showLoadingModal(context);
       final apiClient = ref.watch(apiClientProvider);
-      await apiClient.post('/pusher/notifications/all/read');
+      await apiClient.post('/ring/notifications/all/read');
       if (!context.mounted) return;
       hideLoadingModal(context);
       ref.invalidate(notificationListNotifierProvider);

lib/screens/notification.g.dart

@@ -7,7 +7,7 @@ part of 'notification.dart';
 // **************************************************************************
 
 String _$notificationUnreadCountNotifierHash() =>
-    r'0763b66bd64e5a9b7c317887e109ab367515dfa4';
+    r'08c773809958d96a7ce82acf04af1f9e0b23e119';
 
 /// See also [NotificationUnreadCountNotifier].
 @ProviderFor(NotificationUnreadCountNotifier)
@@ -28,7 +28,7 @@ final notificationUnreadCountNotifierProvider =
 
 typedef _$NotificationUnreadCountNotifier = AutoDisposeAsyncNotifier<int>;
 String _$notificationListNotifierHash() =>
-    r'5099466db475bbcf1ab6b514eb072f1dc4c6f930';
+    r'260046e11f45b0d67ab25bcbdc8604890d71ccc7';
 
 /// See also [NotificationListNotifier].
 @ProviderFor(NotificationListNotifier)

lib/screens/poll/poll_editor.dart

@@ -10,6 +10,7 @@ import 'package:island/pods/network.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/models/poll.dart';
 import 'package:island/widgets/app_scaffold.dart';
+import 'package:styled_widget/styled_widget.dart';
 import 'package:uuid/uuid.dart';
 import 'package:easy_localization/easy_localization.dart';
 
@@ -516,8 +517,7 @@ class PollEditorScreen extends ConsumerWidget {
                   if (model.questions.isEmpty)
                     _EmptyState(
                       title: 'pollNoQuestionsYet'.tr(),
-                      subtitle:
-                          'pollNoQuestionsHint'.tr(),
+                      subtitle: 'pollNoQuestionsHint'.tr(),
                     )
                   else
                     ReorderableListView.builder(
@@ -579,24 +579,32 @@ class PollEditorScreen extends ConsumerWidget {
               ),
             ),
           ),
-          Row(
-            children: [
-              OutlinedButton.icon(
-                onPressed: () {
-                  Navigator.of(context).maybePop();
-                },
-                icon: const Icon(Icons.close),
-                label: Text('cancel'.tr()),
-              ),
-              const Spacer(),
-              FilledButton.icon(
-                onPressed: () {
-                  _submitPoll(context, ref);
-                },
-                icon: const Icon(Icons.cloud_upload_outlined),
-                label: Text(model.id == null ? 'create'.tr() : 'update'.tr()),
-              ),
-            ],
+          Material(
+            elevation: 2,
+            color: Theme.of(context).colorScheme.surfaceContainer,
+            child: Row(
+              children: [
+                OutlinedButton.icon(
+                  onPressed: () {
+                    Navigator.of(context).maybePop();
+                  },
+                  icon: const Icon(Icons.close),
+                  label: Text('cancel'.tr()),
+                ),
+                const Spacer(),
+                FilledButton.icon(
+                  onPressed: () {
+                    _submitPoll(context, ref);
+                  },
+                  icon: const Icon(Icons.cloud_upload_outlined),
+                  label: Text(model.id == null ? 'create'.tr() : 'update'.tr()),
+                ),
+              ],
+            ).padding(
+              horizontal: 24,
+              top: 16,
+              bottom: MediaQuery.of(context).padding.bottom + 16,
+            ),
           ),
         ],
       ),
@@ -1049,7 +1057,9 @@ class _TextAnswerPreview extends StatelessWidget {
       maxLines: long ? 4 : 1,
       decoration: InputDecoration(
         labelText:
-            long ? 'pollLongTextAnswerPreview'.tr() : 'pollShortTextAnswerPreview'.tr(),
+            long
+                ? 'pollLongTextAnswerPreview'.tr()
+                : 'pollShortTextAnswerPreview'.tr(),
         border: const OutlineInputBorder(
           borderRadius: BorderRadius.all(Radius.circular(16)),
         ),
@@ -1083,9 +1093,15 @@ class _EmptyState extends StatelessWidget {
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                Text('pollNoQuestionsYet'.tr(), style: Theme.of(context).textTheme.titleMedium),
+                Text(
+                  'pollNoQuestionsYet'.tr(),
+                  style: Theme.of(context).textTheme.titleMedium,
+                ),
                 const Gap(4),
-                Text('pollNoQuestionsHint'.tr(), style: Theme.of(context).textTheme.bodyMedium),
+                Text(
+                  'pollNoQuestionsHint'.tr(),
+                  style: Theme.of(context).textTheme.bodyMedium,
+                ),
               ],
             ),
           ),

lib/screens/posts/compose_article.dart

@@ -2,7 +2,6 @@ import 'dart:async';
 
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -128,14 +127,6 @@ class ArticleComposeScreen extends HookConsumerWidget {
       return null;
     }, []);
 
-    // Auto-save cleanup
-    useEffect(() {
-      return () {
-        state.stopAutoSave();
-        ComposeLogic.dispose(state);
-      };
-    }, [state]);
-
     // Helper methods
     void showSettingsSheet() {
       showModalBottomSheet(
@@ -182,6 +173,12 @@ class ArticleComposeScreen extends HookConsumerWidget {
                           MarkdownTextContent(
                             content: contentValue.text,
                             textStyle: theme.textTheme.bodyMedium,
+                            attachments:
+                                state.attachments.value
+                                    .where((e) => e.isOnCloud)
+                                    .map((e) => e.data)
+                                    .cast<SnCloudFile>()
+                                    .toList(),
                           ),
                       ],
                     );
@@ -268,7 +265,7 @@ class ArticleComposeScreen extends HookConsumerWidget {
                 child: KeyboardListener(
                   focusNode: FocusNode(),
                   onKeyEvent:
-                      (event) => _handleKeyPress(
+                      (event) => ComposeLogic.handleKeyPress(
                         event,
                         state,
                         ref,
@@ -511,38 +508,4 @@ class ArticleComposeScreen extends HookConsumerWidget {
       ),
     );
   }
-
-  // Helper method to handle keyboard shortcuts
-  void _handleKeyPress(
-    KeyEvent event,
-    ComposeState state,
-    WidgetRef ref,
-    BuildContext context, {
-    SnPost? originalPost,
-  }) {
-    if (event is! RawKeyDownEvent) return;
-
-    final isPaste = event.logicalKey == LogicalKeyboardKey.keyV;
-    final isSave = event.logicalKey == LogicalKeyboardKey.keyS;
-    final isModifierPressed =
-        HardwareKeyboard.instance.isMetaPressed ||
-        HardwareKeyboard.instance.isControlPressed;
-    final isSubmit = event.logicalKey == LogicalKeyboardKey.enter;
-
-    if (isPaste && isModifierPressed) {
-      ComposeLogic.handlePaste(state);
-    } else if (isSave && isModifierPressed) {
-      ComposeLogic.saveDraft(ref, state);
-      ComposeLogic.saveDraft(ref, state);
-    } else if (isSubmit && isModifierPressed && !state.submitting.value) {
-      ComposeLogic.performAction(
-        ref,
-        state,
-        context,
-        originalPost: originalPost,
-      );
-    }
-  }
-
-  // Helper method to save article draft
 }

lib/screens/posts/post_detail.dart

@@ -13,6 +13,7 @@ import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
 import 'package:island/widgets/extended_refresh_indicator.dart';
 import 'package:island/widgets/post/post_item.dart';
+import 'package:island/widgets/post/post_award_history_sheet.dart';
 import 'package:island/widgets/post/post_pin_sheet.dart';
 import 'package:island/widgets/post/post_quick_reply.dart';
 import 'package:island/widgets/post/post_replies.dart';
@@ -77,6 +78,22 @@ class PostActionButtons extends HookConsumerWidget {
     final isAuthor =
         user.value != null && user.value?.id == post.publisher.accountId;
 
+    String formatScore(int score) {
+      if (score >= 1000000) {
+        double value = score / 1000000;
+        return value % 1 == 0
+            ? '${value.toInt()}m'
+            : '${value.toStringAsFixed(1)}m';
+      } else if (score >= 1000) {
+        double value = score / 1000;
+        return value % 1 == 0
+            ? '${value.toInt()}k'
+            : '${value.toStringAsFixed(1)}k';
+      } else {
+        return score.toString();
+      }
+    }
+
     final actions = <Widget>[];
 
     const kButtonHeight = 40.0;
@@ -254,6 +271,24 @@ class PostActionButtons extends HookConsumerWidget {
       ),
     ];
 
+    actions.add(
+      FilledButton.tonalIcon(
+        onPressed: () {},
+        onLongPress: () {
+          showModalBottomSheet(
+            context: context,
+            isScrollControlled: true,
+            builder: (context) => PostAwardHistorySheet(postId: post.id),
+          );
+        },
+        icon: const Icon(Symbols.star),
+        label:
+            post.awardedScore > 0
+                ? Text('${formatScore(post.awardedScore)} pts')
+                : Text('award').tr(),
+      ),
+    );
+
     actions.add(
       Row(
         mainAxisSize: MainAxisSize.min,

lib/screens/posts/post_search.dart

@@ -277,8 +277,6 @@ class PostSearchScreen extends HookConsumerWidget {
                   Text('pinned'.tr()),
                 ],
               ),
-              // TODO: Add dropdown for type selection
-              // TODO: Add multi-select for categories and tags
             ],
           ),
         ),

lib/screens/posts/pub_profile.dart

@@ -21,7 +21,7 @@ import 'package:island/widgets/content/cloud_files.dart';
 import 'package:island/widgets/content/markdown.dart';
 import 'package:island/widgets/post/post_list.dart';
 import 'package:material_symbols_icons/symbols.dart';
-import 'package:palette_generator/palette_generator.dart';
+import 'package:island/services/color_extraction.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:styled_widget/styled_widget.dart';
 
@@ -278,14 +278,14 @@ Future<Color?> publisherAppbarForcegroundColor(Ref ref, String pubName) async {
   try {
     final publisher = await ref.watch(publisherProvider(pubName).future);
     if (publisher.background == null) return null;
-    final palette = await PaletteGenerator.fromImageProvider(
+    final colors = await ColorExtractionService.getColorsFromImage(
       CloudImageWidget.provider(
         fileId: publisher.background!.id,
         serverUrl: ref.watch(serverUrlProvider),
       ),
     );
-    final dominantColor = palette.dominantColor?.color;
-    if (dominantColor == null) return null;
+    if (colors.isEmpty) return null;
+    final dominantColor = colors.first;
     return dominantColor.computeLuminance() > 0.5 ? Colors.black : Colors.white;
   } catch (_) {
     return null;

lib/screens/posts/pub_profile.g.dart

@@ -400,7 +400,7 @@ class _PublisherSubscriptionStatusProviderElement
 }
 
 String _$publisherAppbarForcegroundColorHash() =>
-    r'd781a806a242aea5c1609ec98c97c52fdd9f7db1';
+    r'cd9a9816177a6eecc2bc354acebbbd48892ffdd7';
 
 /// See also [publisherAppbarForcegroundColor].
 @ProviderFor(publisherAppbarForcegroundColor)

lib/screens/realm/realm_detail.dart

@@ -8,7 +8,7 @@ import 'package:island/services/responsive.dart';
 import 'package:island/widgets/account/account_pfc.dart';
 import 'package:island/widgets/account/status.dart';
 import 'package:island/widgets/post/post_list.dart';
-import 'package:palette_generator/palette_generator.dart';
+import 'package:island/services/color_extraction.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
 import 'package:go_router/go_router.dart';
@@ -32,14 +32,14 @@ part 'realm_detail.g.dart';
 Future<Color?> realmAppbarForegroundColor(Ref ref, String realmSlug) async {
   final realm = await ref.watch(realmProvider(realmSlug).future);
   if (realm?.background == null) return null;
-  final palette = await PaletteGenerator.fromImageProvider(
+  final colors = await ColorExtractionService.getColorsFromImage(
     CloudImageWidget.provider(
       fileId: realm!.background!.id,
       serverUrl: ref.watch(serverUrlProvider),
     ),
   );
-  final dominantColor = palette.dominantColor?.color;
-  if (dominantColor == null) return null;
+  if (colors.isEmpty) return null;
+  final dominantColor = colors.first;
   return dominantColor.computeLuminance() > 0.5 ? Colors.black : Colors.white;
 }
 
@@ -668,7 +668,13 @@ class _RealmMemberListSheet extends HookConsumerWidget {
                   title: Row(
                     spacing: 6,
                     children: [
-                      Flexible(child: Text(member.account!.nick)),
+                      Flexible(
+                        child: Text(
+                          member.account!.nick,
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
+                        ),
+                      ),
                       if (member.status != null)
                         AccountStatusLabel(status: member.status!),
                       if (member.joinedAt == null)

lib/screens/realm/realm_detail.g.dart

@@ -7,7 +7,7 @@ part of 'realm_detail.dart';
 // **************************************************************************
 
 String _$realmAppbarForegroundColorHash() =>
-    r'14b5563d861996ea182d0d2db7aa5c2bb3bbaf48';
+    r'8131c047a984318a4cc3fbb5daa5ef0ce44dfae5';
 
 /// Copied from Dart SDK
 class _SystemHash {

lib/screens/realm/realms.dart

@@ -211,7 +211,7 @@ class EditRealmScreen extends HookConsumerWidget {
         final token = await getToken(ref.watch(tokenProvider));
         if (token == null) throw ArgumentError('Access token is null');
         final cloudFile =
-            await putMediaToCloud(
+            await putFileToCloud(
               fileData: UniversalFile(
                 data: result,
                 type: UniversalFileType.image,

lib/screens/settings.dart

@@ -12,14 +12,16 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:island/pods/network.dart';
+import 'package:island/services/color_extraction.dart';
 import 'package:island/services/responsive.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
 import 'package:material_symbols_icons/symbols.dart';
-import 'package:palette_generator/palette_generator.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:styled_widget/styled_widget.dart';
 import 'package:island/pods/config.dart';
+import 'package:island/pods/pool_provider.dart';
+import 'package:island/models/file_pool.dart';
 
 class SettingsScreen extends HookConsumerWidget {
   const SettingsScreen({super.key});
@@ -33,7 +35,7 @@ class SettingsScreen extends HookConsumerWidget {
     final isDesktop =
         !kIsWeb && (Platform.isWindows || Platform.isMacOS || Platform.isLinux);
     final isWide = isWideScreen(context);
-
+    final poolsAsync = ref.watch(poolsProvider);
     final docBasepath = useState<String?>(null);
 
     useEffect(() {
@@ -293,24 +295,26 @@ class SettingsScreen extends HookConsumerWidget {
               trailing: const Icon(Symbols.chevron_right),
               onTap: () async {
                 showLoadingModal(context);
-                final palette = await PaletteGenerator.fromImageProvider(
+                final colors = await ColorExtractionService.getColorsFromImage(
                   FileImage(
                     File('${docBasepath.value}/$kAppBackgroundImagePath'),
                   ),
                 );
-                if (palette.darkVibrantColor == null ||
-                    palette.lightVibrantColor == null) {
+                if (colors.isEmpty) {
                   if (context.mounted) hideLoadingModal(context);
                   showErrorAlert(
-                    'Unable to calculate the domiant color of the background image.',
+                    'Unable to calculate the dominant color of the background image.',
                   );
                   return;
                 }
                 if (!context.mounted) return;
+                final colorScheme = ColorScheme.fromSeed(
+                  seedColor: colors.first,
+                );
                 final color =
                     MediaQuery.of(context).platformBrightness == Brightness.dark
-                        ? palette.darkVibrantColor!.color
-                        : palette.lightVibrantColor!.color;
+                        ? colorScheme.primary
+                        : colorScheme.primary;
                 ref
                     .read(appSettingsNotifierProvider.notifier)
                     .setAppColorScheme(color.value);
@@ -365,6 +369,66 @@ class SettingsScreen extends HookConsumerWidget {
           ),
         ),
       ),
+
+      poolsAsync.when(
+        data: (pools) {
+          final validPools = pools.filterValid();
+          final currentPoolId = resolveDefaultPoolId(ref, pools);
+
+          return ListTile(
+            isThreeLine: true,
+            minLeadingWidth: 48,
+            title: Text('settingsDefaultPool').tr(),
+            contentPadding: const EdgeInsets.only(left: 24, right: 17),
+            leading: const Icon(Symbols.cloud),
+            subtitle: Text(
+              validPools
+                      .firstWhereOrNull((p) => p.id == currentPoolId)
+                      ?.description ??
+                  'settingsDefaultPoolHelper'.tr(),
+              style: Theme.of(context).textTheme.bodySmall,
+            ),
+            trailing: DropdownButtonHideUnderline(
+              child: DropdownButton2<String>(
+                isExpanded: true,
+                items:
+                    validPools.map((p) {
+                      return DropdownMenuItem<String>(
+                        value: p.id,
+                        child: Text(p.name).fontSize(14),
+                      );
+                    }).toList(),
+                value: currentPoolId,
+                onChanged: (value) {
+                  ref
+                      .read(appSettingsNotifierProvider.notifier)
+                      .setDefaultPoolId(value);
+                  showSnackBar('settingsApplied'.tr());
+                },
+                buttonStyleData: const ButtonStyleData(
+                  padding: EdgeInsets.symmetric(horizontal: 16, vertical: 5),
+                  height: 40,
+                  width: 220,
+                ),
+                menuItemStyleData: const MenuItemStyleData(height: 40),
+              ),
+            ),
+          );
+        },
+        loading:
+            () => const ListTile(
+              minLeadingWidth: 48,
+              title: Text('Loading pools...'),
+              leading: CircularProgressIndicator(),
+            ),
+        error:
+            (err, st) => ListTile(
+              minLeadingWidth: 48,
+              title: Text('settingsDefaultPool').tr(),
+              subtitle: Text('Error: $err'),
+              leading: const Icon(Icons.error, color: Colors.red),
+            ),
+      ),
     ];
 
     final behaviorSettings = [

lib/screens/tray_manager.dart

@@ -48,11 +48,12 @@ class TrayService {
   void handleAction(MenuItem item) {
     switch (item.key) {
       case 'show_window':
-        if (appWindow.isVisible) {
-          appWindow.restore();
-        } else {
-          appWindow.show();
-        }
+        () async {
+        appWindow.show();
+        appWindow.restore();
+        await Future.delayed(const Duration(milliseconds: 32));
+        appWindow.show();
+        }();
         break;
       case 'exit_app':
         appWindow.close();

lib/services/color_extraction.dart

@@ -0,0 +1,49 @@
+import 'package:flutter/widgets.dart';
+import 'package:image/image.dart' as img;
+import 'package:material_color_utilities/material_color_utilities.dart' as mcu;
+
+class ColorExtractionService {
+  /// Extracts dominant colors from an image provider.
+  /// Returns a list of colors suitable for UI theming.
+  static Future<List<Color>> getColorsFromImage(ImageProvider provider) async {
+    try {
+      if (provider is FileImage) {
+        final bytes = await provider.file.readAsBytes();
+        final image = img.decodeImage(bytes);
+        if (image == null) return [];
+        final Map<int, int> colorToCount = {};
+        for (int y = 0; y < image.height; y++) {
+          for (int x = 0; x < image.width; x++) {
+            final pixel = image.getPixel(x, y) as int;
+            final r = (pixel >> 24) & 0xff;
+            final g = (pixel >> 16) & 0xff;
+            final b = (pixel >> 8) & 0xff;
+            final a = pixel & 0xff;
+            if (a == 0) continue;
+            final argb = (a << 24) | (r << 16) | (g << 8) | b;
+            colorToCount[argb] = (colorToCount[argb] ?? 0) + 1;
+          }
+        }
+        final List<int> filteredResults = mcu.Score.score(
+          colorToCount,
+          desired: 1,
+          filter: true,
+        );
+        final List<int> scoredResults = mcu.Score.score(
+          colorToCount,
+          desired: 4,
+          filter: false,
+        );
+        return <dynamic>{
+          ...filteredResults,
+          ...scoredResults,
+        }.toList().map((argb) => Color(argb)).toList();
+      } else {
+        return [];
+      }
+    } catch (e) {
+      debugPrint('Error getting colors from image: $e');
+      return [];
+    }
+  }
+}

lib/services/compose_storage_db.dart

@@ -39,8 +39,13 @@ class ComposeStorageNotifier extends _$ComposeStorageNotifier {
       await database.addPostDraft(
         PostDraftsCompanion(
           id: Value(updatedDraft.id),
-          post: Value(jsonEncode(updatedDraft.toJson())),
+          title: Value(updatedDraft.title),
+          description: Value(updatedDraft.description),
+          content: Value(updatedDraft.content),
+          visibility: Value(updatedDraft.visibility),
+          type: Value(updatedDraft.type),
           lastModified: Value(updatedDraft.updatedAt ?? DateTime.now()),
+          postData: Value(jsonEncode(updatedDraft.toJson())),
         ),
       );
     } catch (e) {

lib/services/compose_storage_db.g.dart

@@ -7,7 +7,7 @@ part of 'compose_storage_db.dart';
 // **************************************************************************
 
 String _$composeStorageNotifierHash() =>
-    r'4ab4dce85d0a961f096dc3b11505f8f0964dee9d';
+    r'8baf17aa06b6f69641c20645ba8a3dfe01c97f8c';
 
 /// See also [ComposeStorageNotifier].
 @ProviderFor(ComposeStorageNotifier)

lib/services/file.dart

@@ -1,21 +1,23 @@
 import 'dart:async';
-import 'dart:convert';
 import 'dart:io';
 import 'dart:ui';
-
 import 'package:croppy/croppy.dart';
 import 'package:cross_file/cross_file.dart';
+import 'package:dio/dio.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:island/models/file.dart';
+import 'package:island/services/file_uploader.dart';
 import 'package:native_exif/native_exif.dart';
-import 'package:tus_client_dart/tus_client_dart.dart';
+import 'package:path_provider/path_provider.dart';
+
+enum FileUploadMode { generic, mediaSafe }
 
 Future<XFile?> cropImage(
   BuildContext context, {
   required XFile image,
   List<CropAspectRatio?>? allowedAspectRatios,
-  bool replacePath = false,
+  bool replacePath = true,
 }) async {
   final result = await showMaterialImageCropper(
     context,
@@ -40,64 +42,63 @@ Future<XFile?> cropImage(
   );
 }
 
-Completer<SnCloudFile?> putMediaToCloud({
+Completer<SnCloudFile?> putFileToCloud({
   required UniversalFile fileData,
   required String atk,
   required String baseUrl,
+  String? poolId,
   String? filename,
   String? mimetype,
+  FileUploadMode? mode,
   Function(double progress, Duration estimate)? onProgress,
 }) {
   final completer = Completer<SnCloudFile?>();
 
-  // Process the image to remove GPS EXIF data if needed
-  if (fileData.isOnDevice && fileData.type == UniversalFileType.image) {
+  final effectiveMode =
+      mode ??
+      (fileData.type == UniversalFileType.file
+          ? FileUploadMode.generic
+          : FileUploadMode.mediaSafe);
+
+  if (effectiveMode == FileUploadMode.mediaSafe &&
+      fileData.isOnDevice &&
+      fileData.type == UniversalFileType.image) {
     final data = fileData.data;
     if (data is XFile && !kIsWeb && (Platform.isIOS || Platform.isAndroid)) {
-      // Use native_exif to selectively remove GPS data
       Exif.fromPath(data.path)
-          .then((exif) {
-            // Remove GPS-related attributes
-            final gpsAttributes = [
-              'GPSLatitude',
-              'GPSLatitudeRef',
-              'GPSLongitude',
-              'GPSLongitudeRef',
-              'GPSAltitude',
-              'GPSAltitudeRef',
-              'GPSTimeStamp',
-              'GPSProcessingMethod',
-              'GPSDateStamp',
-            ];
-
-            // Create a map of attributes to clear
-            final clearAttributes = <String, String>{};
-            for (final attr in gpsAttributes) {
-              clearAttributes[attr] = '';
-            }
-
-            // Write empty values to remove GPS data
-            return exif.writeAttributes(clearAttributes);
+          .then((exif) async {
+            final gpsAttributes = {
+              'GPSLatitude': '',
+              'GPSLatitudeRef': '',
+              'GPSLongitude': '',
+              'GPSLongitudeRef': '',
+              'GPSAltitude': '',
+              'GPSAltitudeRef': '',
+              'GPSTimeStamp': '',
+              'GPSProcessingMethod': '',
+              'GPSDateStamp': '',
+            };
+            await exif.writeAttributes(gpsAttributes);
           })
-          .then((_) {
-            // Continue with upload after GPS data is removed
-            _processUpload(
+          .then(
+            (_) => _processUpload(
               fileData,
               atk,
               baseUrl,
+              poolId,
               filename,
               mimetype,
               onProgress,
               completer,
-            );
-          })
+            ),
+          )
           .catchError((e) {
-            // If there's an error, continue with the original file
             debugPrint('Error removing GPS EXIF data: $e');
-            _processUpload(
+            return _processUpload(
               fileData,
               atk,
               baseUrl,
+              poolId,
               filename,
               mimetype,
               onProgress,
@@ -109,11 +110,11 @@ Completer<SnCloudFile?> putMediaToCloud({
     }
   }
 
-  // If not an image or on web, continue with normal upload
   _processUpload(
     fileData,
     atk,
     baseUrl,
+    poolId,
     filename,
     mimetype,
     onProgress,
@@ -127,6 +128,7 @@ Completer<SnCloudFile?> _processUpload(
   UniversalFile fileData,
   String atk,
   String baseUrl,
+  String? poolId,
   String? filename,
   String? mimetype,
   Function(double progress, Duration estimate)? onProgress,
@@ -168,26 +170,81 @@ Completer<SnCloudFile?> _processUpload(
     return completer;
   }
 
-  final Map<String, String> metadata = {
-    'filename': actualFilename,
-    'content-type': actualMimetype,
-  };
+  // Create Dio instance
+  final dio = Dio(
+    BaseOptions(
+      baseUrl: baseUrl,
+      headers: {
+        'Authorization': 'AtField $atk',
+        'Accept': 'application/json',
+        'Content-Type': 'application/json',
+      },
+    ),
+  );
 
-  final client = TusClient(file);
-  client
-      .upload(
-        uri: Uri.parse('$baseUrl/drive/tus'),
-        headers: {'Authorization': 'AtField $atk'},
-        metadata: metadata,
-        onComplete: (lastResponse) {
-          final resp = jsonDecode(lastResponse!.headers['x-fileinfo']!);
-          completer.complete(SnCloudFile.fromJson(resp));
-        },
-        onProgress: (double progress, Duration estimate) {
-          onProgress?.call(progress, estimate);
-        },
-      )
-      .catchError(completer.completeError);
+  final uploader = FileUploader(dio);
+
+  // Get File object
+  File fileObj;
+  if (file.path.isNotEmpty) {
+    fileObj = File(file.path);
+    // Call progress start
+    onProgress?.call(0.0, Duration.zero);
+    uploader
+        .uploadFile(
+          file: fileObj,
+          fileName: actualFilename,
+          contentType: actualMimetype,
+          poolId: poolId,
+        )
+        .then((result) {
+          // Call progress end
+          onProgress?.call(1.0, Duration.zero);
+          completer.complete(result);
+        })
+        .catchError((e) {
+          completer.completeError(e);
+          throw e;
+        });
+  } else {
+    // Write to temp file
+    getTemporaryDirectory()
+        .then((tempDir) {
+          final tempFile = File('${tempDir.path}/temp_upload_$actualFilename');
+          file
+              .readAsBytes()
+              .then((bytes) => tempFile.writeAsBytes(bytes))
+              .then((_) {
+                fileObj = tempFile;
+                // Call progress start
+                onProgress?.call(0.0, Duration.zero);
+                uploader
+                    .uploadFile(
+                      file: fileObj,
+                      fileName: actualFilename,
+                      contentType: actualMimetype,
+                      poolId: poolId,
+                    )
+                    .then((result) {
+                      // Call progress end
+                      onProgress?.call(1.0, Duration.zero);
+                      completer.complete(result);
+                    })
+                    .catchError((e) {
+                      completer.completeError(e);
+                      throw e;
+                    });
+              })
+              .catchError((e) {
+                completer.completeError(e);
+                throw e;
+              });
+        })
+        .catchError((e) {
+          completer.completeError(e);
+          throw e;
+        });
+  }
 
   return completer;
 }

lib/services/file_uploader.dart

@@ -0,0 +1,155 @@
+import 'dart:async';
+import 'dart:io';
+import 'dart:typed_data';
+
+import 'package:crypto/crypto.dart';
+import 'package:dio/dio.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:island/models/file.dart';
+import 'package:island/pods/network.dart';
+
+class FileUploader {
+  final Dio _dio;
+
+  FileUploader(this._dio);
+
+  /// Calculates the MD5 hash of a file.
+  Future<String> _calculateFileHash(File file) async {
+    final bytes = await file.readAsBytes();
+    final digest = md5.convert(bytes);
+    return digest.toString();
+  }
+
+  /// Creates an upload task for the given file.
+  Future<Map<String, dynamic>> createUploadTask({
+    required File file,
+    required String fileName,
+    required String contentType,
+    String? poolId,
+    String? bundleId,
+    String? encryptPassword,
+    String? expiredAt,
+    int? chunkSize,
+  }) async {
+    final hash = await _calculateFileHash(file);
+    final fileSize = await file.length();
+
+    final response = await _dio.post(
+      '/drive/files/upload/create',
+      data: {
+        'hash': hash,
+        'file_name': fileName,
+        'file_size': fileSize,
+        'content_type': contentType,
+        'pool_id': poolId,
+        'bundle_id': bundleId,
+        'encrypt_password': encryptPassword,
+        'expired_at': expiredAt,
+        'chunk_size': chunkSize,
+      },
+    );
+
+    return response.data;
+  }
+
+  /// Uploads a single chunk of the file.
+  Future<void> uploadChunk({
+    required String taskId,
+    required int chunkIndex,
+    required Uint8List chunkData,
+  }) async {
+    final formData = FormData.fromMap({
+      'chunk': MultipartFile.fromBytes(
+        chunkData,
+        filename: 'chunk_$chunkIndex',
+      ),
+    });
+
+    await _dio.post(
+      '/drive/files/upload/chunk/$taskId/$chunkIndex',
+      data: formData,
+    );
+  }
+
+  /// Completes the upload and returns the CloudFile object.
+  Future<SnCloudFile> completeUpload(String taskId) async {
+    final response = await _dio.post('/drive/files/upload/complete/$taskId');
+
+    return SnCloudFile.fromJson(response.data);
+  }
+
+  /// Uploads a file in chunks using the multi-part API.
+  Future<SnCloudFile> uploadFile({
+    required File file,
+    required String fileName,
+    required String contentType,
+    String? poolId,
+    String? bundleId,
+    String? encryptPassword,
+    String? expiredAt,
+    int? customChunkSize,
+  }) async {
+    // Step 1: Create upload task
+    final createResponse = await createUploadTask(
+      file: file,
+      fileName: fileName,
+      contentType: contentType,
+      poolId: poolId,
+      bundleId: bundleId,
+      encryptPassword: encryptPassword,
+      expiredAt: expiredAt,
+      chunkSize: customChunkSize,
+    );
+
+    if (createResponse['file_exists'] == true) {
+      // File already exists, return the existing file
+      return SnCloudFile.fromJson(createResponse['file']);
+    }
+
+    final taskId = createResponse['task_id'] as String;
+    final chunkSize = createResponse['chunk_size'] as int;
+    final chunksCount = createResponse['chunks_count'] as int;
+
+    // Step 2: Upload chunks
+    final stream = file.openRead();
+    final chunks = <Uint8List>[];
+    int bytesRead = 0;
+    final buffer = BytesBuilder();
+
+    await for (final chunk in stream) {
+      buffer.add(chunk);
+      bytesRead += chunk.length;
+
+      if (bytesRead >= chunkSize) {
+        chunks.add(buffer.takeBytes());
+        bytesRead = 0;
+      }
+    }
+
+    // Add remaining bytes as last chunk
+    if (buffer.length > 0) {
+      chunks.add(buffer.takeBytes());
+    }
+
+    // Ensure we have the correct number of chunks
+    if (chunks.length != chunksCount) {
+      throw Exception(
+        'Chunk count mismatch: expected $chunksCount, got ${chunks.length}',
+      );
+    }
+
+    // Upload each chunk
+    for (int i = 0; i < chunks.length; i++) {
+      await uploadChunk(taskId: taskId, chunkIndex: i, chunkData: chunks[i]);
+    }
+
+    // Step 3: Complete upload
+    return await completeUpload(taskId);
+  }
+}
+
+// Riverpod provider for the FileUploader service
+final fileUploaderProvider = Provider<FileUploader>((ref) {
+  final dio = ref.watch(apiClientProvider);
+  return FileUploader(dio);
+});

lib/services/notify.dart

@@ -1,230 +1,47 @@
 import 'dart:async';
-import 'dart:developer';
 import 'dart:io';
 
 import 'package:dio/dio.dart';
-import 'package:firebase_messaging/firebase_messaging.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:go_router/go_router.dart';
-import 'package:island/main.dart';
-import 'package:island/route.dart';
-import 'package:island/models/account.dart';
-import 'package:island/pods/websocket.dart';
-import 'package:island/widgets/app_notification.dart';
-import 'package:top_snackbar_flutter/top_snack_bar.dart';
-import 'package:url_launcher/url_launcher_string.dart';
 
-final FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin =
-    FlutterLocalNotificationsPlugin();
-
-AppLifecycleState _appLifecycleState = AppLifecycleState.resumed;
-
-void _onAppLifecycleChanged(AppLifecycleState state) {
-  _appLifecycleState = state;
-}
+// Conditional imports based on platform
+import 'notify.windows.dart' as windows_notify;
+import 'notify.universal.dart' as universal_notify;
 
+// Platform-specific delegation
 Future<void> initializeLocalNotifications() async {
-  const AndroidInitializationSettings initializationSettingsAndroid =
-      AndroidInitializationSettings('@mipmap/ic_launcher');
-
-  const DarwinInitializationSettings initializationSettingsIOS =
-      DarwinInitializationSettings();
-
-  const DarwinInitializationSettings initializationSettingsMacOS =
-      DarwinInitializationSettings();
-
-  const LinuxInitializationSettings initializationSettingsLinux =
-      LinuxInitializationSettings(defaultActionName: 'Open notification');
-
-  const WindowsInitializationSettings initializationSettingsWindows =
-      WindowsInitializationSettings(
-        appName: 'Island',
-        appUserModelId: 'dev.solsynth.solian',
-        guid: 'dev.solsynth.solian',
-      );
-
-  const InitializationSettings initializationSettings = InitializationSettings(
-    android: initializationSettingsAndroid,
-    iOS: initializationSettingsIOS,
-    macOS: initializationSettingsMacOS,
-    linux: initializationSettingsLinux,
-    windows: initializationSettingsWindows,
-  );
-
-  await flutterLocalNotificationsPlugin.initialize(
-    initializationSettings,
-    onDidReceiveNotificationResponse: (NotificationResponse response) async {
-      final payload = response.payload;
-      if (payload != null) {
-        if (payload.startsWith('/')) {
-          // In-app routes
-          rootNavigatorKey.currentContext?.push(payload);
-        } else {
-          // External URLs
-          launchUrlString(payload);
-        }
-      }
-    },
-  );
-
-  WidgetsBinding.instance.addObserver(
-    LifecycleEventHandler(onAppLifecycleChanged: _onAppLifecycleChanged),
-  );
-}
-
-class LifecycleEventHandler extends WidgetsBindingObserver {
-  final void Function(AppLifecycleState) onAppLifecycleChanged;
-
-  LifecycleEventHandler({required this.onAppLifecycleChanged});
-
-  @override
-  void didChangeAppLifecycleState(AppLifecycleState state) {
-    onAppLifecycleChanged(state);
+  if (Platform.isWindows) {
+    return windows_notify.initializeLocalNotifications();
+  } else {
+    return universal_notify.initializeLocalNotifications();
   }
 }
 
-StreamSubscription<WebSocketPacket> setupNotificationListener(
+StreamSubscription setupNotificationListener(
   BuildContext context,
   WidgetRef ref,
 ) {
-  final ws = ref.watch(websocketProvider);
-  return ws.dataStream.listen((pkt) async {
-    if (pkt.type == "notifications.new") {
-      final notification = SnNotification.fromJson(pkt.data!);
-      if (_appLifecycleState == AppLifecycleState.resumed) {
-        // App is focused, show in-app notification
-        log(
-          '[Notification] Showing in-app notification: ${notification.title}',
-        );
-        showTopSnackBar(
-          globalOverlay.currentState!,
-          Center(
-            child: ConstrainedBox(
-              constraints: const BoxConstraints(maxWidth: 480),
-              child: NotificationCard(notification: notification),
-            ),
-          ),
-          onTap: () {
-            if (notification.meta['action_uri'] != null) {
-              var uri = notification.meta['action_uri'] as String;
-              if (uri.startsWith('/')) {
-                // In-app routes
-                rootNavigatorKey.currentContext?.push(
-                  notification.meta['action_uri'],
-                );
-              } else {
-                // External URLs
-                launchUrlString(uri);
-              }
-            }
-          },
-          onDismissed: () {},
-          dismissType: DismissType.onSwipe,
-          displayDuration: const Duration(seconds: 5),
-          snackBarPosition: SnackBarPosition.top,
-          padding: EdgeInsets.only(
-            left: 16,
-            right: 16,
-            top:
-                (!kIsWeb &&
-                        (Platform.isMacOS ||
-                            Platform.isWindows ||
-                            Platform.isLinux))
-                    ? 28
-                    // ignore: use_build_context_synchronously
-                    : MediaQuery.of(context).padding.top + 16,
-            bottom: 16,
-          ),
-        );
-      } else {
-        // App is in background, show system notification (only on supported platforms)
-        if (!kIsWeb && !Platform.isIOS) {
-          log(
-            '[Notification] Showing system notification: ${notification.title}',
-          );
-          const AndroidNotificationDetails androidNotificationDetails =
-              AndroidNotificationDetails(
-                'channel_id',
-                'channel_name',
-                channelDescription: 'channel_description',
-                importance: Importance.max,
-                priority: Priority.high,
-                ticker: 'ticker',
-              );
-          const NotificationDetails notificationDetails = NotificationDetails(
-            android: androidNotificationDetails,
-          );
-          await flutterLocalNotificationsPlugin.show(
-            0,
-            notification.title,
-            notification.content,
-            notificationDetails,
-            payload: notification.meta['action_uri'] as String?,
-          );
-        } else {
-          log(
-            '[Notification] Skipping system notification for unsupported platform: ${notification.title}',
-          );
-        }
-      }
-    }
-  });
+  if (Platform.isWindows) {
+    return windows_notify.setupNotificationListener(context, ref);
+  } else {
+    return universal_notify.setupNotificationListener(context, ref);
+  }
 }
 
 Future<void> subscribePushNotification(
   Dio apiClient, {
   bool detailedErrors = false,
 }) async {
-  if (!kIsWeb && Platform.isLinux) {
-    return;
-  }
-  await FirebaseMessaging.instance.requestPermission(
-    alert: true,
-    badge: true,
-    sound: true,
-  );
-
-  String? deviceToken;
-  if (kIsWeb) {
-    deviceToken = await FirebaseMessaging.instance.getToken(
-      vapidKey:
-          "BFN2mkqyeI6oi4d2PAV4pfNyG3Jy0FBEblmmPrjmP0r5lHOPrxrcqLIWhM21R_cicF-j4Xhtr1kyDyDgJYRPLgU",
-    );
-  } else if (Platform.isAndroid) {
-    deviceToken = await FirebaseMessaging.instance.getToken();
-  } else if (Platform.isIOS) {
-    deviceToken = await FirebaseMessaging.instance.getAPNSToken();
-  }
-
-  FirebaseMessaging.instance.onTokenRefresh
-      .listen((fcmToken) {
-        _putTokenToRemote(apiClient, fcmToken, 1);
-      })
-      .onError((err) {
-        log("Failed to get firebase cloud messaging push token: $err");
-      });
-
-  if (deviceToken != null) {
-    _putTokenToRemote(
+  if (Platform.isWindows) {
+    return windows_notify.subscribePushNotification(
       apiClient,
-      deviceToken,
-      !kIsWeb && (Platform.isIOS || Platform.isMacOS) ? 0 : 1,
+      detailedErrors: detailedErrors,
+    );
+  } else {
+    return universal_notify.subscribePushNotification(
+      apiClient,
+      detailedErrors: detailedErrors,
     );
-  } else if (detailedErrors) {
-    throw Exception("Failed to get device token for push notifications.");
   }
 }
-
-Future<void> _putTokenToRemote(
-  Dio apiClient,
-  String token,
-  int provider,
-) async {
-  await apiClient.put(
-    "/pusher/notifications/subscription",
-    data: {"provider": provider, "device_token": token},
-  );
-}

lib/services/notify.universal.dart

@@ -0,0 +1,232 @@
+import 'dart:async';
+import 'dart:developer';
+import 'dart:io';
+
+import 'package:dio/dio.dart';
+import 'package:firebase_messaging/firebase_messaging.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_local_notifications/flutter_local_notifications.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:go_router/go_router.dart';
+import 'package:island/main.dart';
+import 'package:island/route.dart';
+import 'package:island/models/account.dart';
+import 'package:island/pods/websocket.dart';
+import 'package:island/widgets/app_notification.dart';
+import 'package:top_snackbar_flutter/top_snack_bar.dart';
+import 'package:url_launcher/url_launcher_string.dart';
+
+final FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin =
+    FlutterLocalNotificationsPlugin();
+
+AppLifecycleState _appLifecycleState = AppLifecycleState.resumed;
+
+void _onAppLifecycleChanged(AppLifecycleState state) {
+  _appLifecycleState = state;
+}
+
+Future<void> initializeLocalNotifications() async {
+  const AndroidInitializationSettings initializationSettingsAndroid =
+      AndroidInitializationSettings('@mipmap/ic_launcher');
+
+  const DarwinInitializationSettings initializationSettingsIOS =
+      DarwinInitializationSettings();
+
+  const DarwinInitializationSettings initializationSettingsMacOS =
+      DarwinInitializationSettings();
+
+  const LinuxInitializationSettings initializationSettingsLinux =
+      LinuxInitializationSettings(defaultActionName: 'Open notification');
+
+  const WindowsInitializationSettings initializationSettingsWindows =
+      WindowsInitializationSettings(
+        appName: 'Island',
+        appUserModelId: 'dev.solsynth.solian',
+        guid: 'dev.solsynth.solian',
+      );
+
+  const InitializationSettings initializationSettings = InitializationSettings(
+    android: initializationSettingsAndroid,
+    iOS: initializationSettingsIOS,
+    macOS: initializationSettingsMacOS,
+    linux: initializationSettingsLinux,
+    windows: initializationSettingsWindows,
+  );
+
+  await flutterLocalNotificationsPlugin.initialize(
+    initializationSettings,
+    onDidReceiveNotificationResponse: (NotificationResponse response) async {
+      final payload = response.payload;
+      if (payload != null) {
+        if (payload.startsWith('/')) {
+          // In-app routes
+          rootNavigatorKey.currentContext?.push(payload);
+        } else {
+          // External URLs
+          launchUrlString(payload);
+        }
+      }
+    },
+  );
+
+  WidgetsBinding.instance.addObserver(
+    LifecycleEventHandler(onAppLifecycleChanged: _onAppLifecycleChanged),
+  );
+}
+
+class LifecycleEventHandler extends WidgetsBindingObserver {
+  final void Function(AppLifecycleState) onAppLifecycleChanged;
+
+  LifecycleEventHandler({required this.onAppLifecycleChanged});
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    onAppLifecycleChanged(state);
+  }
+}
+
+StreamSubscription<WebSocketPacket> setupNotificationListener(
+  BuildContext context,
+  WidgetRef ref,
+) {
+  final ws = ref.watch(websocketProvider);
+  return ws.dataStream.listen((pkt) async {
+    if (pkt.type == "notifications.new") {
+      final notification = SnNotification.fromJson(pkt.data!);
+      if (_appLifecycleState == AppLifecycleState.resumed) {
+        // App is focused, show in-app notification
+        log(
+          '[Notification] Showing in-app notification: ${notification.title}',
+        );
+        showTopSnackBar(
+          globalOverlay.currentState!,
+          Center(
+            child: ConstrainedBox(
+              constraints: const BoxConstraints(maxWidth: 480),
+              child: NotificationCard(notification: notification),
+            ),
+          ),
+          onTap: () {
+            if (notification.meta['action_uri'] != null) {
+              var uri = notification.meta['action_uri'] as String;
+              if (uri.startsWith('/')) {
+                // In-app routes
+                rootNavigatorKey.currentContext?.push(
+                  notification.meta['action_uri'],
+                );
+              } else {
+                // External URLs
+                launchUrlString(uri);
+              }
+            }
+          },
+          onDismissed: () {},
+          dismissType: DismissType.onSwipe,
+          displayDuration: const Duration(seconds: 5),
+          snackBarPosition: SnackBarPosition.top,
+          padding: EdgeInsets.only(
+            left: 16,
+            right: 16,
+            top:
+                (!kIsWeb &&
+                        (Platform.isMacOS ||
+                            Platform.isWindows ||
+                            Platform.isLinux))
+                    ? 28
+                    // ignore: use_build_context_synchronously
+                    : MediaQuery.of(context).padding.top + 16,
+            bottom: 16,
+          ),
+        );
+      } else {
+        // App is in background, show system notification (only on supported platforms)
+        if (!kIsWeb && !Platform.isIOS) {
+          log(
+            '[Notification] Showing system notification: ${notification.title}',
+          );
+
+          // Use flutter_local_notifications for universal platforms
+          const AndroidNotificationDetails androidNotificationDetails =
+              AndroidNotificationDetails(
+                'channel_id',
+                'channel_name',
+                channelDescription: 'channel_description',
+                importance: Importance.max,
+                priority: Priority.high,
+                ticker: 'ticker',
+              );
+          const NotificationDetails notificationDetails = NotificationDetails(
+            android: androidNotificationDetails,
+          );
+          await flutterLocalNotificationsPlugin.show(
+            0,
+            notification.title,
+            notification.content,
+            notificationDetails,
+            payload: notification.meta['action_uri'] as String?,
+          );
+        } else {
+          log(
+            '[Notification] Skipping system notification for unsupported platform: ${notification.title}',
+          );
+        }
+      }
+    }
+  });
+}
+
+Future<void> subscribePushNotification(
+  Dio apiClient, {
+  bool detailedErrors = false,
+}) async {
+  if (!kIsWeb && Platform.isLinux) {
+    return;
+  }
+  await FirebaseMessaging.instance.requestPermission(
+    alert: true,
+    badge: true,
+    sound: true,
+  );
+
+  String? deviceToken;
+  if (kIsWeb) {
+    deviceToken = await FirebaseMessaging.instance.getToken(
+      vapidKey:
+          "BFN2mkqyeI6oi4d2PAV4pfNyG3Jy0FBEblmmPrjmP0r5lHOPrxrcqLIWhM21R_cicF-j4Xhtr1kyDyDgJYRPLgU",
+    );
+  } else if (Platform.isAndroid) {
+    deviceToken = await FirebaseMessaging.instance.getToken();
+  } else if (Platform.isIOS) {
+    deviceToken = await FirebaseMessaging.instance.getAPNSToken();
+  }
+
+  FirebaseMessaging.instance.onTokenRefresh
+      .listen((fcmToken) {
+        _putTokenToRemote(apiClient, fcmToken, 1);
+      })
+      .onError((err) {
+        log("Failed to get firebase cloud messaging push token: $err");
+      });
+
+  if (deviceToken != null) {
+    _putTokenToRemote(
+      apiClient,
+      deviceToken,
+      !kIsWeb && (Platform.isIOS || Platform.isMacOS) ? 0 : 1,
+    );
+  } else if (detailedErrors) {
+    throw Exception("Failed to get device token for push notifications.");
+  }
+}
+
+Future<void> _putTokenToRemote(
+  Dio apiClient,
+  String token,
+  int provider,
+) async {
+  await apiClient.put(
+    "/ring/notifications/subscription",
+    data: {"provider": provider, "device_token": token},
+  );
+}

lib/services/notify.windows.dart

@@ -0,0 +1,176 @@
+import 'dart:async';
+import 'dart:developer';
+import 'dart:io';
+
+import 'package:firebase_messaging/firebase_messaging.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:go_router/go_router.dart';
+import 'package:island/main.dart';
+import 'package:island/route.dart';
+import 'package:island/models/account.dart';
+import 'package:island/pods/websocket.dart';
+import 'package:island/widgets/app_notification.dart';
+import 'package:top_snackbar_flutter/top_snack_bar.dart';
+import 'package:url_launcher/url_launcher_string.dart';
+import 'package:windows_notification/windows_notification.dart'
+    as windows_notification;
+import 'package:windows_notification/notification_message.dart';
+
+import 'package:dio/dio.dart';
+
+// Windows notification instance
+windows_notification.WindowsNotification? windowsNotification;
+
+AppLifecycleState _appLifecycleState = AppLifecycleState.resumed;
+
+void _onAppLifecycleChanged(AppLifecycleState state) {
+  _appLifecycleState = state;
+}
+
+Future<void> initializeLocalNotifications() async {
+  // Initialize Windows notification for Windows platform
+  windowsNotification = windows_notification.WindowsNotification(
+    applicationId: 'dev.solsynth.solian',
+  );
+
+  WidgetsBinding.instance.addObserver(
+    LifecycleEventHandler(onAppLifecycleChanged: _onAppLifecycleChanged),
+  );
+}
+
+class LifecycleEventHandler extends WidgetsBindingObserver {
+  final void Function(AppLifecycleState) onAppLifecycleChanged;
+
+  LifecycleEventHandler({required this.onAppLifecycleChanged});
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    onAppLifecycleChanged(state);
+  }
+}
+
+StreamSubscription<WebSocketPacket> setupNotificationListener(
+  BuildContext context,
+  WidgetRef ref,
+) {
+  final ws = ref.watch(websocketProvider);
+  return ws.dataStream.listen((pkt) async {
+    if (pkt.type == "notifications.new") {
+      final notification = SnNotification.fromJson(pkt.data!);
+      if (_appLifecycleState == AppLifecycleState.resumed) {
+        // App is focused, show in-app notification
+        log(
+          '[Notification] Showing in-app notification: ${notification.title}',
+        );
+        showTopSnackBar(
+          globalOverlay.currentState!,
+          Center(
+            child: ConstrainedBox(
+              constraints: const BoxConstraints(maxWidth: 480),
+              child: NotificationCard(notification: notification),
+            ),
+          ),
+          onTap: () {
+            if (notification.meta['action_uri'] != null) {
+              var uri = notification.meta['action_uri'] as String;
+              if (uri.startsWith('/')) {
+                // In-app routes
+                rootNavigatorKey.currentContext?.push(
+                  notification.meta['action_uri'],
+                );
+              } else {
+                // External URLs
+                launchUrlString(uri);
+              }
+            }
+          },
+          onDismissed: () {},
+          dismissType: DismissType.onSwipe,
+          displayDuration: const Duration(seconds: 5),
+          snackBarPosition: SnackBarPosition.top,
+          padding: EdgeInsets.only(
+            left: 16,
+            right: 16,
+            top: 28, // Windows specific padding
+            bottom: 16,
+          ),
+        );
+      } else {
+        // App is in background, show Windows system notification
+        log(
+          '[Notification] Showing Windows system notification: ${notification.title}',
+        );
+
+        if (windowsNotification != null) {
+          // Use Windows notification for Windows platform
+          final notificationMessage = NotificationMessage.fromPluginTemplate(
+            DateTime.now().millisecondsSinceEpoch.toString(), // unique id
+            notification.title,
+            notification.content,
+            launch: notification.meta['action_uri'] as String?,
+          );
+          await windowsNotification!.showNotificationPluginTemplate(
+            notificationMessage,
+          );
+        }
+      }
+    }
+  });
+}
+
+Future<void> subscribePushNotification(
+  Dio apiClient, {
+  bool detailedErrors = false,
+}) async {
+  if (!kIsWeb && Platform.isLinux) {
+    return;
+  }
+  await FirebaseMessaging.instance.requestPermission(
+    alert: true,
+    badge: true,
+    sound: true,
+  );
+
+  String? deviceToken;
+  if (kIsWeb) {
+    deviceToken = await FirebaseMessaging.instance.getToken(
+      vapidKey:
+          "BFN2mkqyeI6oi4d2PAV4pfNyG3Jy0FBEblmmPrjmP0r5lHOPrxrcqLIWhM21R_cicF-j4Xhtr1kyDyDgJYRPLgU",
+    );
+  } else if (Platform.isAndroid) {
+    deviceToken = await FirebaseMessaging.instance.getToken();
+  } else if (Platform.isIOS) {
+    deviceToken = await FirebaseMessaging.instance.getAPNSToken();
+  }
+
+  FirebaseMessaging.instance.onTokenRefresh
+      .listen((fcmToken) {
+        _putTokenToRemote(apiClient, fcmToken, 1);
+      })
+      .onError((err) {
+        log("Failed to get firebase cloud messaging push token: $err");
+      });
+
+  if (deviceToken != null) {
+    _putTokenToRemote(
+      apiClient,
+      deviceToken,
+      !kIsWeb && (Platform.isIOS || Platform.isMacOS) ? 0 : 1,
+    );
+  } else if (detailedErrors) {
+    throw Exception("Failed to get device token for push notifications.");
+  }
+}
+
+Future<void> _putTokenToRemote(
+  Dio apiClient,
+  String token,
+  int provider,
+) async {
+  await apiClient.put(
+    "/ring/notifications/subscription",
+    data: {"provider": provider, "device_token": token},
+  );
+}

lib/services/timezone/native.dart

@@ -14,7 +14,7 @@ Future<void> initializeTzdb() async {
 }
 
 Future<String> getMachineTz() async {
-  return await FlutterTimezone.getLocalTimezone();
+  return (await FlutterTimezone.getLocalTimezone()).identifier;
 }
 
 List<String> getAvailableTz() {

lib/services/timezone/web.dart

@@ -13,7 +13,7 @@ Future<void> initializeTzdb() async {
 }
 
 Future<String> getMachineTz() async {
-  return await FlutterTimezone.getLocalTimezone();
+  return (await FlutterTimezone.getLocalTimezone()).identifier;
 }
 
 List<String> getAvailableTz() {

lib/services/udid.dart

@@ -1 +1,3 @@
-export 'udid.native.dart' if (dart.library.html) 'udid.web.dart';
+export 'udid.native.dart'
+    if (dart.library.html) 'udid.web.dart'
+    if (dart.library.io) 'udid.native.dart';

lib/services/udid.native.dart

@@ -1,3 +1,6 @@
+import 'dart:io';
+import 'package:device_info_plus/device_info_plus.dart';
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter_udid/flutter_udid.dart';
 
 String? _cachedUdid;
@@ -9,3 +12,18 @@ Future<String> getUdid() async {
   _cachedUdid = await FlutterUdid.consistentUdid;
   return _cachedUdid!;
 }
+
+Future<String> getDeviceName() async {
+  DeviceInfoPlugin deviceInfo = DeviceInfoPlugin();
+  if (Platform.isAndroid) {
+    AndroidDeviceInfo androidInfo = await deviceInfo.androidInfo;
+    return androidInfo.device;
+  } else if (Platform.isIOS) {
+    IosDeviceInfo iosInfo = await deviceInfo.iosInfo;
+    return iosInfo.name;
+  } else if (Platform.isLinux || Platform.isMacOS || Platform.isWindows) {
+    return Platform.localHostname;
+  } else {
+    return 'unknown'.tr();
+  }
+}

lib/services/udid.web.dart

@@ -9,3 +9,18 @@ Future<String> getUdid() async {
   final hash = sha256.convert(bytes);
   return hash.toString();
 }
+
+Future<String> getDeviceName() async {
+  final userAgent = window.navigator.userAgent;
+  if (userAgent.contains('Chrome') && !userAgent.contains('Edg')) {
+    return 'Chrome';
+  } else if (userAgent.contains('Firefox')) {
+    return 'Firefox';
+  } else if (userAgent.contains('Safari') && !userAgent.contains('Chrome')) {
+    return 'Safari';
+  } else if (userAgent.contains('Edg')) {
+    return 'Edge';
+  } else {
+    return 'Browser';
+  }
+}

lib/widgets/account/account_devices.dart

@@ -6,10 +6,12 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/account.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/services/responsive.dart';
+import 'package:island/services/time.dart';
 import 'package:island/services/udid.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/content/sheet.dart';
 import 'package:island/widgets/response.dart';
+import 'package:material_symbols_icons/symbols.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:styled_widget/styled_widget.dart';
 import 'package:island/widgets/extended_refresh_indicator.dart';
@@ -43,32 +45,11 @@ class _DeviceListTile extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return ListTile(
-      isThreeLine: true,
-      contentPadding: EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-      leading: Icon(switch (device.platform) {
-        0 => Icons.device_unknown, // Unidentified
-        1 => Icons.web, // Web
-        2 => Icons.phone_iphone, // iOS
-        3 => Icons.phone_android, // Android
-        4 => Icons.laptop_mac, // macOS
-        5 => Icons.window, // Windows
-        6 => Icons.computer, // Linux
-        _ => Icons.device_unknown, // fallback
-      }).padding(top: 4),
-      subtitle: Column(
-        crossAxisAlignment: CrossAxisAlignment.stretch,
+    return ExpansionTile(
+      title: Row(
+        spacing: 8,
         children: [
-          Text(
-            'lastActiveAt'.tr(
-              args: [
-                DateFormat().format(
-                  device.challenges.first.createdAt.toLocal(),
-                ),
-              ],
-            ),
-          ),
-          Text(device.challenges.first.ipAddress),
+          Flexible(child: Text(device.deviceLabel ?? device.deviceName)),
           if (device.isCurrent)
             Row(
               children: [
@@ -82,10 +63,29 @@ class _DeviceListTile extends StatelessWidget {
                   ),
                 ),
               ],
-            ).padding(top: 4),
+            ),
         ],
       ),
-      title: Text(device.deviceLabel ?? device.deviceName),
+      subtitle: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          Text(
+            'lastActiveAt'.tr(
+              args: [device.challenges.first.createdAt.formatSystem()],
+            ),
+          ),
+        ],
+      ),
+      leading: Icon(switch (device.platform) {
+        0 => Icons.device_unknown, // Unidentified
+        1 => Icons.web, // Web
+        2 => Icons.phone_iphone, // iOS
+        3 => Icons.phone_android, // Android
+        4 => Icons.laptop_mac, // macOS
+        5 => Icons.window, // Windows
+        6 => Icons.computer, // Linux
+        _ => Icons.device_unknown, // fallback
+      }).padding(top: 4),
       trailing:
           isWideScreen(context)
               ? Row(
@@ -105,6 +105,36 @@ class _DeviceListTile extends StatelessWidget {
                 ],
               )
               : null,
+      expandedCrossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        Container(
+          decoration: BoxDecoration(
+            color: Theme.of(context).colorScheme.surfaceVariant,
+          ),
+          padding: EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+          child: Text('authDeviceChallenges'.tr()),
+        ),
+        for (final challenge in device.challenges)
+          ListTile(
+            minTileHeight: 48,
+            title: Text(DateFormat().format(challenge.createdAt.toLocal())),
+            subtitle: Column(
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                Text(challenge.ipAddress),
+                if (challenge.location != null)
+                  Row(
+                    spacing: 4,
+                    children:
+                        [challenge.location?.city, challenge.location?.country]
+                            .where((e) => e?.isNotEmpty ?? false)
+                            .map((e) => Text(e!))
+                            .toList(),
+                  ),
+              ],
+            ),
+          ),
+      ],
     );
   }
 }
@@ -176,72 +206,116 @@ class AccountSessionSheet extends HookConsumerWidget {
 
     return SheetScaffold(
       titleText: 'authSessions'.tr(),
-      child: authDevices.when(
-        data:
-            (data) => ExtendedRefreshIndicator(
-              onRefresh:
-                  () => Future.sync(() => ref.invalidate(authDevicesProvider)),
-              child: ListView.builder(
-                padding: EdgeInsets.zero,
-                itemCount: data.length,
-                itemBuilder: (context, index) {
-                  final device = data[index];
-                  if (wideScreen) {
-                    return _DeviceListTile(
-                      device: device,
-                      updateDeviceLabel: updateDeviceLabel,
-                      logoutDevice: logoutDevice,
-                    );
-                  } else {
-                    return Dismissible(
-                      key: Key('device-${device.id}'),
-                      direction:
-                          device.isCurrent
-                              ? DismissDirection.startToEnd
-                              : DismissDirection.horizontal,
-                      background: Container(
-                        color: Colors.blue,
-                        alignment: Alignment.centerLeft,
-                        padding: EdgeInsets.symmetric(horizontal: 20),
-                        child: Icon(Icons.edit, color: Colors.white),
+      child: Column(
+        children: [
+          if (!wideScreen)
+            Container(
+              width: double.infinity,
+              padding: EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+              color: Theme.of(context).colorScheme.surfaceContainerHigh,
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                spacing: 8,
+                children: [
+                  const Icon(Symbols.info, size: 16).padding(top: 2),
+                  Flexible(
+                    child: Text(
+                      'authDeviceHint'.tr(),
+                      style: TextStyle(
+                        color: Theme.of(context).colorScheme.onSurfaceVariant,
                       ),
-                      secondaryBackground: Container(
-                        color: Colors.red,
-                        alignment: Alignment.centerRight,
-                        padding: EdgeInsets.symmetric(horizontal: 20),
-                        child: Icon(Icons.logout, color: Colors.white),
-                      ),
-                      confirmDismiss: (direction) async {
-                        if (direction == DismissDirection.startToEnd) {
-                          updateDeviceLabel(device.deviceId);
-                          return false;
-                        } else {
-                          final confirm = await showConfirmAlert(
-                            'authDeviceLogoutHint'.tr(),
-                            'authDeviceLogout'.tr(),
-                          );
-                          if (confirm && context.mounted) {
-                            logoutDevice(device.deviceId);
-                          }
-                          return false; // Don't dismiss
-                        }
-                      },
-                      child: _DeviceListTile(
-                        device: device,
-                        updateDeviceLabel: updateDeviceLabel,
-                        logoutDevice: logoutDevice,
-                      ),
-                    );
-                  }
-                },
+                    ),
+                  ),
+                ],
               ),
             ),
-        error:
-            (err, _) => ResponseErrorWidget(
-              error: err,
-              onRetry: () => ref.invalidate(authDevicesProvider),
+          Expanded(
+            child: authDevices.when(
+              data:
+                  (data) => ExtendedRefreshIndicator(
+                    onRefresh:
+                        () => Future.sync(
+                          () => ref.invalidate(authDevicesProvider),
+                        ),
+                    child: ListView.builder(
+                      padding: EdgeInsets.zero,
+                      itemCount: data.length,
+                      itemBuilder: (context, index) {
+                        final device = data[index];
+                        if (wideScreen) {
+                          return _DeviceListTile(
+                            device: device,
+                            updateDeviceLabel: updateDeviceLabel,
+                            logoutDevice: logoutDevice,
+                          );
+                        } else {
+                          return Dismissible(
+                            key: Key('device-${device.id}'),
+                            direction:
+                                device.isCurrent
+                                    ? DismissDirection.startToEnd
+                                    : DismissDirection.horizontal,
+                            background: Container(
+                              color: Colors.blue,
+                              alignment: Alignment.centerLeft,
+                              padding: EdgeInsets.symmetric(horizontal: 20),
+                              child: Icon(Icons.edit, color: Colors.white),
+                            ),
+                            secondaryBackground: Container(
+                              color: Colors.red,
+                              alignment: Alignment.centerRight,
+                              padding: EdgeInsets.symmetric(horizontal: 20),
+                              child: Icon(Icons.logout, color: Colors.white),
+                            ),
+                            confirmDismiss: (direction) async {
+                              if (direction == DismissDirection.startToEnd) {
+                                updateDeviceLabel(device.deviceId);
+                                return false;
+                              } else {
+                                final confirm = await showConfirmAlert(
+                                  'authDeviceLogoutHint'.tr(),
+                                  'authDeviceLogout'.tr(),
+                                );
+                                if (confirm && context.mounted) {
+                                  try {
+                                    showLoadingModal(context);
+                                    final apiClient = ref.watch(
+                                      apiClientProvider,
+                                    );
+                                    await apiClient.delete(
+                                      '/id/accounts/me/devices/${device.deviceId}',
+                                    );
+                                    ref.invalidate(authDevicesProvider);
+                                  } catch (err) {
+                                    showErrorAlert(err);
+                                  } finally {
+                                    if (context.mounted)
+                                      hideLoadingModal(context);
+                                  }
+                                }
+                                return confirm;
+                              }
+                            },
+                            child: _DeviceListTile(
+                              device: device,
+                              updateDeviceLabel: updateDeviceLabel,
+                              logoutDevice: logoutDevice,
+                            ),
+                          );
+                        }
+                      },
+                    ),
+                  ),
+              error:
+                  (err, _) => ResponseErrorWidget(
+                    error: err,
+                    onRetry: () => ref.invalidate(authDevicesProvider),
+                  ),
+              loading: () => ResponseLoadingWidget(),
             ),
-        loading: () => ResponseLoadingWidget(),
+          ),
+        ],
       ),
     );
   }

lib/widgets/app_wrapper.dart

@@ -3,6 +3,7 @@ import 'package:bitsdojo_window/bitsdojo_window.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/pods/activity/activity_rpc.dart';
 import 'package:island/pods/websocket.dart';
 import 'package:island/screens/tray_manager.dart';
 import 'package:island/services/notify.dart';
@@ -31,7 +32,10 @@ class AppWrapper extends HookConsumerWidget with TrayListener {
 
       TrayService.instance.initialize(this);
 
+      ref.read(rpcServerStateProvider.notifier).start();
+
       return () {
+        ref.read(rpcServerProvider).stop();
         TrayService.instance.dispose(this);
         sharingService.dispose();
         ntySubs?.cancel();

lib/widgets/check_in.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:convert';
 
 import 'package:dio/dio.dart';
@@ -57,11 +58,21 @@ class CheckInWidget extends HookConsumerWidget {
     final todayResult = ref.watch(checkInResultTodayProvider);
     final nextNotableDay = ref.watch(nextNotableDayProvider);
 
+    // Update time every second for live progress
+    final currentTime = useState(DateTime.now());
+    useEffect(() {
+      final timer = Timer.periodic(const Duration(seconds: 1), (_) {
+        currentTime.value = DateTime.now();
+      });
+      return timer.cancel;
+    }, []);
+
+    final now = currentTime.value;
+
     final userinfo = ref.watch(userInfoProvider);
     final isAdult = useMemoized(() {
       final birthday = userinfo.value?.profile.birthday;
       if (birthday == null) return false;
-      final now = DateTime.now();
       final age =
           now.year -
           birthday.year -
@@ -72,6 +83,12 @@ class CheckInWidget extends HookConsumerWidget {
       return age >= 18;
     }, [userinfo]);
 
+    final progress = (now.hour * 60.0 + now.minute) / (24 * 60);
+    final endOfDay = DateTime(now.year, now.month, now.day, 23, 59, 59);
+    final timeLeft = endOfDay.difference(now);
+    final timeLeftFormatted =
+        '${timeLeft.inHours.toString().padLeft(2, '0')}:${(timeLeft.inMinutes % 60).toString().padLeft(2, '0')}:${(timeLeft.inSeconds % 60).toString().padLeft(2, '0')}';
+
     Future<void> checkIn({String? captchatTk}) async {
       final client = ref.read(apiClientProvider);
       try {
@@ -100,106 +117,102 @@ class CheckInWidget extends HookConsumerWidget {
     return Card(
       margin:
           margin ?? EdgeInsets.only(left: 16, right: 16, top: 16, bottom: 8),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.center,
-        spacing: 8,
+      child: Row(
         children: [
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Row(
-                spacing: 8,
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.center,
-                children: [
-                  Icon(
-                    switch (DateTime.now().weekday) {
-                      6 || 7 => Symbols.weekend,
-                      _ => isAdult ? Symbols.work : Symbols.school,
-                    },
-                    fill: 1,
-                    size: 16,
-                  ).padding(right: 2),
-                  Text(DateFormat('EEE').format(DateTime.now()))
-                      .fontSize(16)
-                      .bold()
-                      .textColor(
-                        Theme.of(context).colorScheme.onSecondaryContainer,
+          Expanded(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Row(
+                  spacing: 6,
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  children: [
+                    Icon(
+                      switch (DateTime.now().weekday) {
+                        6 || 7 => Symbols.weekend,
+                        _ => isAdult ? Symbols.work : Symbols.school,
+                      },
+                      fill: 1,
+                      size: 16,
+                    ).padding(right: 2),
+                    Text(
+                      DateFormat('EEE').format(DateTime.now()),
+                    ).fontSize(16).bold(),
+                    Text(
+                      DateFormat('MM/dd').format(DateTime.now()),
+                    ).fontSize(16),
+                    Tooltip(
+                      message: timeLeftFormatted,
+                      child: SizedBox(
+                        width: 20,
+                        height: 20,
+                        child: CircularProgressIndicator(
+                          value: progress,
+                          strokeWidth: 2,
+                        ),
                       ),
-                  Text(DateFormat('MM/dd').format(DateTime.now()))
-                      .fontSize(12)
-                      .textColor(
-                        Theme.of(context).colorScheme.onSecondaryContainer,
-                      )
-                      .padding(top: 2),
-                ],
-              ),
-              Row(
-                spacing: 5,
-                children: [
-                  Text('notableDayNext')
-                      .tr(args: [nextNotableDay.value?.localName ?? 'idk'])
-                      .fontSize(12),
-                  SlideCountdown(
-                    decoration: const BoxDecoration(),
-                    style: const TextStyle(fontSize: 12),
-                    separatorStyle: const TextStyle(fontSize: 12),
-                    padding: EdgeInsets.zero,
-                    duration: nextNotableDay.value?.date.difference(
-                      DateTime.now(),
                     ),
-                  ),
-                ],
-              ),
-            ],
-          ).padding(horizontal: 16, top: 8),
-          const Divider(height: 1),
-          Row(
-            children: [
-              Expanded(
-                child: AnimatedSwitcher(
+                  ],
+                ),
+                Row(
+                  spacing: 5,
+                  children: [
+                    Text('notableDayNext')
+                        .tr(args: [nextNotableDay.value?.localName ?? 'idk'])
+                        .fontSize(12),
+                    if (nextNotableDay.value != null)
+                      SlideCountdown(
+                        decoration: const BoxDecoration(),
+                        style: const TextStyle(fontSize: 12),
+                        separatorStyle: const TextStyle(fontSize: 12),
+                        padding: EdgeInsets.zero,
+                        duration: nextNotableDay.value?.date.difference(
+                          DateTime.now(),
+                        ),
+                      ),
+                  ],
+                ),
+                const Gap(2),
+                AnimatedSwitcher(
                   duration: const Duration(milliseconds: 300),
                   child: todayResult.when(
                     data: (result) {
-                      if (result == null) return _CheckInNoneWidget();
-                      return Column(
-                        crossAxisAlignment: CrossAxisAlignment.stretch,
-                        children: [
-                          Text(
-                            'checkInResultLevel${result.level}',
-                          ).tr().fontSize(15).bold(),
-                          Wrap(
-                            children:
-                                result.tips
-                                    .map((e) {
-                                      return Row(
-                                        mainAxisSize: MainAxisSize.min,
-                                        children: [
-                                          Icon(
-                                            e.isPositive
-                                                ? Symbols.thumb_up
-                                                : Symbols.thumb_down,
-                                            size: 12,
-                                          ),
-                                          const Gap(4),
-                                          Text(e.title).fontSize(11),
-                                        ],
-                                      );
-                                    })
-                                    .toList()
-                                    .expand(
-                                      (widget) => [
-                                        widget,
-                                        Text('  ·  ').fontSize(11),
-                                      ],
-                                    )
-                                    .toList()
-                                  ..removeLast(),
-                          ),
-                        ],
+                      if (result == null) {
+                        return Text('checkInNoneHint').tr().fontSize(11);
+                      }
+                      return Wrap(
+                        alignment: WrapAlignment.start,
+                        runAlignment: WrapAlignment.start,
+                        children:
+                            result.tips
+                                .map((e) {
+                                  return Row(
+                                    mainAxisSize: MainAxisSize.min,
+                                    children: [
+                                      Icon(
+                                        e.isPositive
+                                            ? Symbols.thumb_up
+                                            : Symbols.thumb_down,
+                                        size: 12,
+                                      ),
+                                      const Gap(4),
+                                      Text(e.title).fontSize(11),
+                                    ],
+                                  );
+                                })
+                                .toList()
+                                .expand(
+                                  (widget) => [
+                                    widget,
+                                    Text('  ·  ').fontSize(11),
+                                  ],
+                                )
+                                .toList()
+                              ..removeLast(),
                       );
                     },
-                    loading: () => _CheckInNoneWidget(),
+                    loading: () => Text('checkInNoneHint').tr().fontSize(11),
                     error:
                         (err, stack) => Column(
                           crossAxisAlignment: CrossAxisAlignment.start,
@@ -209,9 +222,35 @@ class CheckInWidget extends HookConsumerWidget {
                           ],
                         ),
                   ),
+                ).alignment(Alignment.centerLeft),
+              ],
+            ),
+          ),
+          Column(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            crossAxisAlignment: CrossAxisAlignment.end,
+            children: [
+              AnimatedSwitcher(
+                duration: const Duration(milliseconds: 300),
+                child: todayResult.when(
+                  data: (result) {
+                    return Text(
+                      result == null
+                          ? 'checkInNone'
+                          : 'checkInResultLevel${result.level}',
+                      textAlign: TextAlign.start,
+                    ).tr().fontSize(15).bold();
+                  },
+                  loading: () => Text('checkInNone').tr().fontSize(15).bold(),
+                  error: (err, stack) => Text('error').tr().fontSize(15).bold(),
                 ),
-              ),
+              ).padding(right: 4),
               IconButton.outlined(
+                iconSize: 16,
+                visualDensity: const VisualDensity(
+                  horizontal: -3,
+                  vertical: -2,
+                ),
                 onPressed: () {
                   if (todayResult.valueOrNull == null) {
                     checkIn();
@@ -238,24 +277,9 @@ class CheckInWidget extends HookConsumerWidget {
                 ),
               ),
             ],
-          ).padding(horizontal: 16, bottom: 12, top: 4),
+          ),
         ],
-      ),
-    );
-  }
-}
-
-class _CheckInNoneWidget extends StatelessWidget {
-  const _CheckInNoneWidget();
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.stretch,
-      children: [
-        Text('checkInNone').tr().fontSize(15).bold(),
-        Text('checkInNoneHint').tr().fontSize(11),
-      ],
+      ).padding(horizontal: 16, vertical: 12),
     );
   }
 }

lib/widgets/content/alert.native.dart

@@ -6,17 +6,26 @@ import 'package:flutter_platform_alert/flutter_platform_alert.dart';
 
 String _parseRemoteError(DioException err) {
   log('${err.requestOptions.method} ${err.requestOptions.uri} ${err.message}');
-  if (err.response?.data is String) return err.response?.data;
-  if (err.response?.data?['errors'] != null) {
+  String? message;
+  if (err.response?.data is String) {
+    message = err.response?.data;
+  } else if (err.response?.data?['message'] != null) {
+    message = <String?>[
+      err.response?.data?['message']?.toString(),
+      err.response?.data?['detail']?.toString(),
+    ].where((e) => e != null).cast<String>().map((e) => e.trim()).join('\n');
+  } else if (err.response?.data?['errors'] != null) {
     final errors = err.response?.data['errors'] as Map<String, dynamic>;
-    return errors.values
+    message = errors.values
         .map(
           (ele) =>
               (ele as List<dynamic>).map((ele) => ele.toString()).join('\n'),
         )
         .join('\n');
   }
-  return err.message ?? err.toString();
+  if (message == null || message.isEmpty) message = err.response?.statusMessage;
+  message ??= err.message;
+  return message ?? err.toString();
 }
 
 void showErrorAlert(dynamic err) async {

lib/widgets/content/alert.web.dart

@@ -8,17 +8,26 @@ import 'package:easy_localization/easy_localization.dart';
 
 String _parseRemoteError(DioException err) {
   log('${err.requestOptions.method} ${err.requestOptions.uri} ${err.message}');
-  if (err.response?.data is String) return err.response?.data;
-  if (err.response?.data?['errors'] != null) {
+  String? message;
+  if (err.response?.data is String) {
+    message = err.response?.data;
+  } else if (err.response?.data?['message'] != null) {
+    message = <String?>[
+      err.response?.data?['message']?.toString(),
+      err.response?.data?['detail']?.toString(),
+    ].where((e) => e != null).cast<String>().map((e) => e.trim()).join('\n');
+  } else if (err.response?.data?['errors'] != null) {
     final errors = err.response?.data['errors'] as Map<String, dynamic>;
-    return errors.values
+    message = errors.values
         .map(
           (ele) =>
               (ele as List<dynamic>).map((ele) => ele.toString()).join('\n'),
         )
         .join('\n');
   }
-  return err.message ?? err.toString();
+  if (message == null || message.isEmpty) message = err.response?.statusMessage;
+  message ??= err.message;
+  return message ?? err.toString();
 }
 
 void showErrorAlert(dynamic err) async {

lib/widgets/content/cloud_file_collection.dart

@@ -830,7 +830,7 @@ class _CloudFileListEntry extends HookConsumerWidget {
         bg = ImageFiltered(
           imageFilter: ImageFilter.blur(sigmaX: 10, sigmaY: 10),
           child: CloudFileWidget(
-            fit: fit,
+            fit: BoxFit.cover,
             item: file,
             noBlurhash: true,
             useInternalGate: false,

lib/widgets/content/cloud_file_picker.dart

@@ -55,7 +55,7 @@ class CloudFilePicker extends HookConsumerWidget {
           uploadPosition.value = idx;
           final file = files.value[idx];
           final cloudFile =
-              await putMediaToCloud(
+              await putFileToCloud(
                 fileData: file,
                 atk: token,
                 baseUrl: baseUrl,

lib/widgets/payment/payment_overlay.dart

@@ -142,10 +142,6 @@ class _PaymentContentState extends ConsumerState<_PaymentContent> {
       // Set initial mode based on stored PIN and biometric support
       if (_hasStoredPin && _hasBiometricSupport && widget.enableBiometric) {
         _isPinMode = false;
-        // Automatically trigger biometric authentication
-        WidgetsBinding.instance.addPostFrameCallback((_) {
-          _authenticateWithBiometric();
-        });
       } else {
         _isPinMode = true;
       }
@@ -270,6 +266,8 @@ class _PaymentContentState extends ConsumerState<_PaymentContent> {
           }
         } else if (err.response?.statusCode == 400) {
           errorMessage = err.response?.data?['error'] ?? errorMessage;
+        } else {
+          rethrow;
         }
       }
       throw errorMessage;
@@ -419,42 +417,48 @@ class _PaymentContentState extends ConsumerState<_PaymentContent> {
   }
 
   Widget _buildBiometricAuth() {
-    return Column(
-      mainAxisAlignment: MainAxisAlignment.center,
-      crossAxisAlignment: CrossAxisAlignment.center,
-      children: [
-        Icon(Symbols.fingerprint, size: 48),
-        const Gap(16),
-        Text(
-          'useBiometricToConfirm'.tr(),
-          style: Theme.of(
-            context,
-          ).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.w500),
-          textAlign: TextAlign.center,
-        ),
-        Text(
-          'The biometric data will only be processed on your device',
-          style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-            color: Theme.of(context).colorScheme.onSurfaceVariant,
-            fontSize: 11,
-          ),
-          textAlign: TextAlign.center,
-        ).opacity(0.75),
-        const Gap(28),
-        ElevatedButton.icon(
-          onPressed: _authenticateWithBiometric,
-          icon: const Icon(Symbols.fingerprint),
-          label: Text('authenticateNow'.tr()),
-          style: ElevatedButton.styleFrom(
-            padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 12),
-          ),
-        ),
-        TextButton(
-          onPressed: () => _fallbackToPinMode(null),
-          child: Text('usePinInstead'.tr()),
-        ),
-      ],
-    ).center();
+    return SingleChildScrollView(
+      child:
+          Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              Icon(Symbols.fingerprint, size: 48),
+              const Gap(16),
+              Text(
+                'useBiometricToConfirm'.tr(),
+                style: Theme.of(
+                  context,
+                ).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.w500),
+                textAlign: TextAlign.center,
+              ),
+              Text(
+                'The biometric data will only be processed on your device',
+                style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                  color: Theme.of(context).colorScheme.onSurfaceVariant,
+                  fontSize: 11,
+                ),
+                textAlign: TextAlign.center,
+              ).opacity(0.75),
+              const Gap(28),
+              ElevatedButton.icon(
+                onPressed: _authenticateWithBiometric,
+                icon: const Icon(Symbols.fingerprint),
+                label: Text('authenticateNow'.tr()),
+                style: ElevatedButton.styleFrom(
+                  padding: const EdgeInsets.symmetric(
+                    horizontal: 24,
+                    vertical: 12,
+                  ),
+                ),
+              ),
+              TextButton(
+                onPressed: () => _fallbackToPinMode(null),
+                child: Text('usePinInstead'.tr()),
+              ),
+            ],
+          ).center(),
+    );
   }
 
   Widget _buildActionButtons() {

lib/widgets/poll/poll_feedback.dart

@@ -6,6 +6,8 @@ import 'package:island/models/poll.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/screens/creators/poll/poll_list.dart';
 import 'package:island/services/time.dart';
+import 'package:island/widgets/account/account_pfc.dart';
+import 'package:island/widgets/content/cloud_files.dart';
 import 'package:island/widgets/content/sheet.dart';
 import 'package:island/widgets/poll/poll_stats_widget.dart';
 import 'package:island/widgets/response.dart';
@@ -134,19 +136,27 @@ class _PollHeader extends StatelessWidget {
                   ),
                 ),
             ],
-          ),
-        Text('pollQuestions').tr().fontSize(17).bold(),
-        for (final q in poll.questions)
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              if (q.title.isNotEmpty) Text(q.title).bold(),
-              if (q.description?.isNotEmpty ?? false) Text(q.description!),
-              PollStatsWidget(question: q, stats: poll.stats),
-            ],
-          ),
+          ).padding(horizontal: 20, top: 16),
+        ExpansionTile(
+          title: Text('pollQuestions').tr().fontSize(17).bold(),
+          tilePadding: EdgeInsets.symmetric(horizontal: 20),
+          children:
+              poll.questions
+                  .map(
+                    (q) => Column(
+                      crossAxisAlignment: CrossAxisAlignment.stretch,
+                      children: [
+                        if (q.title.isNotEmpty) Text(q.title).bold(),
+                        if (q.description?.isNotEmpty ?? false)
+                          Text(q.description!),
+                        PollStatsWidget(question: q, stats: poll.stats),
+                      ],
+                    ).padding(horizontal: 20, top: 8, bottom: 16),
+                  )
+                  .toList(),
+        ),
       ],
-    ).padding(horizontal: 20, vertical: 16);
+    );
   }
 }
 
@@ -207,7 +217,10 @@ class _PollAnswerTile extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     // Submit date/time (title)
-    final submitText = answer.createdAt.formatSystem();
+    final submitText =
+        answer.account == null
+            ? answer.createdAt.formatSystem()
+            : '${answer.account!.nick} · ${answer.createdAt.formatSystem()}';
 
     // Compose content from poll questions if provided, otherwise fallback to joined key-values
     String content;
@@ -244,10 +257,18 @@ class _PollAnswerTile extends StatelessWidget {
     return ListTile(
       contentPadding: const EdgeInsets.symmetric(horizontal: 20),
       isThreeLine: true,
-      leading: const CircleAvatar(
-        radius: 16,
-        child: Icon(Icons.how_to_vote, size: 16),
-      ),
+      leading:
+          answer.account == null
+              ? const CircleAvatar(
+                radius: 16,
+                child: Icon(Icons.how_to_vote, size: 16),
+              )
+              : AccountPfcGestureDetector(
+                uname: answer.account!.name,
+                child: ProfilePictureWidget(
+                  file: answer.account!.profile.picture,
+                ),
+              ),
       title: Text(submitText),
       subtitle: Text(content),
       trailing: null,

lib/widgets/poll/poll_stats_widget.dart

@@ -44,13 +44,13 @@ class PollStatsWidget extends StatelessWidget {
         // yes/no: map {true: count, false: count}
         if (raw is Map) {
           final int yes =
-              (raw[true] is int)
-                  ? raw[true] as int
-                  : int.tryParse('${raw[true]}') ?? 0;
+              (raw['true'] is int)
+                  ? raw['true'] as int
+                  : int.tryParse('${raw['true']}') ?? 0;
           final int no =
-              (raw[false] is int)
-                  ? raw[false] as int
-                  : int.tryParse('${raw[false]}') ?? 0;
+              (raw['false'] is int)
+                  ? raw['false'] as int
+                  : int.tryParse('${raw['false']}') ?? 0;
           final total = (yes + no).clamp(0, 1 << 31);
           final yesPct = total == 0 ? 0.0 : yes / total;
           final noPct = total == 0 ? 0.0 : no / total;

lib/widgets/poll/poll_submit.dart

@@ -17,6 +17,7 @@ class PollSubmit extends ConsumerStatefulWidget {
     this.onCancel,
     this.showProgress = true,
     this.isReadonly = false,
+    this.isInitiallyExpanded = false,
   });
 
   final SnPollWithStats poll;
@@ -36,6 +37,9 @@ class PollSubmit extends ConsumerStatefulWidget {
 
   final bool isReadonly;
 
+  /// Whether the poll should start expanded instead of collapsed.
+  final bool isInitiallyExpanded;
+
   @override
   ConsumerState<PollSubmit> createState() => _PollSubmitState();
 }
@@ -45,6 +49,7 @@ class _PollSubmitState extends ConsumerState<PollSubmit> {
   int _index = 0;
   bool _submitting = false;
   bool _isModifying = false; // New state to track if user is modifying answers
+  bool _isCollapsed = true; // New state to track collapse/expand
 
   /// Collected answers, keyed by questionId
   late Map<String, dynamic> _answers;
@@ -65,6 +70,8 @@ class _PollSubmitState extends ConsumerState<PollSubmit> {
     _questions = [...widget.poll.questions]
       ..sort((a, b) => a.order.compareTo(b.order));
     _answers = Map<String, dynamic>.from(widget.initialAnswers ?? {});
+    // Set initial collapse state based on the parameter
+    _isCollapsed = !widget.isInitiallyExpanded;
     if (!widget.isReadonly) {
       _loadCurrentIntoLocalState();
       // If initial answers are provided, set _isModifying to false initially
@@ -405,6 +412,7 @@ class _PollSubmitState extends ConsumerState<PollSubmit> {
               });
             },
             multiSelectionEnabled: false,
+            emptySelectionAllowed: true,
           ),
         ),
       ],
@@ -652,39 +660,179 @@ class _PollSubmitState extends ConsumerState<PollSubmit> {
     );
   }
 
+  Widget _buildCollapsedView(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Row(
+          children: [
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  if (widget.poll.title != null)
+                    Text(
+                      widget.poll.title!,
+                      style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                        fontWeight: FontWeight.w600,
+                      ),
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                    ),
+                  if (widget.poll.description != null)
+                    Padding(
+                      padding: const EdgeInsets.only(top: 2),
+                      child: Text(
+                        widget.poll.description!,
+                        style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                          color: Theme.of(
+                            context,
+                          ).textTheme.bodySmall?.color?.withOpacity(0.7),
+                        ),
+                        maxLines: 2,
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                    )
+                  else
+                    Padding(
+                      padding: const EdgeInsets.only(top: 2),
+                      child: Text(
+                        '${_questions.length} question${_questions.length == 1 ? '' : 's'}',
+                        style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                          color: Theme.of(
+                            context,
+                          ).textTheme.bodySmall?.color?.withOpacity(0.7),
+                        ),
+                      ),
+                    ),
+                ],
+              ),
+            ),
+            IconButton(
+              icon: Icon(
+                _isCollapsed ? Icons.expand_more : Icons.expand_less,
+                size: 20,
+              ),
+              onPressed: () {
+                setState(() {
+                  _isCollapsed = !_isCollapsed;
+                });
+              },
+              visualDensity: VisualDensity.compact,
+              tooltip: _isCollapsed ? 'expandPoll'.tr() : 'collapsePoll'.tr(),
+            ),
+          ],
+        ),
+      ],
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     if (_questions.isEmpty) {
       return const SizedBox.shrink();
     }
 
+    // If collapsed, show collapsed view for all states
+    if (_isCollapsed) {
+      return _buildCollapsedView(context);
+    }
+
     // If poll is already submitted and not in readonly mode, and not in modification mode, show submitted view
     if (widget.initialAnswers != null && !widget.isReadonly && !_isModifying) {
       return Column(
         crossAxisAlignment: CrossAxisAlignment.stretch,
-        children: [_buildSubmittedView(context), _buildNavBar(context)],
+        children: [
+          _buildCollapsedView(context),
+          const SizedBox(height: 8),
+          AnimatedSwitcher(
+            duration: const Duration(milliseconds: 300),
+            transitionBuilder: (child, anim) {
+              final offset = Tween<Offset>(
+                begin: const Offset(0, -0.1),
+                end: Offset.zero,
+              ).animate(CurvedAnimation(parent: anim, curve: Curves.easeOut));
+              final fade = CurvedAnimation(parent: anim, curve: Curves.easeOut);
+              return FadeTransition(
+                opacity: fade,
+                child: SlideTransition(position: offset, child: child),
+              );
+            },
+            child: Column(
+              key: const ValueKey('submitted_expanded'),
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [_buildSubmittedView(context), _buildNavBar(context)],
+            ),
+          ),
+        ],
       );
     }
 
     // If poll is in readonly mode, show readonly view
     if (widget.isReadonly) {
-      return _buildReadonlyView(context);
+      return Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          _buildCollapsedView(context),
+          const SizedBox(height: 8),
+          AnimatedSwitcher(
+            duration: const Duration(milliseconds: 300),
+            transitionBuilder: (child, anim) {
+              final offset = Tween<Offset>(
+                begin: const Offset(0, -0.1),
+                end: Offset.zero,
+              ).animate(CurvedAnimation(parent: anim, curve: Curves.easeOut));
+              final fade = CurvedAnimation(parent: anim, curve: Curves.easeOut);
+              return FadeTransition(
+                opacity: fade,
+                child: SlideTransition(position: offset, child: child),
+              );
+            },
+            child: _buildReadonlyView(context),
+          ),
+        ],
+      );
     }
 
     return Column(
       crossAxisAlignment: CrossAxisAlignment.stretch,
       children: [
-        _buildHeader(context),
-        const SizedBox(height: 12),
-        _AnimatedStep(
-          key: ValueKey(_current.id),
+        _buildCollapsedView(context),
+        const SizedBox(height: 8),
+        AnimatedSwitcher(
+          duration: const Duration(milliseconds: 300),
+          transitionBuilder: (child, anim) {
+            final offset = Tween<Offset>(
+              begin: const Offset(0, -0.1),
+              end: Offset.zero,
+            ).animate(CurvedAnimation(parent: anim, curve: Curves.easeOut));
+            final fade = CurvedAnimation(parent: anim, curve: Curves.easeOut);
+            return FadeTransition(
+              opacity: fade,
+              child: SlideTransition(position: offset, child: child),
+            );
+          },
           child: Column(
+            key: const ValueKey('normal_expanded'),
             crossAxisAlignment: CrossAxisAlignment.stretch,
-            children: [_buildBody(context), _buildStats(context, _current)],
+            children: [
+              _buildHeader(context),
+              const SizedBox(height: 12),
+              _AnimatedStep(
+                key: ValueKey(_current.id),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  children: [
+                    _buildBody(context),
+                    _buildStats(context, _current),
+                  ],
+                ),
+              ),
+              const SizedBox(height: 16),
+              _buildNavBar(context),
+            ],
           ),
         ),
-        const SizedBox(height: 16),
-        _buildNavBar(context),
       ],
     );
   }

lib/widgets/post/compose_embed_sheet.dart

@@ -0,0 +1,287 @@
+import 'package:dropdown_button2/dropdown_button2.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:gap/gap.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/post.dart';
+import 'package:island/widgets/content/sheet.dart';
+import 'package:island/widgets/post/compose_shared.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:styled_widget/styled_widget.dart';
+
+class ComposeEmbedSheet extends HookConsumerWidget {
+  final ComposeState state;
+
+  const ComposeEmbedSheet({super.key, required this.state});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+
+    // Listen to embed view changes
+    final currentEmbedView = useValueListenable(state.embedView);
+
+    // Form state
+    final uriController = useTextEditingController();
+    final aspectRatioController = useTextEditingController();
+    final selectedRenderer = useState<PostEmbedViewRenderer>(
+      PostEmbedViewRenderer.webView,
+    );
+
+    void clearForm() {
+      uriController.clear();
+      aspectRatioController.clear();
+      selectedRenderer.value = PostEmbedViewRenderer.webView;
+    }
+
+    // Populate form when embed view changes
+    useEffect(() {
+      if (currentEmbedView != null) {
+        uriController.text = currentEmbedView.uri;
+        aspectRatioController.text =
+            currentEmbedView.aspectRatio?.toString() ?? '';
+        selectedRenderer.value = currentEmbedView.renderer;
+      } else {
+        clearForm();
+      }
+      return null;
+    }, [currentEmbedView]);
+
+    void saveEmbedView() {
+      final uri = uriController.text.trim();
+      if (uri.isEmpty) {
+        ScaffoldMessenger.of(
+          context,
+        ).showSnackBar(SnackBar(content: Text('embedUriRequired'.tr())));
+        return;
+      }
+
+      final aspectRatio =
+          aspectRatioController.text.trim().isNotEmpty
+              ? double.tryParse(aspectRatioController.text.trim())
+              : null;
+
+      final embedView = SnPostEmbedView(
+        uri: uri,
+        aspectRatio: aspectRatio,
+        renderer: selectedRenderer.value,
+      );
+
+      if (currentEmbedView != null) {
+        ComposeLogic.updateEmbedView(state, embedView);
+      } else {
+        ComposeLogic.setEmbedView(state, embedView);
+      }
+    }
+
+    return SheetScaffold(
+      titleText: 'embedView'.tr(),
+      heightFactor: 0.7,
+      child: Column(
+        children: [
+          // Header with save button when editing
+          if (currentEmbedView != null)
+            Container(
+              padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 8),
+              color: Theme.of(context).colorScheme.surfaceContainerHigh,
+              child: Row(
+                children: [
+                  Expanded(
+                    child: Text(
+                      'editEmbed'.tr(),
+                      style: theme.textTheme.titleMedium,
+                    ),
+                  ),
+                  TextButton(
+                    onPressed: saveEmbedView,
+                    child: Text('save'.tr()),
+                  ),
+                ],
+              ),
+            ),
+
+          // Content area
+          Expanded(
+            child: SingleChildScrollView(
+              padding: const EdgeInsets.all(16),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  // Form fields
+                  TextField(
+                    controller: uriController,
+                    decoration: InputDecoration(
+                      labelText: 'embedUri'.tr(),
+                      hintText: 'https://example.com',
+                      border: OutlineInputBorder(
+                        borderRadius: BorderRadius.circular(8),
+                      ),
+                    ),
+                    keyboardType: TextInputType.url,
+                  ),
+                  const Gap(16),
+                  TextField(
+                    controller: aspectRatioController,
+                    decoration: InputDecoration(
+                      labelText: 'aspectRatio'.tr(),
+                      hintText: '16/9 = 1.777',
+                      border: OutlineInputBorder(
+                        borderRadius: BorderRadius.circular(8),
+                      ),
+                    ),
+                    keyboardType: TextInputType.numberWithOptions(
+                      decimal: true,
+                    ),
+                    inputFormatters: [
+                      FilteringTextInputFormatter.allow(RegExp(r'^\d*\.?\d*$')),
+                    ],
+                  ),
+                  const Gap(16),
+                  DropdownButtonFormField2<PostEmbedViewRenderer>(
+                    value: selectedRenderer.value,
+                    decoration: InputDecoration(
+                      labelText: 'renderer'.tr(),
+                      border: OutlineInputBorder(
+                        borderRadius: BorderRadius.circular(8),
+                      ),
+                    ),
+                    items:
+                        PostEmbedViewRenderer.values.map((renderer) {
+                          return DropdownMenuItem(
+                            value: renderer,
+                            child: Text(renderer.name).tr(),
+                          );
+                        }).toList(),
+                    onChanged: (value) {
+                      if (value != null) {
+                        selectedRenderer.value = value;
+                      }
+                    },
+                  ),
+
+                  // Current embed view display (when exists)
+                  if (currentEmbedView != null) ...[
+                    const Gap(32),
+                    Text(
+                      'currentEmbed'.tr(),
+                      style: theme.textTheme.titleMedium,
+                    ).padding(horizontal: 4),
+                    const Gap(8),
+                    Card(
+                      margin: EdgeInsets.zero,
+                      color: Theme.of(context).colorScheme.surfaceContainerHigh,
+                      child: Padding(
+                        padding: const EdgeInsets.only(
+                          left: 16,
+                          right: 16,
+                          bottom: 12,
+                          top: 4,
+                        ),
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Row(
+                              children: [
+                                Icon(
+                                  currentEmbedView.renderer ==
+                                          PostEmbedViewRenderer.webView
+                                      ? Symbols.web
+                                      : Symbols.web,
+                                  color: colorScheme.primary,
+                                ),
+                                const Gap(12),
+                                Expanded(
+                                  child: Text(
+                                    currentEmbedView.uri,
+                                    style: theme.textTheme.bodyMedium,
+                                    maxLines: 1,
+                                    overflow: TextOverflow.ellipsis,
+                                  ),
+                                ),
+                                IconButton(
+                                  icon: const Icon(Symbols.delete),
+                                  onPressed: () {
+                                    showDialog(
+                                      context: context,
+                                      builder:
+                                          (dialogContext) => AlertDialog(
+                                            title: Text('deleteEmbed').tr(),
+                                            content:
+                                                Text('deleteEmbedConfirm').tr(),
+                                            actions: [
+                                              TextButton(
+                                                onPressed:
+                                                    () =>
+                                                        Navigator.of(
+                                                          dialogContext,
+                                                        ).pop(),
+                                                child: Text('cancel'.tr()),
+                                              ),
+                                              TextButton(
+                                                onPressed: () {
+                                                  ComposeLogic.deleteEmbedView(
+                                                    state,
+                                                  );
+                                                  clearForm();
+                                                  Navigator.of(
+                                                    dialogContext,
+                                                  ).pop();
+                                                },
+                                                style: TextButton.styleFrom(
+                                                  foregroundColor:
+                                                      colorScheme.error,
+                                                ),
+                                                child: Text('delete').tr(),
+                                              ),
+                                            ],
+                                          ),
+                                    );
+                                  },
+                                  tooltip: 'delete'.tr(),
+                                  color: colorScheme.error,
+                                ),
+                              ],
+                            ),
+                            const Gap(12),
+                            Text(
+                              'aspectRatio'.tr(),
+                              style: theme.textTheme.labelMedium?.copyWith(
+                                color: colorScheme.onSurfaceVariant,
+                              ),
+                            ),
+                            const Gap(4),
+                            Text(
+                              currentEmbedView.aspectRatio != null
+                                  ? currentEmbedView.aspectRatio!
+                                      .toStringAsFixed(2)
+                                  : 'notSet'.tr(),
+                              style: theme.textTheme.bodyMedium,
+                            ),
+                          ],
+                        ),
+                      ),
+                    ),
+                  ] else ...[
+                    // Save button for new embed
+                    const Gap(16),
+                    SizedBox(
+                      width: double.infinity,
+                      child: FilledButton.icon(
+                        onPressed: saveEmbedView,
+                        icon: const Icon(Symbols.add),
+                        label: Text('addEmbed'.tr()),
+                      ),
+                    ),
+                  ],
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/widgets/post/compose_shared.dart

@@ -1,4 +1,5 @@
 import 'package:collection/collection.dart';
+import 'package:mime/mime.dart';
 import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:file_picker/file_picker.dart';
@@ -19,6 +20,7 @@ import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/post/compose_link_attachments.dart';
 import 'package:island/widgets/post/compose_poll.dart';
 import 'package:island/widgets/post/compose_recorder.dart';
+import 'package:island/pods/pool_provider.dart';
 import 'package:pasteboard/pasteboard.dart';
 import 'package:textfield_tags/textfield_tags.dart';
 import 'dart:async';
@@ -37,6 +39,7 @@ class ComposeState {
   final ValueNotifier<List<SnPostCategory>> categories;
   StringTagController tagsController;
   final ValueNotifier<SnRealm?> realm;
+  final ValueNotifier<SnPostEmbedView?> embedView;
   final String draftId;
   int postType;
   // Linked poll id for this compose session (nullable)
@@ -56,6 +59,7 @@ class ComposeState {
     required this.tagsController,
     required this.categories,
     required this.realm,
+    required this.embedView,
     required this.draftId,
     this.postType = 0,
     String? pollId,
@@ -120,6 +124,7 @@ class ComposeLogic {
         originalPost?.categories ?? [],
       ),
       realm: ValueNotifier(originalPost?.realm),
+      embedView: ValueNotifier<SnPostEmbedView?>(originalPost?.embedView),
       draftId: id,
       postType: postType,
       // initialize without poll by default
@@ -151,6 +156,7 @@ class ComposeLogic {
       tagsController: tagsController,
       categories: ValueNotifier<List<SnPostCategory>>([]),
       realm: ValueNotifier(null),
+      embedView: ValueNotifier<SnPostEmbedView?>(draft.embedView),
       draftId: draft.id,
       postType: postType,
       pollId: null,
@@ -169,10 +175,6 @@ class ComposeLogic {
     }
 
     try {
-      if (state._autoSaveTimer == null) {
-        return;
-      }
-
       // Upload any local attachments first
       final baseUrl = ref.watch(serverUrlProvider);
       final token = await getToken(ref.watch(tokenProvider));
@@ -183,7 +185,7 @@ class ComposeLogic {
         if (attachment.data is! SnCloudFile) {
           try {
             final cloudFile =
-                await putMediaToCloud(
+                await putFileToCloud(
                   fileData: attachment,
                   atk: token,
                   baseUrl: baseUrl,
@@ -253,6 +255,7 @@ class ComposeLogic {
         tags: [],
         categories: [],
         collections: [],
+        embedView: state.embedView.value,
         createdAt: DateTime.now(),
         updatedAt: DateTime.now(),
         deletedAt: null,
@@ -279,10 +282,6 @@ class ComposeLogic {
     }
 
     try {
-      if (state._autoSaveTimer == null) {
-        return;
-      }
-
       final draft = SnPost(
         id: state.draftId,
         title: state.titleController.text,
@@ -329,6 +328,7 @@ class ComposeLogic {
         tags: [],
         categories: [],
         collections: [],
+        embedView: state.embedView.value,
         createdAt: DateTime.now(),
         updatedAt: DateTime.now(),
         deletedAt: null,
@@ -388,6 +388,30 @@ class ComposeLogic {
     };
   }
 
+  static Future<void> pickGeneralFile(WidgetRef ref, ComposeState state) async {
+    final result = await FilePicker.platform.pickFiles(
+      type: FileType.any,
+      allowMultiple: true,
+    );
+    if (result == null || result.count == 0) return;
+
+    final newFiles = <UniversalFile>[];
+
+    for (final f in result.files) {
+      if (f.path == null) continue;
+
+      final mimeType =
+          lookupMimeType(f.path!, headerBytes: f.bytes) ??
+          'application/octet-stream';
+      final xfile = XFile(f.path!, name: f.name, mimeType: mimeType);
+
+      final uf = UniversalFile(data: xfile, type: UniversalFileType.file);
+      newFiles.add(uf);
+    }
+
+    state.attachments.value = [...state.attachments.value, ...newFiles];
+  }
+
   static Future<void> pickPhotoMedia(WidgetRef ref, ComposeState state) async {
     final result = await FilePicker.platform.pickFiles(
       type: FileType.image,
@@ -481,8 +505,9 @@ class ComposeLogic {
   static Future<void> uploadAttachment(
     WidgetRef ref,
     ComposeState state,
-    int index,
-  ) async {
+    int index, {
+    String? poolId, // For Unit Test
+  }) async {
     final attachment = state.attachments.value[index];
     if (attachment.isOnCloud) return;
 
@@ -491,22 +516,34 @@ class ComposeLogic {
     if (token == null) throw ArgumentError('Token is null');
 
     try {
-      // Update progress state
       state.attachmentProgress.value = {
         ...state.attachmentProgress.value,
         index: 0,
       };
 
-      // Upload file to cloud
-      final cloudFile =
-          await putMediaToCloud(
+      SnCloudFile? cloudFile;
+
+      final pools = await ref.read(poolsProvider.future);
+      final selectedPoolId = resolveDefaultPoolId(ref, pools);
+
+      cloudFile =
+          await putFileToCloud(
             fileData: attachment,
             atk: token,
             baseUrl: baseUrl,
-            filename: attachment.data.name ?? 'Post media',
+            poolId: selectedPoolId,
+            filename:
+                attachment.data.name ??
+                (attachment.type == UniversalFileType.file
+                    ? 'General file'
+                    : 'Post media'),
             mimetype:
                 attachment.data.mimeType ??
                 getMimeTypeFromFileType(attachment.type),
+            mode:
+                attachment.type == UniversalFileType.file
+                    ? FileUploadMode.generic
+                    : FileUploadMode.mediaSafe,
             onProgress: (progress, _) {
               state.attachmentProgress.value = {
                 ...state.attachmentProgress.value,
@@ -519,14 +556,12 @@ class ComposeLogic {
         throw ArgumentError('Failed to upload the file...');
       }
 
-      // Update attachments list with cloud file
       final clone = List.of(state.attachments.value);
       clone[index] = UniversalFile(data: cloudFile, type: attachment.type);
       state.attachments.value = clone;
     } catch (err) {
-      showErrorAlert(err);
+      showErrorAlert(err.toString());
     } finally {
-      // Clean up progress state
       state.attachmentProgress.value = {...state.attachmentProgress.value}
         ..remove(index);
     }
@@ -577,6 +612,18 @@ class ComposeLogic {
     );
   }
 
+  static void setEmbedView(ComposeState state, SnPostEmbedView embedView) {
+    state.embedView.value = embedView;
+  }
+
+  static void updateEmbedView(ComposeState state, SnPostEmbedView embedView) {
+    state.embedView.value = embedView;
+  }
+
+  static void deleteEmbedView(ComposeState state) {
+    state.embedView.value = null;
+  }
+
   static Future<void> pickPoll(
     WidgetRef ref,
     ComposeState state,
@@ -633,7 +680,6 @@ class ComposeLogic {
             .where((entry) => entry.value.isOnDevice)
             .map((entry) => uploadAttachment(ref, state, entry.key)),
       );
-
       // Prepare API request
       final client = ref.watch(apiClientProvider);
       final isNewPost = originalPost == null;
@@ -660,6 +706,8 @@ class ComposeLogic {
         'categories': state.categories.value.map((e) => e.slug).toList(),
         if (state.realm.value != null) 'realm_id': state.realm.value?.id,
         if (state.pollId.value != null) 'poll_id': state.pollId.value,
+        if (state.embedView.value != null)
+          'embed_view': state.embedView.value!.toJson(),
       };
 
       // Send request
@@ -753,6 +801,7 @@ class ComposeLogic {
     state.tagsController.dispose();
     state.categories.dispose();
     state.realm.dispose();
+    state.embedView.dispose();
     state.pollId.dispose();
   }
 }

lib/widgets/post/compose_toolbar.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/post.dart';
 import 'package:island/services/compose_storage_db.dart';
+import 'package:island/widgets/post/compose_embed_sheet.dart';
 import 'package:island/widgets/post/compose_shared.dart';
 import 'package:island/widgets/post/draft_manager.dart';
 import 'package:material_symbols_icons/symbols.dart';
@@ -24,6 +25,10 @@ class ComposeToolbar extends HookConsumerWidget {
       ComposeLogic.pickVideoMedia(ref, state);
     }
 
+    void pickGeneralFile() {
+      ComposeLogic.pickGeneralFile(ref, state);
+    }
+
     void addAudio() {
       ComposeLogic.recordAudioMedia(ref, state, context);
     }
@@ -33,13 +38,21 @@ class ComposeToolbar extends HookConsumerWidget {
     }
 
     void saveDraft() {
-      ComposeLogic.saveDraft(ref, state);
+      ComposeLogic.saveDraftManually(ref, state, context);
     }
 
     void pickPoll() {
       ComposeLogic.pickPoll(ref, state, context);
     }
 
+    void showEmbedSheet() {
+      showModalBottomSheet(
+        context: context,
+        isScrollControlled: true,
+        builder: (context) => ComposeEmbedSheet(state: state),
+      );
+    }
+
     void showDraftManager() {
       showModalBottomSheet(
         context: context,
@@ -87,6 +100,12 @@ class ComposeToolbar extends HookConsumerWidget {
                 icon: const Icon(Symbols.mic),
                 color: colorScheme.primary,
               ),
+              IconButton(
+                onPressed: pickGeneralFile,
+                tooltip: 'uploadFile'.tr(),
+                icon: const Icon(Symbols.file_upload),
+                color: colorScheme.primary,
+              ),
               IconButton(
                 onPressed: linkAttachment,
                 icon: const Icon(Symbols.attach_file),
@@ -112,6 +131,25 @@ class ComposeToolbar extends HookConsumerWidget {
                   );
                 },
               ),
+              // Embed button with visual state when embed is present
+              ListenableBuilder(
+                listenable: state.embedView,
+                builder: (context, _) {
+                  return IconButton(
+                    onPressed: showEmbedSheet,
+                    icon: const Icon(Symbols.web),
+                    tooltip: 'embedView'.tr(),
+                    color: colorScheme.primary,
+                    style: ButtonStyle(
+                      backgroundColor: WidgetStatePropertyAll(
+                        state.embedView.value != null
+                            ? colorScheme.primary.withOpacity(0.15)
+                            : null,
+                      ),
+                    ),
+                  );
+                },
+              ),
               const Spacer(),
               if (originalPost == null && state.isEmpty)
                 IconButton(

lib/widgets/post/draft_manager.dart

@@ -16,138 +16,145 @@ class DraftManagerSheet extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final theme = Theme.of(context);
     final colorScheme = theme.colorScheme;
-    final isLoading = useState(true);
+    final searchController = useTextEditingController();
+    final searchQuery = useState('');
 
     final drafts = ref.watch(composeStorageNotifierProvider);
 
-    // Track loading state based on drafts being loaded
-    useEffect(() {
-      // Set loading to false after drafts are loaded
-      // We consider drafts loaded when the provider has been initialized
-      Future.microtask(() {
-        if (isLoading.value) {
-          isLoading.value = false;
-        }
-      });
-      return null;
-    }, [drafts]);
+    // Search functionality
+    final filteredDrafts = useMemoized(() {
+      if (searchQuery.value.isEmpty) {
+        return drafts.values.toList()
+          ..sort((a, b) => b.updatedAt!.compareTo(a.updatedAt!));
+      }
 
-    final sortedDrafts = useMemoized(
-      () {
-        final draftList = drafts.values.toList();
-        draftList.sort((a, b) => b.updatedAt!.compareTo(a.updatedAt!));
-        return draftList;
-      },
-      [
-        drafts.length,
-        drafts.values.map((e) => e.updatedAt!.millisecondsSinceEpoch).join(),
-      ],
-    );
+      final query = searchQuery.value.toLowerCase();
+      return drafts.values.where((draft) {
+          return (draft.title?.toLowerCase().contains(query) ?? false) ||
+              (draft.description?.toLowerCase().contains(query) ?? false) ||
+              (draft.content?.toLowerCase().contains(query) ?? false);
+        }).toList()
+        ..sort((a, b) => b.updatedAt!.compareTo(a.updatedAt!));
+    }, [drafts, searchQuery.value]);
 
     return SheetScaffold(
       titleText: 'drafts'.tr(),
-      child:
-          isLoading.value
-              ? const Center(child: CircularProgressIndicator())
-              : Column(
-                children: [
-                  if (sortedDrafts.isEmpty)
-                    Expanded(
-                      child: Center(
-                        child: Column(
-                          mainAxisAlignment: MainAxisAlignment.center,
-                          children: [
-                            Icon(
-                              Symbols.draft,
-                              size: 64,
-                              color: colorScheme.onSurface.withOpacity(0.3),
-                            ),
-                            const Gap(16),
-                            Text(
-                              'noDrafts'.tr(),
-                              style: theme.textTheme.bodyLarge?.copyWith(
-                                color: colorScheme.onSurface.withOpacity(0.6),
-                              ),
-                            ),
-                          ],
-                        ),
-                      ),
-                    )
-                  else
-                    Expanded(
-                      child: ListView.builder(
-                        itemCount: sortedDrafts.length,
-                        itemBuilder: (context, index) {
-                          final draft = sortedDrafts[index];
-                          return _DraftItem(
-                            draft: draft,
-                            onTap: () {
-                              Navigator.of(context).pop();
-                              onDraftSelected?.call(draft.id);
-                            },
-                            onDelete: () async {
-                              await ref
-                                  .read(composeStorageNotifierProvider.notifier)
-                                  .deleteDraft(draft.id);
-                            },
-                          );
-                        },
-                      ),
-                    ),
-                  if (sortedDrafts.isNotEmpty) ...[
-                    const Divider(),
-                    Padding(
-                      padding: const EdgeInsets.all(16),
-                      child: Row(
-                        children: [
-                          Expanded(
-                            child: OutlinedButton.icon(
-                              onPressed: () async {
-                                final confirmed = await showDialog<bool>(
-                                  context: context,
-                                  builder:
-                                      (context) => AlertDialog(
-                                        title: Text('clearAllDrafts'.tr()),
-                                        content: Text(
-                                          'clearAllDraftsConfirm'.tr(),
-                                        ),
-                                        actions: [
-                                          TextButton(
-                                            onPressed:
-                                                () => Navigator.of(
-                                                  context,
-                                                ).pop(false),
-                                            child: Text('cancel'.tr()),
-                                          ),
-                                          TextButton(
-                                            onPressed:
-                                                () => Navigator.of(
-                                                  context,
-                                                ).pop(true),
-                                            child: Text('confirm'.tr()),
-                                          ),
-                                        ],
-                                      ),
-                                );
+      child: Column(
+        children: [
+          // Search bar
+          Padding(
+            padding: const EdgeInsets.all(16),
+            child: TextField(
+              controller: searchController,
+              decoration: InputDecoration(
+                hintText: 'searchDrafts'.tr(),
+                prefixIcon: const Icon(Symbols.search),
+                border: OutlineInputBorder(
+                  borderRadius: BorderRadius.circular(12),
+                ),
+                contentPadding: const EdgeInsets.symmetric(
+                  horizontal: 16,
+                  vertical: 12,
+                ),
+              ),
+              onChanged: (value) => searchQuery.value = value,
+            ),
+          ),
 
-                                if (confirmed == true) {
-                                  await ref
-                                      .read(
-                                        composeStorageNotifierProvider.notifier,
-                                      )
-                                      .clearAllDrafts();
-                                }
-                              },
-                              icon: const Icon(Symbols.delete_sweep),
-                              label: Text('clearAll'.tr()),
-                            ),
-                          ),
-                        ],
+          // Drafts list
+          if (filteredDrafts.isEmpty)
+            Expanded(
+              child: Center(
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Icon(
+                      Symbols.draft,
+                      size: 64,
+                      color: colorScheme.onSurface.withOpacity(0.3),
+                    ),
+                    const Gap(16),
+                    Text(
+                      searchQuery.value.isEmpty
+                          ? 'noDrafts'.tr()
+                          : 'noSearchResults'.tr(),
+                      style: theme.textTheme.bodyLarge?.copyWith(
+                        color: colorScheme.onSurface.withOpacity(0.6),
                       ),
                     ),
                   ],
+                ),
+              ),
+            )
+          else
+            Expanded(
+              child: ListView.builder(
+                itemCount: filteredDrafts.length,
+                itemBuilder: (context, index) {
+                  final draft = filteredDrafts[index];
+                  return _DraftItem(
+                    draft: draft,
+                    onTap: () {
+                      Navigator.of(context).pop();
+                      onDraftSelected?.call(draft.id);
+                    },
+                    onDelete: () async {
+                      await ref
+                          .read(composeStorageNotifierProvider.notifier)
+                          .deleteDraft(draft.id);
+                    },
+                  );
+                },
+              ),
+            ),
+
+          // Clear all button
+          if (filteredDrafts.isNotEmpty) ...[
+            const Divider(),
+            Padding(
+              padding: const EdgeInsets.all(16),
+              child: Row(
+                children: [
+                  Expanded(
+                    child: OutlinedButton.icon(
+                      onPressed: () async {
+                        final confirmed = await showDialog<bool>(
+                          context: context,
+                          builder:
+                              (context) => AlertDialog(
+                                title: Text('clearAllDrafts'.tr()),
+                                content: Text('clearAllDraftsConfirm'.tr()),
+                                actions: [
+                                  TextButton(
+                                    onPressed:
+                                        () => Navigator.of(context).pop(false),
+                                    child: Text('cancel'.tr()),
+                                  ),
+                                  TextButton(
+                                    onPressed:
+                                        () => Navigator.of(context).pop(true),
+                                    child: Text('confirm'.tr()),
+                                  ),
+                                ],
+                              ),
+                        );
+
+                        if (confirmed == true) {
+                          await ref
+                              .read(composeStorageNotifierProvider.notifier)
+                              .clearAllDrafts();
+                        }
+                      },
+                      icon: const Icon(Symbols.delete_sweep),
+                      label: Text('clearAll'.tr()),
+                    ),
+                  ),
                 ],
               ),
+            ),
+          ],
+        ],
+      ),
     );
   }
 }
@@ -169,7 +176,7 @@ class _DraftItem extends StatelessWidget {
     final preview =
         content.length > 100 ? '${content.substring(0, 100)}...' : content;
     final timeAgo = _formatTimeAgo(draft.updatedAt!);
-    final visibility = _parseVisibility(draft.visibility);
+    final visibility = _parseVisibility(draft.visibility).tr();
 
     return Card(
       margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),

lib/widgets/post/embed_view_renderer.dart

@@ -0,0 +1,291 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/post.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+class EmbedViewRenderer extends HookConsumerWidget {
+  final SnPostEmbedView embedView;
+  final double? maxHeight;
+  final BorderRadius? borderRadius;
+
+  const EmbedViewRenderer({
+    super.key,
+    required this.embedView,
+    this.maxHeight = 400,
+    this.borderRadius,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+
+    // State management for lazy loading
+    final shouldLoad = useState(false);
+    final isLoading = useState(false);
+
+    return Container(
+      constraints: BoxConstraints(maxHeight: maxHeight ?? 400),
+      decoration: BoxDecoration(
+        borderRadius: borderRadius ?? BorderRadius.circular(12),
+        border: Border.all(
+          color: colorScheme.outline.withOpacity(0.3),
+          width: 1,
+        ),
+        color: colorScheme.surfaceContainerLowest,
+      ),
+      child: ClipRRect(
+        borderRadius: borderRadius ?? BorderRadius.circular(12),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            // Header with embed info
+            Container(
+              padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+              decoration: BoxDecoration(
+                color: colorScheme.surfaceContainerHigh,
+                border: Border(
+                  bottom: BorderSide(
+                    color: colorScheme.outline.withOpacity(0.2),
+                    width: 1,
+                  ),
+                ),
+              ),
+              child: Row(
+                children: [
+                  Icon(
+                    embedView.renderer == PostEmbedViewRenderer.webView
+                        ? Symbols.web
+                        : Symbols.web,
+                    size: 16,
+                    color: colorScheme.primary,
+                  ),
+                  const SizedBox(width: 8),
+                  Expanded(
+                    child: Text(
+                      _getUriDisplay(embedView.uri),
+                      style: theme.textTheme.bodySmall?.copyWith(
+                        color: colorScheme.onSurfaceVariant,
+                      ),
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                    ),
+                  ),
+                  IconButton(
+                    icon: Icon(
+                      Symbols.open_in_new,
+                      size: 16,
+                      color: colorScheme.onSurfaceVariant,
+                    ),
+                    onPressed: () async {
+                      final uri = Uri.parse(embedView.uri);
+                      if (await canLaunchUrl(uri)) {
+                        await launchUrl(
+                          uri,
+                          mode: LaunchMode.externalApplication,
+                        );
+                      }
+                    },
+                    padding: EdgeInsets.zero,
+                    constraints: const BoxConstraints(),
+                    visualDensity: VisualDensity.compact,
+                    tooltip: 'Open in browser',
+                  ),
+                ],
+              ),
+            ),
+
+            // WebView content with lazy loading
+            AspectRatio(
+              aspectRatio: embedView.aspectRatio ?? 1,
+              child:
+                  shouldLoad.value
+                      ? Stack(
+                        children: [
+                          InAppWebView(
+                            initialUrlRequest: URLRequest(
+                              url: WebUri(embedView.uri),
+                            ),
+                            initialSettings: InAppWebViewSettings(
+                              javaScriptEnabled: true,
+                              mediaPlaybackRequiresUserGesture: false,
+                              allowsInlineMediaPlayback: true,
+                              useShouldOverrideUrlLoading: true,
+                              useOnLoadResource: true,
+                              supportZoom: false,
+                              useWideViewPort: false,
+                              loadWithOverviewMode: true,
+                              builtInZoomControls: false,
+                              displayZoomControls: false,
+                              minimumFontSize: 12,
+                              preferredContentMode:
+                                  UserPreferredContentMode.RECOMMENDED,
+                              allowsBackForwardNavigationGestures: false,
+                              allowsLinkPreview: false,
+                              isInspectable: false,
+                            ),
+                            onWebViewCreated: (controller) {
+                              // Configure webview settings
+                              controller.addJavaScriptHandler(
+                                handlerName: 'onHeightChanged',
+                                callback: (args) {
+                                  // Handle dynamic height changes if needed
+                                },
+                              );
+                            },
+                            onLoadStart: (controller, url) {
+                              isLoading.value = true;
+                            },
+                            onLoadStop: (controller, url) async {
+                              isLoading.value = false;
+                              // Inject CSS to improve mobile display and remove borders
+                              await controller.evaluateJavascript(
+                                source: '''
+                            // Remove unwanted elements
+                            var elements = document.querySelectorAll('nav, header, footer, .ads, .advertisement, .sidebar');
+                            for (var i = 0; i < elements.length; i++) {
+                              elements[i].style.display = 'none';
+                            }
+
+                            // Remove borders from embedded content (YouTube, Vimeo, etc.)
+                            var iframes = document.querySelectorAll('iframe');
+                            for (var i = 0; i < iframes.length; i++) {
+                              iframes[i].style.border = 'none';
+                              iframes[i].style.borderRadius = '0';
+                            }
+
+                            // Remove borders from video elements
+                            var videos = document.querySelectorAll('video');
+                            for (var i = 0; i < videos.length; i++) {
+                              videos[i].style.border = 'none';
+                              videos[i].style.borderRadius = '0';
+                            }
+
+                            // Remove borders from any element that might have them
+                            var allElements = document.querySelectorAll('*');
+                            for (var i = 0; i < allElements.length; i++) {
+                              if (allElements[i].style.border) {
+                                allElements[i].style.border = 'none';
+                              }
+                            }
+
+                            // Improve readability
+                            var body = document.body;
+                            body.style.fontSize = '14px';
+                            body.style.lineHeight = '1.4';
+                            body.style.margin = '0';
+                            body.style.padding = '0';
+
+                            // Handle dynamic content
+                            var observer = new MutationObserver(function(mutations) {
+                              // Remove borders from newly added elements
+                              var newIframes = document.querySelectorAll('iframe');
+                              for (var i = 0; i < newIframes.length; i++) {
+                                if (!newIframes[i].style.border || newIframes[i].style.border !== 'none') {
+                                  newIframes[i].style.border = 'none';
+                                  newIframes[i].style.borderRadius = '0';
+                                }
+                              }
+                              var newVideos = document.querySelectorAll('video');
+                              for (var i = 0; i < newVideos.length; i++) {
+                                if (!newVideos[i].style.border || newVideos[i].style.border !== 'none') {
+                                  newVideos[i].style.border = 'none';
+                                  newVideos[i].style.borderRadius = '0';
+                                }
+                              }
+                              window.flutter_inappwebview.callHandler('onHeightChanged', document.body.scrollHeight);
+                            });
+                            observer.observe(document.body, { childList: true, subtree: true });
+                          ''',
+                              );
+                            },
+                            onLoadError: (controller, url, code, message) {
+                              isLoading.value = false;
+                            },
+                            onLoadHttpError: (
+                              controller,
+                              url,
+                              statusCode,
+                              description,
+                            ) {
+                              isLoading.value = false;
+                            },
+                            shouldOverrideUrlLoading: (
+                              controller,
+                              navigationAction,
+                            ) async {
+                              final uri = navigationAction.request.url;
+                              if (uri != null &&
+                                  uri.toString() != embedView.uri) {
+                                // Open external links in browser
+                                // You might want to use url_launcher here
+                                return NavigationActionPolicy.CANCEL;
+                              }
+                              return NavigationActionPolicy.ALLOW;
+                            },
+                            onProgressChanged: (controller, progress) {
+                              // Handle progress changes if needed
+                            },
+                            onConsoleMessage: (controller, consoleMessage) {
+                              // Handle console messages for debugging
+                              debugPrint(
+                                'WebView Console: ${consoleMessage.message}',
+                              );
+                            },
+                          ),
+                          if (isLoading.value)
+                            Container(
+                              color: colorScheme.surfaceContainerLowest,
+                              child: const Center(
+                                child: CircularProgressIndicator(),
+                              ),
+                            ),
+                        ],
+                      )
+                      : GestureDetector(
+                        onTap: () {
+                          shouldLoad.value = true;
+                        },
+                        child: Container(
+                          color: colorScheme.surfaceContainerLowest,
+                          child: Column(
+                            mainAxisAlignment: MainAxisAlignment.center,
+                            children: [
+                              Icon(
+                                Symbols.play_arrow,
+                                size: 48,
+                                color: colorScheme.onSurfaceVariant.withOpacity(
+                                  0.6,
+                                ),
+                              ),
+                              const SizedBox(height: 8),
+                              Text(
+                                'Tap to load content',
+                                style: theme.textTheme.bodyMedium?.copyWith(
+                                  color: colorScheme.onSurfaceVariant
+                                      .withOpacity(0.6),
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                      ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  String _getUriDisplay(String uri) {
+    try {
+      final parsedUri = Uri.parse(uri);
+      return parsedUri.host.isNotEmpty ? parsedUri.host : uri;
+    } catch (e) {
+      return uri;
+    }
+  }
+}

lib/widgets/post/post_award_history_sheet.dart

@@ -0,0 +1,164 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/post.dart';
+import 'package:island/pods/network.dart';
+import 'package:island/widgets/content/sheet.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';
+
+part 'post_award_history_sheet.g.dart';
+
+@riverpod
+class PostAwardListNotifier extends _$PostAwardListNotifier
+    with CursorPagingNotifierMixin<SnPostAward> {
+  static const int _pageSize = 20;
+
+  @override
+  Future<CursorPagingData<SnPostAward>> build({required String postId}) {
+    return fetch(cursor: null);
+  }
+
+  @override
+  Future<CursorPagingData<SnPostAward>> fetch({required String? cursor}) async {
+    final client = ref.read(apiClientProvider);
+    final offset = cursor == null ? 0 : int.parse(cursor);
+
+    final queryParams = {'offset': offset, 'take': _pageSize};
+
+    final response = await client.get(
+      '/sphere/posts/$postId/awards',
+      queryParameters: queryParams,
+    );
+    final total = int.parse(response.headers.value('X-Total') ?? '0');
+    final List<dynamic> data = response.data;
+    final awards = data.map((json) => SnPostAward.fromJson(json)).toList();
+
+    final hasMore = offset + awards.length < total;
+    final nextCursor = hasMore ? (offset + awards.length).toString() : null;
+
+    return CursorPagingData(
+      items: awards,
+      hasMore: hasMore,
+      nextCursor: nextCursor,
+    );
+  }
+}
+
+class PostAwardHistorySheet extends HookConsumerWidget {
+  final String postId;
+
+  const PostAwardHistorySheet({super.key, required this.postId});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final provider = postAwardListNotifierProvider(postId: postId);
+
+    return SheetScaffold(
+      titleText: 'Award History',
+      child: PagingHelperView(
+        provider: provider,
+        futureRefreshable: provider.future,
+        notifierRefreshable: provider.notifier,
+        contentBuilder:
+            (data, widgetCount, endItemView) => ListView.builder(
+              itemCount: widgetCount,
+              itemBuilder: (context, index) {
+                if (index == widgetCount - 1) {
+                  return endItemView;
+                }
+
+                final award = data.items[index];
+                return Column(
+                  children: [
+                    PostAwardItem(award: award),
+                    const Divider(height: 1),
+                  ],
+                );
+              },
+            ),
+      ),
+    );
+  }
+}
+
+class PostAwardItem extends StatelessWidget {
+  final SnPostAward award;
+
+  const PostAwardItem({super.key, required this.award});
+
+  String _getAttitudeText(int attitude) {
+    switch (attitude) {
+      case 0:
+        return 'Positive';
+      case 2:
+        return 'Negative';
+      default:
+        return 'Neutral';
+    }
+  }
+
+  Color _getAttitudeColor(int attitude, BuildContext context) {
+    switch (attitude) {
+      case 0:
+        return Colors.green;
+      case 2:
+        return Colors.red;
+      default:
+        return Theme.of(context).colorScheme.onSurfaceVariant;
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return ListTile(
+      leading: CircleAvatar(
+        backgroundColor: _getAttitudeColor(
+          award.attitude,
+          context,
+        ).withOpacity(0.1),
+        child: Icon(
+          award.attitude == 0
+              ? Icons.thumb_up
+              : award.attitude == 2
+              ? Icons.thumb_down
+              : Icons.thumbs_up_down,
+          color: _getAttitudeColor(award.attitude, context),
+        ),
+      ),
+      title: Text(
+        '${award.amount} pts',
+        style: Theme.of(
+          context,
+        ).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.w600),
+      ),
+      subtitle: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            _getAttitudeText(award.attitude),
+            style: TextStyle(
+              color: _getAttitudeColor(award.attitude, context),
+              fontWeight: FontWeight.w500,
+            ),
+          ),
+          if (award.message != null && award.message!.isNotEmpty) ...[
+            const SizedBox(height: 4),
+            Text(award.message!, style: Theme.of(context).textTheme.bodyMedium),
+          ],
+          const SizedBox(height: 2),
+          if (award.createdAt != null) ...[
+            const SizedBox(height: 2),
+            Text(
+              award.createdAt!.toLocal().toString().split('.')[0],
+              style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                color: Theme.of(context).colorScheme.onSurfaceVariant,
+              ),
+            ),
+          ],
+        ],
+      ),
+      isThreeLine: award.message != null && award.message!.isNotEmpty,
+      contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+    );
+  }
+}

lib/widgets/post/post_award_history_sheet.g.dart

@@ -0,0 +1,180 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'post_award_history_sheet.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$postAwardListNotifierHash() =>
+    r'834d08f90ef352a2dfb0192455c75b1620e859c2';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+abstract class _$PostAwardListNotifier
+    extends BuildlessAutoDisposeAsyncNotifier<CursorPagingData<SnPostAward>> {
+  late final String postId;
+
+  FutureOr<CursorPagingData<SnPostAward>> build({required String postId});
+}
+
+/// See also [PostAwardListNotifier].
+@ProviderFor(PostAwardListNotifier)
+const postAwardListNotifierProvider = PostAwardListNotifierFamily();
+
+/// See also [PostAwardListNotifier].
+class PostAwardListNotifierFamily
+    extends Family<AsyncValue<CursorPagingData<SnPostAward>>> {
+  /// See also [PostAwardListNotifier].
+  const PostAwardListNotifierFamily();
+
+  /// See also [PostAwardListNotifier].
+  PostAwardListNotifierProvider call({required String postId}) {
+    return PostAwardListNotifierProvider(postId: postId);
+  }
+
+  @override
+  PostAwardListNotifierProvider getProviderOverride(
+    covariant PostAwardListNotifierProvider provider,
+  ) {
+    return call(postId: provider.postId);
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'postAwardListNotifierProvider';
+}
+
+/// See also [PostAwardListNotifier].
+class PostAwardListNotifierProvider
+    extends
+        AutoDisposeAsyncNotifierProviderImpl<
+          PostAwardListNotifier,
+          CursorPagingData<SnPostAward>
+        > {
+  /// See also [PostAwardListNotifier].
+  PostAwardListNotifierProvider({required String postId})
+    : this._internal(
+        () => PostAwardListNotifier()..postId = postId,
+        from: postAwardListNotifierProvider,
+        name: r'postAwardListNotifierProvider',
+        debugGetCreateSourceHash:
+            const bool.fromEnvironment('dart.vm.product')
+                ? null
+                : _$postAwardListNotifierHash,
+        dependencies: PostAwardListNotifierFamily._dependencies,
+        allTransitiveDependencies:
+            PostAwardListNotifierFamily._allTransitiveDependencies,
+        postId: postId,
+      );
+
+  PostAwardListNotifierProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.postId,
+  }) : super.internal();
+
+  final String postId;
+
+  @override
+  FutureOr<CursorPagingData<SnPostAward>> runNotifierBuild(
+    covariant PostAwardListNotifier notifier,
+  ) {
+    return notifier.build(postId: postId);
+  }
+
+  @override
+  Override overrideWith(PostAwardListNotifier Function() create) {
+    return ProviderOverride(
+      origin: this,
+      override: PostAwardListNotifierProvider._internal(
+        () => create()..postId = postId,
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        postId: postId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeAsyncNotifierProviderElement<
+    PostAwardListNotifier,
+    CursorPagingData<SnPostAward>
+  >
+  createElement() {
+    return _PostAwardListNotifierProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is PostAwardListNotifierProvider && other.postId == postId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, postId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin PostAwardListNotifierRef
+    on AutoDisposeAsyncNotifierProviderRef<CursorPagingData<SnPostAward>> {
+  /// The parameter `postId` of this provider.
+  String get postId;
+}
+
+class _PostAwardListNotifierProviderElement
+    extends
+        AutoDisposeAsyncNotifierProviderElement<
+          PostAwardListNotifier,
+          CursorPagingData<SnPostAward>
+        >
+    with PostAwardListNotifierRef {
+  _PostAwardListNotifierProviderElement(super.provider);
+
+  @override
+  String get postId => (origin as PostAwardListNotifierProvider).postId;
+}
+
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/widgets/post/post_award_sheet.dart

@@ -0,0 +1,287 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:gap/gap.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/post.dart';
+import 'package:island/models/wallet.dart';
+import 'package:island/pods/network.dart';
+import 'package:island/widgets/alert.dart';
+import 'package:island/widgets/content/cloud_files.dart';
+import 'package:island/widgets/content/sheet.dart';
+import 'package:island/widgets/payment/payment_overlay.dart';
+import 'package:material_symbols_icons/symbols.dart';
+
+class PostAwardSheet extends HookConsumerWidget {
+  final SnPost post;
+  const PostAwardSheet({super.key, required this.post});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final messageController = useTextEditingController();
+    final amountController = useTextEditingController();
+    final selectedAttitude = useState<int>(0); // 0 for positive, 2 for negative
+
+    return SheetScaffold(
+      titleText: 'awardPost'.tr(),
+      child: SingleChildScrollView(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            // Post Preview Section
+            _buildPostPreview(context),
+            const Gap(20),
+
+            // Award Result Explanation
+            _buildAwardResultExplanation(context),
+            const Gap(20),
+
+            Text(
+              'awardMessage'.tr(),
+              style: Theme.of(context).textTheme.titleMedium,
+            ),
+            const Gap(8),
+            TextField(
+              controller: messageController,
+              maxLines: 3,
+              decoration: InputDecoration(
+                hintText: 'awardMessageHint'.tr(),
+                border: const OutlineInputBorder(
+                  borderRadius: BorderRadius.all(Radius.circular(16)),
+                ),
+              ),
+            ),
+            const Gap(16),
+            Text(
+              'awardAttitude'.tr(),
+              style: Theme.of(context).textTheme.titleMedium,
+            ),
+            const Gap(8),
+            SegmentedButton<int>(
+              segments: [
+                ButtonSegment<int>(
+                  value: 0,
+                  label: Text('awardAttitudePositive'.tr()),
+                  icon: const Icon(Symbols.thumb_up),
+                ),
+                ButtonSegment<int>(
+                  value: 2,
+                  label: Text('awardAttitudeNegative'.tr()),
+                  icon: const Icon(Symbols.thumb_down),
+                ),
+              ],
+              selected: {selectedAttitude.value},
+              onSelectionChanged: (Set<int> selection) {
+                selectedAttitude.value = selection.first;
+              },
+            ),
+            const Gap(16),
+            Text(
+              'awardAmount'.tr(),
+              style: Theme.of(context).textTheme.titleMedium,
+            ),
+            const Gap(8),
+            TextField(
+              controller: amountController,
+              keyboardType: TextInputType.number,
+              decoration: InputDecoration(
+                hintText: 'awardAmountHint'.tr(),
+                border: const OutlineInputBorder(
+                  borderRadius: BorderRadius.all(Radius.circular(16)),
+                ),
+                suffixText: 'NSP',
+              ),
+            ),
+            const Gap(24),
+            SizedBox(
+              width: double.infinity,
+              child: FilledButton.icon(
+                onPressed:
+                    () => _submitAward(
+                      context,
+                      ref,
+                      messageController,
+                      amountController,
+                      selectedAttitude.value,
+                    ),
+                icon: const Icon(Symbols.star),
+                label: Text('awardSubmit'.tr()),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildPostPreview(BuildContext context) {
+    return Container(
+      padding: const EdgeInsets.all(12),
+      decoration: BoxDecoration(
+        color: Theme.of(context).colorScheme.surfaceContainerHighest,
+        borderRadius: BorderRadius.circular(12),
+        border: Border.all(
+          color: Theme.of(context).colorScheme.outline.withOpacity(0.2),
+        ),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            children: [
+              Icon(
+                Symbols.article,
+                size: 20,
+                color: Theme.of(context).colorScheme.primary,
+              ),
+              const Gap(8),
+              Text(
+                'awardPostPreview'.tr(),
+                style: Theme.of(
+                  context,
+                ).textTheme.titleSmall?.copyWith(fontWeight: FontWeight.w600),
+              ),
+            ],
+          ),
+          const Gap(8),
+          Text(
+            post.content ?? 'awardNoContent'.tr(),
+            maxLines: 2,
+            overflow: TextOverflow.ellipsis,
+            style: Theme.of(context).textTheme.bodyMedium,
+          ),
+          ...[
+            const Gap(4),
+            Row(
+              spacing: 6,
+              children: [
+                Text(
+                  'awardByPublisher'.tr(args: ['@${post.publisher.name}']),
+                  style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                    color: Theme.of(context).colorScheme.onSurfaceVariant,
+                  ),
+                ),
+                ProfilePictureWidget(file: post.publisher.picture, radius: 8),
+              ],
+            ),
+          ],
+        ],
+      ),
+    );
+  }
+
+  Widget _buildAwardResultExplanation(BuildContext context) {
+    return Container(
+      padding: const EdgeInsets.all(12),
+      decoration: BoxDecoration(
+        color: Theme.of(context).colorScheme.primaryContainer.withOpacity(0.3),
+        borderRadius: BorderRadius.circular(12),
+        border: Border.all(
+          color: Theme.of(context).colorScheme.primary.withOpacity(0.2),
+        ),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            children: [
+              Icon(
+                Symbols.info,
+                size: 20,
+                color: Theme.of(context).colorScheme.primary,
+              ),
+              const Gap(8),
+              Text(
+                'awardBenefits'.tr(),
+                style: Theme.of(context).textTheme.titleSmall?.copyWith(
+                  fontWeight: FontWeight.w600,
+                  color: Theme.of(context).colorScheme.primary,
+                ),
+              ),
+            ],
+          ),
+          const Gap(8),
+          Text(
+            'awardBenefitsDescription'.tr(),
+            style: Theme.of(context).textTheme.bodySmall?.copyWith(
+              color: Theme.of(context).colorScheme.onSurfaceVariant,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Future<void> _submitAward(
+    BuildContext context,
+    WidgetRef ref,
+    TextEditingController messageController,
+    TextEditingController amountController,
+    int selectedAttitude,
+  ) async {
+    // Get values from controllers
+    final message = messageController.text.trim();
+    final amountText = amountController.text.trim();
+
+    // Validate inputs
+    if (amountText.isEmpty) {
+      showSnackBar('awardAmountRequired'.tr());
+      return;
+    }
+
+    final amount = double.tryParse(amountText);
+    if (amount == null || amount <= 0) {
+      showSnackBar('awardAmountInvalid'.tr());
+      return;
+    }
+
+    if (message.length > 4096) {
+      showSnackBar('awardMessageTooLong'.tr());
+      return;
+    }
+
+    try {
+      showLoadingModal(context);
+
+      final client = ref.read(apiClientProvider);
+
+      // Send award request
+      final awardResponse = await client.post(
+        '/sphere/posts/${post.id}/awards',
+        data: {
+          'amount': amount,
+          'attitude': selectedAttitude,
+          if (message.isNotEmpty) 'message': message,
+        },
+      );
+
+      final orderId = awardResponse.data['order_id'] as String;
+
+      // Fetch order details
+      final orderResponse = await client.get('/id/orders/$orderId');
+      final order = SnWalletOrder.fromJson(orderResponse.data);
+
+      if (context.mounted) {
+        hideLoadingModal(context);
+
+        // Show payment overlay
+        final paidOrder = await PaymentOverlay.show(
+          context: context,
+          order: order,
+          enableBiometric: true,
+        );
+
+        if (paidOrder != null && context.mounted) {
+          showSnackBar('awardSuccess'.tr());
+          Navigator.of(context).pop();
+        }
+      }
+    } catch (err) {
+      if (context.mounted) {
+        hideLoadingModal(context);
+        showErrorAlert(err);
+      }
+    }
+  }
+}