🚀 Launch 3.2.0+132

💄 Optimize poll feedback

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

@@ -133,6 +133,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": {
@@ -195,6 +214,7 @@
   "checkInResultLevel2": "A Normal Day",
   "checkInResultLevel3": "Good Luck",
   "checkInResultLevel4": "Best Luck",
+  "checkInResultLevel5": "Happy Birthday 🥳",
   "checkInActivityTitle": "{} checked in on {} and got a {}",
   "eventCalander": "Event Calander",
   "eventCalanderEmpty": "No events on that day.",
@@ -228,6 +248,8 @@
   "settings": "Settings",
   "language": "Language",
   "accountLanguageHint": "This language will be used for email and push notifications.",
+  "region": "Region",
+  "accountRegionHint": "This region will be used for content delivery and localization.",
   "settingsDisplayLanguage": "Display Language",
   "languageFollowSystem": "Follow System",
   "postsCreatedCount": "Posts",
@@ -349,6 +371,8 @@
   "chatBreakNone": "None",
   "settingsRealmCompactView": "Compact Realm View",
   "settingsMixedFeed": "Mixed Feed",
+  "settingsDataSavingMode": "Data Saving Mode",
+  "dataSavingHint": "Data Saving Mode",
   "settingsAutoTranslate": "Auto Translate",
   "settingsHideBottomNav": "Hide Bottom Navigation",
   "settingsSoundEffects": "Sound Effects",
@@ -447,6 +471,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",
@@ -493,6 +519,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",
@@ -971,5 +1001,20 @@
   "shuffle": "Shuffle",
   "pinned": "Pinned",
   "noResultsFound": "No results found",
-  "toggleFilters": "Toggle filters"
+  "toggleFilters": "Toggle filters",
+  "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

@@ -158,11 +158,12 @@
   "checkIn": "签到",
   "checkInNone": "尚未签到",
   "checkInNoneHint": "通过签到获取您的财富提示和每日奖励。",
-  "checkInResultLevel0": "最差运气",
-  "checkInResultLevel1": "坏运气",
-  "checkInResultLevel2": "一个普通的日常",
-  "checkInResultLevel3": "好运",
-  "checkInResultLevel4": "最佳运气",
+  "checkInResultLevel0": "大凶",
+  "checkInResultLevel1": "凶",
+  "checkInResultLevel2": "中平",
+  "checkInResultLevel3": "吉",
+  "checkInResultLevel4": "大吉",
+  "checkInResultLevel5": "生日快乐 🥳",
   "checkInActivityTitle": "{} 在 {} 签到并获得了 {}",
   "eventCalander": "活动日历",
   "eventCalanderEmpty": "该日无活动。",
@@ -315,6 +316,8 @@
   "chatBreakNone": "无",
   "settingsRealmCompactView": "紧凑领域视图",
   "settingsMixedFeed": "混合动态",
+  "settingsDataSavingMode": "流量节省模式",
+  "dataSavingHint": "流量节省模式",
   "settingsAutoTranslate": "自动翻译",
   "settingsHideBottomNav": "隐藏底部导航",
   "settingsSoundEffects": "音效",
@@ -860,5 +863,6 @@
   "statusPresent": "至今",
   "accountAutomated": "机器人",
   "openInBrowser": "在浏览器中打开",
-  "highlightPost": "精选帖子"
+  "highlightPost": "精选帖子",
+  "notableDayNext": "距离 {} 还有"
 }

assets/i18n/zh-TW.json

@@ -315,6 +315,8 @@
     "settingsRealmCompactView": "緊湊領域視圖",
     "settingsMixedFeed": "混合動態",
     "settingsAutoTranslate": "自動翻譯",
+    "settingsDataSavingMode": "低數據模式",
+    "dataSavingHint": "低數據模式",
     "settingsHideBottomNav": "隱藏底部導航",
     "settingsSoundEffects": "音效",
     "settingsAprilFoolFeatures": "愚人節功能",
@@ -825,4 +827,4 @@
     "copySecretHint": "請複製此密鑰並將其存放在安全的地方。您將無法再次看到它。",
     "expiresIn": "過期時間（秒）",
     "isOidc": "OIDC 相容"
-}
+}

ios/Podfile.lock

@@ -136,6 +136,8 @@ PODS:
     - OrderedSet (~> 6.0.3)
   - flutter_keyboard_visibility (0.0.1):
     - Flutter
+  - flutter_local_notifications (0.0.1):
+    - Flutter
   - flutter_native_splash (2.4.3):
     - Flutter
   - flutter_platform_alert (0.0.1):
@@ -314,6 +316,7 @@ DEPENDENCIES:
   - flutter_app_update (from `.symlinks/plugins/flutter_app_update/ios`)
   - flutter_inappwebview_ios (from `.symlinks/plugins/flutter_inappwebview_ios/ios`)
   - flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`)
+  - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
   - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
   - flutter_platform_alert (from `.symlinks/plugins/flutter_platform_alert/ios`)
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
@@ -402,6 +405,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_inappwebview_ios/ios"
   flutter_keyboard_visibility:
     :path: ".symlinks/plugins/flutter_keyboard_visibility/ios"
+  flutter_local_notifications:
+    :path: ".symlinks/plugins/flutter_local_notifications/ios"
   flutter_native_splash:
     :path: ".symlinks/plugins/flutter_native_splash/ios"
   flutter_platform_alert:
@@ -488,6 +493,7 @@ SPEC CHECKSUMS:
   flutter_app_update: 816fdb2e30e4832a7c45e3f108d391c42ef040a9
   flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
   flutter_keyboard_visibility: 4625131e43015dbbe759d9b20daaf77e0e3f6619
+  flutter_local_notifications: a5a732f069baa862e728d839dd2ebb904737effb
   flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
   flutter_platform_alert: bf3b5fcd4ac14bd637e20527e9c471633071afd3
   flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13

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

@@ -240,6 +240,7 @@ class IslandApp extends HookConsumerWidget {
       themeMode: ThemeMode.system,
       routerConfig: router,
       supportedLocales: context.supportedLocales,
+      scrollBehavior: AppScrollBehavior(),
       localizationsDelegates: [
         ...context.localizationDelegates,
         CroppyLocalizations.delegate,

lib/models/account.dart

@@ -13,11 +13,13 @@ sealed class SnAccount with _$SnAccount {
     required String name,
     required String nick,
     required String language,
+    @Default("") String region,
     required bool isSuperuser,
     required String? automatedId,
     required SnAccountProfile profile,
     required SnWalletSubscriptionRef? perkSubscription,
     @Default([]) List<SnAccountBadge> badges,
+    @Default([]) List<SnContactMethod> contacts,
     required DateTime createdAt,
     required DateTime updatedAt,
     required DateTime? deletedAt,
@@ -134,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; 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.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,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, 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, 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,18 +65,20 @@ 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? 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
 as String,nick: null == nick ? _self.nick : nick // ignore: cast_nullable_to_non_nullable
 as String,language: null == language ? _self.language : language // ignore: cast_nullable_to_non_nullable
+as String,region: null == region ? _self.region : region // ignore: cast_nullable_to_non_nullable
 as String,isSuperuser: null == isSuperuser ? _self.isSuperuser : isSuperuser // ignore: cast_nullable_to_non_nullable
 as bool,automatedId: freezed == automatedId ? _self.automatedId : automatedId // ignore: cast_nullable_to_non_nullable
 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?,
@@ -182,10 +184,10 @@ return $default(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String name,  String nick,  String language,  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.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();
 
 }
@@ -203,10 +205,10 @@ return $default(_that.id,_that.name,_that.nick,_that.language,_that.isSuperuser,
 /// }
 /// ```
 
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String name,  String nick,  String language,  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.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`
 ///
@@ -220,10 +222,10 @@ return $default(_that.id,_that.name,_that.nick,_that.language,_that.isSuperuser,
 /// }
 /// ```
 
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String name,  String nick,  String language,  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.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;
 
 }
@@ -235,13 +237,14 @@ return $default(_that.id,_that.name,_that.nick,_that.language,_that.isSuperuser,
 @JsonSerializable()
 
 class _SnAccount implements SnAccount {
-  const _SnAccount({required this.id, required this.name, required this.nick, required this.language, 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;
 @override final  String name;
 @override final  String nick;
 @override final  String language;
+@override@JsonKey() final  String region;
 @override final  bool isSuperuser;
 @override final  String? automatedId;
 @override final  SnAccountProfile profile;
@@ -253,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;
@@ -270,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.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,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, 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)';
 }
 
 
@@ -290,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, 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
 });
 
 
@@ -307,18 +317,20 @@ 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? 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
 as String,nick: null == nick ? _self.nick : nick // ignore: cast_nullable_to_non_nullable
 as String,language: null == language ? _self.language : language // ignore: cast_nullable_to_non_nullable
+as String,region: null == region ? _self.region : region // ignore: cast_nullable_to_non_nullable
 as String,isSuperuser: null == isSuperuser ? _self.isSuperuser : isSuperuser // ignore: cast_nullable_to_non_nullable
 as bool,automatedId: freezed == automatedId ? _self.automatedId : automatedId // ignore: cast_nullable_to_non_nullable
 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?,
@@ -1624,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)
@@ -1637,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)';
 }
 
 
@@ -1657,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
 });
 
 
@@ -1674,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
@@ -1767,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();
 
 }
@@ -1788,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`
 ///
@@ -1805,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;
 
 }
@@ -1820,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;
@@ -1846,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)';
 }
 
 
@@ -1866,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
 });
 
 
@@ -1883,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

@@ -11,6 +11,7 @@ _SnAccount _$SnAccountFromJson(Map<String, dynamic> json) => _SnAccount(
   name: json['name'] as String,
   nick: json['nick'] as String,
   language: json['language'] as String,
+  region: json['region'] as String? ?? "",
   isSuperuser: json['is_superuser'] as bool,
   automatedId: json['automated_id'] as String?,
   profile: SnAccountProfile.fromJson(json['profile'] as Map<String, dynamic>),
@@ -25,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:
@@ -39,11 +45,13 @@ Map<String, dynamic> _$SnAccountToJson(_SnAccount instance) =>
       'name': instance.name,
       'nick': instance.nick,
       'language': instance.language,
+      'region': instance.region,
       'is_superuser': instance.isSuperuser,
       'automated_id': instance.automatedId,
       '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(),
@@ -227,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),
@@ -243,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/activity.dart

@@ -4,6 +4,20 @@ import 'package:island/models/account.dart';
 part 'activity.freezed.dart';
 part 'activity.g.dart';
 
+@freezed
+sealed class SnNotableDay with _$SnNotableDay {
+  const factory SnNotableDay({
+    required DateTime date,
+    required String localName,
+    required String globalName,
+    required String countryCode,
+    required List<int> holidays,
+  }) = _SnNotableDay;
+
+  factory SnNotableDay.fromJson(Map<String, dynamic> json) =>
+      _$SnNotableDayFromJson(json);
+}
+
 @freezed
 sealed class SnActivity with _$SnActivity {
   const factory SnActivity({

lib/models/activity.freezed.dart

@@ -12,6 +12,281 @@ part of 'activity.dart';
 // dart format off
 T _$identity<T>(T value) => value;
 
+/// @nodoc
+mixin _$SnNotableDay {
+
+ DateTime get date; String get localName; String get globalName; String get countryCode; List<int> get holidays;
+/// Create a copy of SnNotableDay
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$SnNotableDayCopyWith<SnNotableDay> get copyWith => _$SnNotableDayCopyWithImpl<SnNotableDay>(this as SnNotableDay, _$identity);
+
+  /// Serializes this SnNotableDay to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnNotableDay&&(identical(other.date, date) || other.date == date)&&(identical(other.localName, localName) || other.localName == localName)&&(identical(other.globalName, globalName) || other.globalName == globalName)&&(identical(other.countryCode, countryCode) || other.countryCode == countryCode)&&const DeepCollectionEquality().equals(other.holidays, holidays));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,date,localName,globalName,countryCode,const DeepCollectionEquality().hash(holidays));
+
+@override
+String toString() {
+  return 'SnNotableDay(date: $date, localName: $localName, globalName: $globalName, countryCode: $countryCode, holidays: $holidays)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $SnNotableDayCopyWith<$Res>  {
+  factory $SnNotableDayCopyWith(SnNotableDay value, $Res Function(SnNotableDay) _then) = _$SnNotableDayCopyWithImpl;
+@useResult
+$Res call({
+ DateTime date, String localName, String globalName, String countryCode, List<int> holidays
+});
+
+
+
+
+}
+/// @nodoc
+class _$SnNotableDayCopyWithImpl<$Res>
+    implements $SnNotableDayCopyWith<$Res> {
+  _$SnNotableDayCopyWithImpl(this._self, this._then);
+
+  final SnNotableDay _self;
+  final $Res Function(SnNotableDay) _then;
+
+/// Create a copy of SnNotableDay
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? date = null,Object? localName = null,Object? globalName = null,Object? countryCode = null,Object? holidays = null,}) {
+  return _then(_self.copyWith(
+date: null == date ? _self.date : date // ignore: cast_nullable_to_non_nullable
+as DateTime,localName: null == localName ? _self.localName : localName // ignore: cast_nullable_to_non_nullable
+as String,globalName: null == globalName ? _self.globalName : globalName // ignore: cast_nullable_to_non_nullable
+as String,countryCode: null == countryCode ? _self.countryCode : countryCode // ignore: cast_nullable_to_non_nullable
+as String,holidays: null == holidays ? _self.holidays : holidays // ignore: cast_nullable_to_non_nullable
+as List<int>,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [SnNotableDay].
+extension SnNotableDayPatterns on SnNotableDay {
+/// 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( _SnNotableDay value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _SnNotableDay() 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( _SnNotableDay value)  $default,){
+final _that = this;
+switch (_that) {
+case _SnNotableDay():
+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( _SnNotableDay value)?  $default,){
+final _that = this;
+switch (_that) {
+case _SnNotableDay() 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( DateTime date,  String localName,  String globalName,  String countryCode,  List<int> holidays)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _SnNotableDay() when $default != null:
+return $default(_that.date,_that.localName,_that.globalName,_that.countryCode,_that.holidays);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( DateTime date,  String localName,  String globalName,  String countryCode,  List<int> holidays)  $default,) {final _that = this;
+switch (_that) {
+case _SnNotableDay():
+return $default(_that.date,_that.localName,_that.globalName,_that.countryCode,_that.holidays);}
+}
+/// 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( DateTime date,  String localName,  String globalName,  String countryCode,  List<int> holidays)?  $default,) {final _that = this;
+switch (_that) {
+case _SnNotableDay() when $default != null:
+return $default(_that.date,_that.localName,_that.globalName,_that.countryCode,_that.holidays);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _SnNotableDay implements SnNotableDay {
+  const _SnNotableDay({required this.date, required this.localName, required this.globalName, required this.countryCode, required final  List<int> holidays}): _holidays = holidays;
+  factory _SnNotableDay.fromJson(Map<String, dynamic> json) => _$SnNotableDayFromJson(json);
+
+@override final  DateTime date;
+@override final  String localName;
+@override final  String globalName;
+@override final  String countryCode;
+ final  List<int> _holidays;
+@override List<int> get holidays {
+  if (_holidays is EqualUnmodifiableListView) return _holidays;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableListView(_holidays);
+}
+
+
+/// Create a copy of SnNotableDay
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$SnNotableDayCopyWith<_SnNotableDay> get copyWith => __$SnNotableDayCopyWithImpl<_SnNotableDay>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$SnNotableDayToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnNotableDay&&(identical(other.date, date) || other.date == date)&&(identical(other.localName, localName) || other.localName == localName)&&(identical(other.globalName, globalName) || other.globalName == globalName)&&(identical(other.countryCode, countryCode) || other.countryCode == countryCode)&&const DeepCollectionEquality().equals(other._holidays, _holidays));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,date,localName,globalName,countryCode,const DeepCollectionEquality().hash(_holidays));
+
+@override
+String toString() {
+  return 'SnNotableDay(date: $date, localName: $localName, globalName: $globalName, countryCode: $countryCode, holidays: $holidays)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$SnNotableDayCopyWith<$Res> implements $SnNotableDayCopyWith<$Res> {
+  factory _$SnNotableDayCopyWith(_SnNotableDay value, $Res Function(_SnNotableDay) _then) = __$SnNotableDayCopyWithImpl;
+@override @useResult
+$Res call({
+ DateTime date, String localName, String globalName, String countryCode, List<int> holidays
+});
+
+
+
+
+}
+/// @nodoc
+class __$SnNotableDayCopyWithImpl<$Res>
+    implements _$SnNotableDayCopyWith<$Res> {
+  __$SnNotableDayCopyWithImpl(this._self, this._then);
+
+  final _SnNotableDay _self;
+  final $Res Function(_SnNotableDay) _then;
+
+/// Create a copy of SnNotableDay
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? date = null,Object? localName = null,Object? globalName = null,Object? countryCode = null,Object? holidays = null,}) {
+  return _then(_SnNotableDay(
+date: null == date ? _self.date : date // ignore: cast_nullable_to_non_nullable
+as DateTime,localName: null == localName ? _self.localName : localName // ignore: cast_nullable_to_non_nullable
+as String,globalName: null == globalName ? _self.globalName : globalName // ignore: cast_nullable_to_non_nullable
+as String,countryCode: null == countryCode ? _self.countryCode : countryCode // ignore: cast_nullable_to_non_nullable
+as String,holidays: null == holidays ? _self._holidays : holidays // ignore: cast_nullable_to_non_nullable
+as List<int>,
+  ));
+}
+
+
+}
+
+
 /// @nodoc
 mixin _$SnActivity {
 

lib/models/activity.g.dart

@@ -6,6 +6,27 @@ part of 'activity.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
+_SnNotableDay _$SnNotableDayFromJson(Map<String, dynamic> json) =>
+    _SnNotableDay(
+      date: DateTime.parse(json['date'] as String),
+      localName: json['local_name'] as String,
+      globalName: json['global_name'] as String,
+      countryCode: json['country_code'] as String,
+      holidays:
+          (json['holidays'] as List<dynamic>)
+              .map((e) => (e as num).toInt())
+              .toList(),
+    );
+
+Map<String, dynamic> _$SnNotableDayToJson(_SnNotableDay instance) =>
+    <String, dynamic>{
+      'date': instance.date.toIso8601String(),
+      'local_name': instance.localName,
+      'global_name': instance.globalName,
+      'country_code': instance.countryCode,
+      'holidays': instance.holidays,
+    };
+
 _SnActivity _$SnActivityFromJson(Map<String, dynamic> json) => _SnActivity(
   id: json['id'] as String,
   type: json['type'] as String,

lib/models/auth.dart

@@ -11,6 +11,20 @@ sealed class AppToken with _$AppToken {
       _$AppTokenFromJson(json);
 }
 
+@freezed
+sealed class GeoIpLocation with _$GeoIpLocation {
+  const factory GeoIpLocation({
+    required double latitude,
+    required double longitude,
+    required String countryCode,
+    required String country,
+    required String city,
+  }) = _GeoIpLocation;
+
+  factory GeoIpLocation.fromJson(Map<String, dynamic> json) =>
+      _$GeoIpLocationFromJson(json);
+}
+
 @freezed
 sealed class SnAuthChallenge with _$SnAuthChallenge {
   const factory SnAuthChallenge({
@@ -26,7 +40,7 @@ sealed class SnAuthChallenge with _$SnAuthChallenge {
     required String ipAddress,
     required String userAgent,
     required String? nonce,
-    required String? location,
+    required GeoIpLocation? location,
     required String accountId,
     required DateTime createdAt,
     required DateTime updatedAt,

lib/models/auth.freezed.dart

@@ -269,10 +269,279 @@ as String,
 }
 
 
+/// @nodoc
+mixin _$GeoIpLocation {
+
+ 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)
+@pragma('vm:prefer-inline')
+$GeoIpLocationCopyWith<GeoIpLocation> get copyWith => _$GeoIpLocationCopyWithImpl<GeoIpLocation>(this as GeoIpLocation, _$identity);
+
+  /// Serializes this GeoIpLocation to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is GeoIpLocation&&(identical(other.latitude, latitude) || other.latitude == latitude)&&(identical(other.longitude, longitude) || other.longitude == longitude)&&(identical(other.countryCode, countryCode) || other.countryCode == countryCode)&&(identical(other.country, country) || other.country == country)&&(identical(other.city, city) || other.city == city));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,latitude,longitude,countryCode,country,city);
+
+@override
+String toString() {
+  return 'GeoIpLocation(latitude: $latitude, longitude: $longitude, countryCode: $countryCode, country: $country, city: $city)';
+}
+
+
+}
+
+/// @nodoc
+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
+});
+
+
+
+
+}
+/// @nodoc
+class _$GeoIpLocationCopyWithImpl<$Res>
+    implements $GeoIpLocationCopyWith<$Res> {
+  _$GeoIpLocationCopyWithImpl(this._self, this._then);
+
+  final GeoIpLocation _self;
+  final $Res Function(GeoIpLocation) _then;
+
+/// 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,}) {
+  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,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [GeoIpLocation].
+extension GeoIpLocationPatterns on GeoIpLocation {
+/// 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( _GeoIpLocation value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _GeoIpLocation() 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( _GeoIpLocation value)  $default,){
+final _that = this;
+switch (_that) {
+case _GeoIpLocation():
+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( _GeoIpLocation value)?  $default,){
+final _that = this;
+switch (_that) {
+case _GeoIpLocation() 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( 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 _:
+  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( 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);}
+}
+/// 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( 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 _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+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;
+
+/// Create a copy of GeoIpLocation
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$GeoIpLocationCopyWith<_GeoIpLocation> get copyWith => __$GeoIpLocationCopyWithImpl<_GeoIpLocation>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$GeoIpLocationToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _GeoIpLocation&&(identical(other.latitude, latitude) || other.latitude == latitude)&&(identical(other.longitude, longitude) || other.longitude == longitude)&&(identical(other.countryCode, countryCode) || other.countryCode == countryCode)&&(identical(other.country, country) || other.country == country)&&(identical(other.city, city) || other.city == city));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,latitude,longitude,countryCode,country,city);
+
+@override
+String toString() {
+  return 'GeoIpLocation(latitude: $latitude, longitude: $longitude, countryCode: $countryCode, country: $country, city: $city)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$GeoIpLocationCopyWith<$Res> implements $GeoIpLocationCopyWith<$Res> {
+  factory _$GeoIpLocationCopyWith(_GeoIpLocation value, $Res Function(_GeoIpLocation) _then) = __$GeoIpLocationCopyWithImpl;
+@override @useResult
+$Res call({
+ double latitude, double longitude, String countryCode, String country, String city
+});
+
+
+
+
+}
+/// @nodoc
+class __$GeoIpLocationCopyWithImpl<$Res>
+    implements _$GeoIpLocationCopyWith<$Res> {
+  __$GeoIpLocationCopyWithImpl(this._self, this._then);
+
+  final _GeoIpLocation _self;
+  final $Res Function(_GeoIpLocation) _then;
+
+/// 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,}) {
+  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,
+  ));
+}
+
+
+}
+
+
 /// @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; String? 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)
@@ -305,11 +574,11 @@ 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, String? 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
 });
 
 
-
+$GeoIpLocationCopyWith<$Res>? get location;
 
 }
 /// @nodoc
@@ -337,14 +606,26 @@ as List<dynamic>,ipAddress: null == ipAddress ? _self.ipAddress : ipAddress // i
 as String,userAgent: null == userAgent ? _self.userAgent : userAgent // ignore: cast_nullable_to_non_nullable
 as String,nonce: freezed == nonce ? _self.nonce : nonce // ignore: cast_nullable_to_non_nullable
 as String?,location: freezed == location ? _self.location : location // ignore: cast_nullable_to_non_nullable
-as String?,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as GeoIpLocation?,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
 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 SnAuthChallenge
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$GeoIpLocationCopyWith<$Res>? get location {
+    if (_self.location == null) {
+    return null;
+  }
 
+  return $GeoIpLocationCopyWith<$Res>(_self.location!, (value) {
+    return _then(_self.copyWith(location: value));
+  });
+}
 }
 
 
@@ -423,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,  String? 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 _:
@@ -444,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,  String? 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);}
@@ -461,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,  String? 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 _:
@@ -509,7 +790,7 @@ class _SnAuthChallenge implements SnAuthChallenge {
 @override final  String ipAddress;
 @override final  String userAgent;
 @override final  String? nonce;
-@override final  String? location;
+@override final  GeoIpLocation? location;
 @override final  String accountId;
 @override final  DateTime createdAt;
 @override final  DateTime updatedAt;
@@ -548,11 +829,11 @@ 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, String? 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
 });
 
 
-
+@override $GeoIpLocationCopyWith<$Res>? get location;
 
 }
 /// @nodoc
@@ -580,7 +861,7 @@ as List<dynamic>,ipAddress: null == ipAddress ? _self.ipAddress : ipAddress // i
 as String,userAgent: null == userAgent ? _self.userAgent : userAgent // ignore: cast_nullable_to_non_nullable
 as String,nonce: freezed == nonce ? _self.nonce : nonce // ignore: cast_nullable_to_non_nullable
 as String?,location: freezed == location ? _self.location : location // ignore: cast_nullable_to_non_nullable
-as String?,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as GeoIpLocation?,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
 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
@@ -588,7 +869,19 @@ as DateTime?,
   ));
 }
 
+/// Create a copy of SnAuthChallenge
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$GeoIpLocationCopyWith<$Res>? get location {
+    if (_self.location == null) {
+    return null;
+  }
 
+  return $GeoIpLocationCopyWith<$Res>(_self.location!, (value) {
+    return _then(_self.copyWith(location: value));
+  });
+}
 }
 
 

lib/models/auth.g.dart

@@ -13,6 +13,24 @@ Map<String, dynamic> _$AppTokenToJson(_AppToken instance) => <String, dynamic>{
   'token': instance.token,
 };
 
+_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,
+    );
+
+Map<String, dynamic> _$GeoIpLocationToJson(_GeoIpLocation instance) =>
+    <String, dynamic>{
+      'latitude': instance.latitude,
+      'longitude': instance.longitude,
+      'country_code': instance.countryCode,
+      'country': instance.country,
+      'city': instance.city,
+    };
+
 _SnAuthChallenge _$SnAuthChallengeFromJson(Map<String, dynamic> json) =>
     _SnAuthChallenge(
       id: json['id'] as String,
@@ -30,7 +48,12 @@ _SnAuthChallenge _$SnAuthChallengeFromJson(Map<String, dynamic> json) =>
       ipAddress: json['ip_address'] as String,
       userAgent: json['user_agent'] as String,
       nonce: json['nonce'] as String?,
-      location: json['location'] as String?,
+      location:
+          json['location'] == null
+              ? null
+              : GeoIpLocation.fromJson(
+                json['location'] as Map<String, dynamic>,
+              ),
       accountId: json['account_id'] as String,
       createdAt: DateTime.parse(json['created_at'] as String),
       updatedAt: DateTime.parse(json['updated_at'] as String),
@@ -54,7 +77,7 @@ Map<String, dynamic> _$SnAuthChallengeToJson(_SnAuthChallenge instance) =>
       'ip_address': instance.ipAddress,
       'user_agent': instance.userAgent,
       'nonce': instance.nonce,
-      'location': instance.location,
+      'location': instance.location?.toJson(),
       'account_id': instance.accountId,
       'created_at': instance.createdAt.toIso8601String(),
       'updated_at': instance.updatedAt.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_rpc.dart

@@ -0,0 +1,651 @@
+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';
+import 'package:path/path.dart' as path;
+
+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;
+}
+
+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;
+  ServerSocket? _ipcServer;
+  final List<WebSocketChannel> _wsSockets = [];
+  final List<_IpcSocketWrapper> _ipcSockets = [];
+
+  ActivityRpcServer(this.handlers);
+
+  void updateHandlers(Map<String, Function> newHandlers) {
+    handlers = newHandlers;
+  }
+
+  // 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<String> _getMacOsSystemTmpDir() async {
+    final result = await Process.run('getconf', ['DARWIN_USER_TEMP_DIR']);
+    return (result.stdout as String).trim();
+  }
+
+  // Find available IPC socket path
+  Future<String> _findAvailableIpcPath() 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'], // User runtime directory
+      Platform.environment['TMPDIR'], // App container temp (fallback)
+      Platform.environment['TMP'],
+      Platform.environment['TEMP'],
+      '/tmp', // System temp directory - most compatible
+    ];
+
+    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, '$kIpcBasePath-$i');
+        try {
+          final socket = await ServerSocket.bind(
+            InternetAddress(socketPath, type: InternetAddressType.unix),
+            0,
+          );
+          socket.close();
+          // Clean up the test socket
+          try {
+            await File(socketPath).delete();
+          } catch (_) {}
+          developer.log(
+            'IPC socket will be created at: $socketPath',
+            name: kRpcIpcLogPrefix,
+          );
+          return socketPath;
+        } catch (e) {
+          // Path not available, try next
+          if (i == 0) {
+            // Log only for the first attempt per directory
+            developer.log(
+              'IPC path $socketPath not available: $e',
+              name: kRpcIpcLogPrefix,
+            );
+          }
+          continue;
+        }
+      }
+    }
+    throw Exception(
+      'No available IPC socket paths found in any temp directory',
+    );
+  }
+
+  // Start the WebSocket 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 {
+        // Start HTTP server
+        _httpServer = await HttpServer.bind(InternetAddress.loopbackIPv4, port);
+        developer.log('listening on $port', name: kRpcLogPrefix);
+
+        // Handle WebSocket upgrades
+        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) {
+          // EADDRINUSE
+          developer.log('$port in use!', name: kRpcLogPrefix);
+        } else {
+          developer.log('http error: $e', name: kRpcLogPrefix);
+        }
+        port++;
+      }
+    }
+
+    if (!wsSuccess) {
+      throw Exception(
+        'Failed to bind to any port in range ${portRange[0]}–${portRange[1]}',
+      );
+    }
+
+    // Start IPC server (skip on macOS due to sandboxing)
+    final shouldStartIpc = !Platform.isMacOS;
+    if (shouldStartIpc) {
+      try {
+        final ipcPath = await _findAvailableIpcPath();
+        _ipcServer = await ServerSocket.bind(
+          InternetAddress(ipcPath, type: InternetAddressType.unix),
+          0,
+        );
+        developer.log('IPC listening at $ipcPath', name: kRpcIpcLogPrefix);
+
+        _ipcServer!.listen((Socket socket) {
+          _onIpcConnection(socket);
+        });
+      } catch (e) {
+        developer.log('IPC server error: $e', name: kRpcIpcLogPrefix);
+        // Continue without IPC if it fails
+      }
+    } else {
+      developer.log(
+        'IPC server disabled on macOS in production mode due to sandboxing',
+        name: kRpcIpcLogPrefix,
+      );
+    }
+  }
+
+  // Stop the server
+  Future<void> stop() async {
+    // Stop WebSocket server
+    for (var socket in _wsSockets) {
+      await socket.sink.close();
+    }
+    _wsSockets.clear();
+    await _httpServer?.close();
+
+    // Stop IPC server
+    for (var socket in _ipcSockets) {
+      socket.close();
+    }
+    _ipcSockets.clear();
+    await _ipcServer?.close();
+
+    developer.log('servers stopped', name: kRpcLogPrefix);
+  }
+
+  // Handle new WebSocket connection
+  void _onWsConnection(WebSocketChannel socket, Request request) {
+    // Parse query parameters
+    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,
+    );
+
+    // Validate origin
+    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;
+    }
+
+    // Validate encoding
+    if (encoding != 'json') {
+      developer.log(
+        'unsupported encoding requested: $encoding',
+        name: kRpcLogPrefix,
+      );
+      socket.sink.close();
+      return;
+    }
+
+    // Validate version
+    if (ver != 1) {
+      developer.log('unsupported version requested: $ver', name: kRpcLogPrefix);
+      socket.sink.close();
+      return;
+    }
+
+    // Store client info on socket
+    final socketWithMeta = _WsSocketWrapper(socket, clientId, encoding);
+
+    // Set up event listeners
+    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);
+      },
+    );
+
+    // Notify handler of new connection
+    handlers['connection']?.call(socketWithMeta);
+  }
+
+  // Handle new IPC connection
+  void _onIpcConnection(Socket socket) {
+    developer.log('new IPC connection!', name: kRpcIpcLogPrefix);
+
+    final socketWrapper = _IpcSocketWrapper(socket);
+    _ipcSockets.add(socketWrapper);
+
+    // Set up event listeners
+    socket.listen(
+      (data) => _onIpcData(socketWrapper, data),
+      onError: (e) {
+        developer.log('IPC socket error: $e', name: kRpcIpcLogPrefix);
+        socket.close();
+      },
+      onDone: () {
+        developer.log('IPC socket closed', name: kRpcIpcLogPrefix);
+        handlers['close']?.call(socketWrapper);
+        _ipcSockets.remove(socketWrapper);
+      },
+    );
+  }
+
+  // Handle incoming WebSocket message
+  void _onWsMessage(_WsSocketWrapper socket, dynamic data) {
+    try {
+      final jsonData = jsonDecode(data as String);
+      developer.log('WS message: $jsonData', name: kRpcLogPrefix);
+      handlers['message']?.call(socket, jsonData);
+    } catch (e) {
+      developer.log('WS message parse error: $e', name: kRpcLogPrefix);
+    }
+  }
+
+  // Handle incoming IPC data
+  void _onIpcData(_IpcSocketWrapper socket, List<int> data) {
+    try {
+      socket.addData(data);
+      final packets = socket.readPackets();
+      for (final packet in packets) {
+        _handleIpcPacket(socket, packet);
+      }
+    } catch (e) {
+      developer.log('IPC data error: $e', name: kRpcIpcLogPrefix);
+      socket.closeWithCode(IpcCloseCodes.closeUnsupported, e.toString());
+    }
+  }
+
+  // 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);
+        // Handle pong if needed
+        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() ?? '';
+
+    // Validate version
+    if (ver != 1) {
+      developer.log(
+        'IPC unsupported version requested: $ver',
+        name: kRpcIpcLogPrefix,
+      );
+      socket.closeWithCode(IpcErrorCodes.invalidVersion);
+      return;
+    }
+
+    // Validate client ID
+    if (clientId.isEmpty) {
+      developer.log('IPC client ID required', name: kRpcIpcLogPrefix);
+      socket.closeWithCode(IpcErrorCodes.invalidClientId);
+      return;
+    }
+
+    socket.clientId = clientId;
+
+    // Notify handler of new connection
+    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));
+  }
+}
+
+// IPC wrapper
+class _IpcSocketWrapper {
+  final Socket socket;
+  String clientId = '';
+  bool handshook = false;
+  final List<int> _buffer = [];
+
+  _IpcSocketWrapper(this.socket);
+
+  void addData(List<int> data) {
+    _buffer.addAll(data);
+  }
+
+  void send(Map<String, dynamic> msg) {
+    developer.log('IPC sending: $msg', name: kRpcIpcLogPrefix);
+    final packet = ActivityRpcServer.encodeIpcPacket(IpcTypes.frame, msg);
+    socket.add(packet);
+  }
+
+  void sendPong(dynamic data) {
+    final packet = ActivityRpcServer.encodeIpcPacket(IpcTypes.pong, data ?? {});
+    socket.add(packet);
+  }
+
+  void close() {
+    socket.close();
+  }
+
+  void closeWithCode(int code, [String message = '']) {
+    final closeData = {'code': code, 'message': message};
+    final packet = ActivityRpcServer.encodeIpcPacket(IpcTypes.close, closeData);
+    socket.add(packet);
+    socket.close();
+  }
+
+  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;
+  }
+}
+
+// IPC Packet structure
+class _IpcPacket {
+  final int type;
+  final Map<String, dynamic> data;
+
+  _IpcPacket(this.type, this.data);
+}
+
+// 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 {
+    // Only start server on desktop platforms
+    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)');
+          // Send READY event
+          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', // Should be dynamic
+          });
+        },
+        'message': (socket, dynamic data) async {
+          if (data['cmd'] == 'SET_ACTIVITY') {
+            notifier.addActivity(
+              'Activity: ${data['args']['activity']['details'] ?? 'Unknown'}',
+            );
+            // Call setRemoteActivityStatus
+            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,
+              );
+            }
+            // Echo back success
+            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/call.dart

@@ -9,6 +9,7 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/models/chat.dart';
+import 'package:wakelock_plus/wakelock_plus.dart';
 
 part 'call.g.dart';
 part 'call.freezed.dart';
@@ -54,7 +55,7 @@ sealed class CallParticipantLive with _$CallParticipantLive {
   bool get hasAudio => remoteParticipant.hasAudio;
 }
 
-@riverpod
+@Riverpod(keepAlive: true)
 class CallNotifier extends _$CallNotifier {
   Room? _room;
   LocalParticipant? _localParticipant;
@@ -277,14 +278,27 @@ class CallNotifier extends _$CallNotifier {
 
         // Listen for connection updates
         _room!.addListener(() {
+          final wasConnected = state.isConnected;
+          final isNowConnected =
+              _room!.connectionState == ConnectionState.connected;
           state = state.copyWith(
-            isConnected: _room!.connectionState == ConnectionState.connected,
+            isConnected: isNowConnected,
             isMicrophoneEnabled: _localParticipant!.isMicrophoneEnabled(),
             isCameraEnabled: _localParticipant!.isCameraEnabled(),
             isScreenSharing: _localParticipant!.isScreenShareEnabled(),
           );
+          // Enable wakelock when call connects
+          if (!wasConnected && isNowConnected) {
+            WakelockPlus.enable();
+          }
+          // Disable wakelock when call disconnects
+          else if (wasConnected && !isNowConnected) {
+            WakelockPlus.disable();
+          }
         });
         state = state.copyWith(isConnected: true);
+        // Enable wakelock when call connects
+        WakelockPlus.enable();
       } else {
         state = state.copyWith(error: 'Failed to join room');
       }
@@ -344,6 +358,8 @@ class CallNotifier extends _$CallNotifier {
         isCameraEnabled: false,
         isScreenSharing: false,
       );
+      // Disable wakelock when call disconnects
+      WakelockPlus.disable();
     }
   }
 
@@ -381,5 +397,7 @@ class CallNotifier extends _$CallNotifier {
     _durationTimer?.cancel();
     _roomId = null;
     participantsVolumes = {};
+    // Disable wakelock when disposing
+    WakelockPlus.disable();
   }
 }

lib/pods/call.g.dart

@@ -6,22 +6,19 @@ part of 'call.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$callNotifierHash() => r'18fb807f067eecd3ea42631c1426c3e5f1fb4280';
+String _$callNotifierHash() => r'eb9bd41b97e9b5e9d54007c8327edb6567458846';
 
 /// See also [CallNotifier].
 @ProviderFor(CallNotifier)
-final callNotifierProvider =
-    AutoDisposeNotifierProvider<CallNotifier, CallState>.internal(
-      CallNotifier.new,
-      name: r'callNotifierProvider',
-      debugGetCreateSourceHash:
-          const bool.fromEnvironment('dart.vm.product')
-              ? null
-              : _$callNotifierHash,
-      dependencies: null,
-      allTransitiveDependencies: null,
-    );
+final callNotifierProvider = NotifierProvider<CallNotifier, CallState>.internal(
+  CallNotifier.new,
+  name: r'callNotifierProvider',
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product') ? null : _$callNotifierHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
 
-typedef _$CallNotifier = AutoDisposeNotifier<CallState>;
+typedef _$CallNotifier = Notifier<CallState>;
 // 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/pods/config.dart

@@ -20,6 +20,7 @@ const kAppColorSchemeStoreKey = 'app_color_scheme';
 const kAppNotifyWithHaptic = 'app_notify_with_haptic';
 const kAppCustomFonts = 'app_custom_fonts';
 const kAppAutoTranslate = 'app_auto_translate';
+const kAppDataSavingMode = 'app_data_saving_mode';
 const kAppSoundEffects = 'app_sound_effects';
 const kAppAprilFoolFeatures = 'app_april_fool_features';
 const kAppWindowSize = 'app_window_size';
@@ -55,6 +56,7 @@ final serverUrlProvider = Provider<String>((ref) {
 sealed class AppSettings with _$AppSettings {
   const factory AppSettings({
     required bool autoTranslate,
+    required bool dataSavingMode,
     required bool soundEffects,
     required bool aprilFoolFeatures,
     required bool enterToSend,
@@ -73,6 +75,7 @@ class AppSettingsNotifier extends _$AppSettingsNotifier {
     final prefs = ref.watch(sharedPreferencesProvider);
     return AppSettings(
       autoTranslate: prefs.getBool(kAppAutoTranslate) ?? false,
+      dataSavingMode: prefs.getBool(kAppDataSavingMode) ?? false,
       soundEffects: prefs.getBool(kAppSoundEffects) ?? true,
       aprilFoolFeatures: prefs.getBool(kAppAprilFoolFeatures) ?? true,
       enterToSend: prefs.getBool(kAppEnterToSend) ?? true,
@@ -107,6 +110,12 @@ class AppSettingsNotifier extends _$AppSettingsNotifier {
     state = state.copyWith(autoTranslate: value);
   }
 
+  void setDataSavingMode(bool value){
+    final prefs = ref.read(sharedPreferencesProvider);
+    prefs.setBool(kAppDataSavingMode, value);
+    state = state.copyWith(dataSavingMode: value);
+  }
+
   void setSoundEffects(bool value) {
     final prefs = ref.read(sharedPreferencesProvider);
     prefs.setBool(kAppSoundEffects, value);

lib/pods/config.freezed.dart

@@ -14,7 +14,7 @@ T _$identity<T>(T value) => value;
 /// @nodoc
 mixin _$AppSettings {
 
- bool get autoTranslate; 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
+ 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;
 /// Create a copy of AppSettings
 /// with the given fields replaced by the non-null parameter values.
@@ -26,16 +26,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.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));
 }
 
 
 @override
-int get hashCode => Object.hash(runtimeType,autoTranslate,soundEffects,aprilFoolFeatures,enterToSend,appBarTransparent,showBackgroundImage,customFonts,appColorScheme,windowSize);
+int get hashCode => Object.hash(runtimeType,autoTranslate,dataSavingMode,soundEffects,aprilFoolFeatures,enterToSend,appBarTransparent,showBackgroundImage,customFonts,appColorScheme,windowSize);
 
 @override
 String toString() {
-  return 'AppSettings(autoTranslate: $autoTranslate, 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)';
 }
 
 
@@ -46,7 +46,7 @@ abstract mixin class $AppSettingsCopyWith<$Res>  {
   factory $AppSettingsCopyWith(AppSettings value, $Res Function(AppSettings) _then) = _$AppSettingsCopyWithImpl;
 @useResult
 $Res call({
- bool autoTranslate, 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
 });
 
 
@@ -63,9 +63,10 @@ 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? 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,}) {
   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
 as bool,soundEffects: null == soundEffects ? _self.soundEffects : soundEffects // ignore: cast_nullable_to_non_nullable
 as bool,aprilFoolFeatures: null == aprilFoolFeatures ? _self.aprilFoolFeatures : aprilFoolFeatures // ignore: cast_nullable_to_non_nullable
 as bool,enterToSend: null == enterToSend ? _self.enterToSend : enterToSend // ignore: cast_nullable_to_non_nullable
@@ -156,10 +157,10 @@ return $default(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( bool autoTranslate,  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)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _AppSettings() when $default != null:
-return $default(_that.autoTranslate,_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);case _:
   return orElse();
 
 }
@@ -177,10 +178,10 @@ return $default(_that.autoTranslate,_that.soundEffects,_that.aprilFoolFeatures,_
 /// }
 /// ```
 
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( bool autoTranslate,  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)  $default,) {final _that = this;
 switch (_that) {
 case _AppSettings():
-return $default(_that.autoTranslate,_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);}
 }
 /// A variant of `when` that fallback to returning `null`
 ///
@@ -194,10 +195,10 @@ return $default(_that.autoTranslate,_that.soundEffects,_that.aprilFoolFeatures,_
 /// }
 /// ```
 
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( bool autoTranslate,  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)?  $default,) {final _that = this;
 switch (_that) {
 case _AppSettings() when $default != null:
-return $default(_that.autoTranslate,_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);case _:
   return null;
 
 }
@@ -209,10 +210,11 @@ return $default(_that.autoTranslate,_that.soundEffects,_that.aprilFoolFeatures,_
 
 
 class _AppSettings implements AppSettings {
-  const _AppSettings({required this.autoTranslate, 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});
   
 
 @override final  bool autoTranslate;
+@override final  bool dataSavingMode;
 @override final  bool soundEffects;
 @override final  bool aprilFoolFeatures;
 @override final  bool enterToSend;
@@ -233,16 +235,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.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));
 }
 
 
 @override
-int get hashCode => Object.hash(runtimeType,autoTranslate,soundEffects,aprilFoolFeatures,enterToSend,appBarTransparent,showBackgroundImage,customFonts,appColorScheme,windowSize);
+int get hashCode => Object.hash(runtimeType,autoTranslate,dataSavingMode,soundEffects,aprilFoolFeatures,enterToSend,appBarTransparent,showBackgroundImage,customFonts,appColorScheme,windowSize);
 
 @override
 String toString() {
-  return 'AppSettings(autoTranslate: $autoTranslate, 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)';
 }
 
 
@@ -253,7 +255,7 @@ abstract mixin class _$AppSettingsCopyWith<$Res> implements $AppSettingsCopyWith
   factory _$AppSettingsCopyWith(_AppSettings value, $Res Function(_AppSettings) _then) = __$AppSettingsCopyWithImpl;
 @override @useResult
 $Res call({
- bool autoTranslate, 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
 });
 
 
@@ -270,9 +272,10 @@ 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? 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,}) {
   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
 as bool,soundEffects: null == soundEffects ? _self.soundEffects : soundEffects // ignore: cast_nullable_to_non_nullable
 as bool,aprilFoolFeatures: null == aprilFoolFeatures ? _self.aprilFoolFeatures : aprilFoolFeatures // ignore: cast_nullable_to_non_nullable
 as bool,enterToSend: null == enterToSend ? _self.enterToSend : enterToSend // ignore: cast_nullable_to_non_nullable

lib/pods/config.g.dart

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

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

@@ -21,6 +21,7 @@ import 'package:material_symbols_icons/symbols.dart';
 import 'package:styled_widget/styled_widget.dart';
 
 const kServerSupportedLanguages = {'en-US': 'en-us', 'zh-CN': 'zh-hans'};
+const kServerSupportedRegions = ['US', 'JP', 'CN'];
 
 class UpdateProfileScreen extends HookConsumerWidget {
   const UpdateProfileScreen({super.key});
@@ -97,6 +98,7 @@ class UpdateProfileScreen extends HookConsumerWidget {
     final usernameController = useTextEditingController(text: user.value!.name);
     final nicknameController = useTextEditingController(text: user.value!.nick);
     final language = useState(user.value!.language);
+    final region = useState(user.value!.region);
     final links = useState<List<ProfileLink>>(user.value!.profile.links);
 
     void updateBasicInfo() async {
@@ -111,6 +113,7 @@ class UpdateProfileScreen extends HookConsumerWidget {
             'name': usernameController.text,
             'nick': nicknameController.text,
             'language': language.value,
+            'region': region.value,
           },
         );
         final userNotifier = ref.read(userInfoProvider.notifier);
@@ -291,6 +294,32 @@ class UpdateProfileScreen extends HookConsumerWidget {
                       ],
                     ),
                   ),
+                  DropdownButtonFormField2<String>(
+                    decoration: InputDecoration(
+                      labelText: 'region'.tr(),
+                      helperText: 'accountRegionHint'.tr(),
+                    ),
+                    items: [
+                      ...kServerSupportedRegions.map(
+                        (e) => DropdownMenuItem(value: e, child: Text(e)),
+                      ),
+                      if (!kServerSupportedRegions.contains(region.value))
+                        DropdownMenuItem(
+                          value: region.value,
+                          child: Text(region.value),
+                        ),
+                    ],
+                    value: region.value,
+                    onChanged: (value) {
+                      region.value = value ?? region.value;
+                    },
+                    customButton: Row(
+                      children: [
+                        Expanded(child: Text(region.value)),
+                        Icon(Symbols.arrow_drop_down),
+                      ],
+                    ),
+                  ),
                   Align(
                     alignment: Alignment.centerRight,
                     child: TextButton.icon(

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.g.dart

@@ -762,5 +762,127 @@ class _AccountBotDeveloperProviderElement
   String get uname => (origin as AccountBotDeveloperProvider).uname;
 }
 
+String _$accountPublishersHash() => r'25f5695b4a5154163d77f1769876d826bf736609';
+
+/// See also [accountPublishers].
+@ProviderFor(accountPublishers)
+const accountPublishersProvider = AccountPublishersFamily();
+
+/// See also [accountPublishers].
+class AccountPublishersFamily extends Family<AsyncValue<List<SnPublisher>>> {
+  /// See also [accountPublishers].
+  const AccountPublishersFamily();
+
+  /// See also [accountPublishers].
+  AccountPublishersProvider call(String id) {
+    return AccountPublishersProvider(id);
+  }
+
+  @override
+  AccountPublishersProvider getProviderOverride(
+    covariant AccountPublishersProvider provider,
+  ) {
+    return call(provider.id);
+  }
+
+  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'accountPublishersProvider';
+}
+
+/// See also [accountPublishers].
+class AccountPublishersProvider
+    extends AutoDisposeFutureProvider<List<SnPublisher>> {
+  /// See also [accountPublishers].
+  AccountPublishersProvider(String id)
+    : this._internal(
+        (ref) => accountPublishers(ref as AccountPublishersRef, id),
+        from: accountPublishersProvider,
+        name: r'accountPublishersProvider',
+        debugGetCreateSourceHash:
+            const bool.fromEnvironment('dart.vm.product')
+                ? null
+                : _$accountPublishersHash,
+        dependencies: AccountPublishersFamily._dependencies,
+        allTransitiveDependencies:
+            AccountPublishersFamily._allTransitiveDependencies,
+        id: id,
+      );
+
+  AccountPublishersProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.id,
+  }) : super.internal();
+
+  final String id;
+
+  @override
+  Override overrideWith(
+    FutureOr<List<SnPublisher>> Function(AccountPublishersRef provider) create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: AccountPublishersProvider._internal(
+        (ref) => create(ref as AccountPublishersRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        id: id,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeFutureProviderElement<List<SnPublisher>> createElement() {
+    return _AccountPublishersProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is AccountPublishersProvider && other.id == id;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, id.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin AccountPublishersRef on AutoDisposeFutureProviderRef<List<SnPublisher>> {
+  /// The parameter `id` of this provider.
+  String get id;
+}
+
+class _AccountPublishersProviderElement
+    extends AutoDisposeFutureProviderElement<List<SnPublisher>>
+    with AccountPublishersRef {
+  _AccountPublishersProviderElement(super.provider);
+
+  @override
+  String get id => (origin as AccountPublishersProvider).id;
+}
+
 // 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/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/explore.g.dart

@@ -7,7 +7,7 @@ part of 'explore.dart';
 // **************************************************************************
 
 String _$activityListNotifierHash() =>
-    r'a4968856ac34b59d47cfd4a7cbb39289aef2a1b1';
+    r'167021cada54da7c8d8437eef1ffb387a92ea2e3';
 
 /// Copied from Dart SDK
 class _SystemHash {

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

@@ -128,14 +128,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 +174,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 +266,7 @@ class ArticleComposeScreen extends HookConsumerWidget {
                 child: KeyboardListener(
                   focusNode: FocusNode(),
                   onKeyEvent:
-                      (event) => _handleKeyPress(
+                      (event) => ComposeLogic.handleKeyPress(
                         event,
                         state,
                         ref,
@@ -511,38 +509,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

@@ -1,15 +1,27 @@
 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:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/post.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/pods/userinfo.dart';
+import 'package:island/screens/posts/compose.dart';
+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';
 import 'package:island/widgets/response.dart';
+import 'package:island/utils/share_utils.dart';
+import 'package:island/widgets/safety/abuse_report_helper.dart';
+import 'package:island/widgets/share/share_sheet.dart';
+import 'package:material_symbols_icons/symbols.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:styled_widget/styled_widget.dart';
 
@@ -46,6 +58,355 @@ class PostState extends StateNotifier<AsyncValue<SnPost?>> {
   }
 }
 
+class PostActionButtons extends HookConsumerWidget {
+  final SnPost post;
+  final EdgeInsets renderingPadding;
+  final VoidCallback? onRefresh;
+  final Function(SnPost)? onUpdate;
+
+  const PostActionButtons({
+    super.key,
+    required this.post,
+    this.renderingPadding = EdgeInsets.zero,
+    this.onRefresh,
+    this.onUpdate,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final user = ref.watch(userInfoProvider);
+    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;
+    const kButtonRadius = 20.0;
+
+    // 1. Author-only actions first
+    if (isAuthor) {
+      // Combined edit/delete actions using custom segmented-style buttons
+      final editButtons = <Widget>[
+        FilledButton.tonal(
+          onPressed: () {
+            context.pushNamed('postEdit', pathParameters: {'id': post.id}).then(
+              (value) {
+                if (value != null) {
+                  onRefresh?.call();
+                }
+              },
+            );
+          },
+          style: FilledButton.styleFrom(
+            shape: const RoundedRectangleBorder(
+              borderRadius: BorderRadius.only(
+                topLeft: Radius.circular(kButtonRadius),
+                bottomLeft: Radius.circular(kButtonRadius),
+              ),
+            ),
+          ),
+          child: Row(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              const Icon(Symbols.edit, size: 18),
+              const Gap(4),
+              Text('edit'.tr()),
+            ],
+          ),
+        ),
+        Tooltip(
+          message: 'delete'.tr(),
+          child: FilledButton.tonal(
+            onPressed: () {
+              showConfirmAlert('deletePostHint'.tr(), 'deletePost'.tr()).then((
+                confirm,
+              ) {
+                if (confirm) {
+                  final client = ref.watch(apiClientProvider);
+                  client
+                      .delete('/sphere/posts/${post.id}')
+                      .catchError((err) {
+                        showErrorAlert(err);
+                        return err;
+                      })
+                      .then((_) {
+                        onRefresh?.call();
+                      });
+                }
+              });
+            },
+            style: FilledButton.styleFrom(
+              shape: const RoundedRectangleBorder(
+                borderRadius: BorderRadius.only(
+                  topRight: Radius.circular(kButtonRadius),
+                  bottomRight: Radius.circular(kButtonRadius),
+                ),
+              ),
+            ),
+            child: const Icon(Symbols.delete, size: 18),
+          ),
+        ),
+      ];
+
+      actions.add(
+        Row(
+          mainAxisSize: MainAxisSize.min,
+          children:
+              editButtons
+                  .map((e) => SizedBox(height: kButtonHeight, child: e))
+                  .expand((widget) => [widget, const VerticalDivider(width: 1)])
+                  .toList()
+                ..removeLast(),
+        ),
+      );
+
+      // Pin/Unpin actions (also author-only)
+      if (post.pinMode == null) {
+        actions.add(
+          FilledButton.tonalIcon(
+            onPressed: () {
+              showModalBottomSheet(
+                context: context,
+                isScrollControlled: true,
+                builder: (context) => PostPinSheet(post: post),
+              ).then((value) {
+                if (value is int) {
+                  onUpdate?.call(post.copyWith(pinMode: value));
+                }
+              });
+            },
+            icon: const Icon(Symbols.keep),
+            label: Text('pinPost'.tr()),
+          ),
+        );
+      } else {
+        actions.add(
+          FilledButton.tonalIcon(
+            onPressed: () {
+              showConfirmAlert('unpinPostHint'.tr(), 'unpinPost'.tr()).then((
+                confirm,
+              ) async {
+                if (confirm) {
+                  final client = ref.watch(apiClientProvider);
+                  try {
+                    if (context.mounted) showLoadingModal(context);
+                    await client.delete('/sphere/posts/${post.id}/pin');
+                    onUpdate?.call(post.copyWith(pinMode: null));
+                  } catch (err) {
+                    showErrorAlert(err);
+                  } finally {
+                    if (context.mounted) hideLoadingModal(context);
+                  }
+                }
+              });
+            },
+            icon: const Icon(Symbols.keep_off),
+            label: Text('unpinPost'.tr()),
+          ),
+        );
+      }
+    }
+
+    // 2. Replies and forwards
+    final replyButtons = <Widget>[
+      FilledButton.tonal(
+        onPressed: () {
+          context.pushNamed(
+            'postCompose',
+            extra: PostComposeInitialState(replyingTo: post),
+          );
+        },
+        style: FilledButton.styleFrom(
+          shape: const RoundedRectangleBorder(
+            borderRadius: BorderRadius.only(
+              topLeft: Radius.circular(kButtonRadius),
+              bottomLeft: Radius.circular(kButtonRadius),
+            ),
+          ),
+        ),
+        child: Row(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            const Icon(Symbols.reply, size: 18),
+            const Gap(4),
+            Text('reply'.tr()),
+          ],
+        ),
+      ),
+      Tooltip(
+        message: 'forward'.tr(),
+        child: FilledButton.tonal(
+          onPressed: () {
+            context.pushNamed(
+              'postCompose',
+              extra: PostComposeInitialState(forwardingTo: post),
+            );
+          },
+          style: FilledButton.styleFrom(
+            shape: const RoundedRectangleBorder(
+              borderRadius: BorderRadius.only(
+                topRight: Radius.circular(kButtonRadius),
+                bottomRight: Radius.circular(kButtonRadius),
+              ),
+            ),
+          ),
+          child: const Icon(Symbols.forward, size: 18),
+        ),
+      ),
+    ];
+
+    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,
+        children:
+            replyButtons
+                .map((e) => SizedBox(height: kButtonHeight, child: e))
+                .toList(),
+      ),
+    );
+
+    // 3. Share, copy link, and report
+    final shareButtons = <Widget>[
+      FilledButton.tonal(
+        onPressed: () {
+          showShareSheetLink(
+            context: context,
+            link: 'https://solian.app/posts/${post.id}',
+            title: 'sharePost'.tr(),
+            toSystem: true,
+          );
+        },
+        style: FilledButton.styleFrom(
+          shape: const RoundedRectangleBorder(
+            borderRadius: BorderRadius.only(
+              topLeft: Radius.circular(kButtonRadius),
+              bottomLeft: Radius.circular(kButtonRadius),
+            ),
+          ),
+        ),
+        child: Row(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            const Icon(Symbols.share, size: 18),
+            const Gap(4),
+            Text('share'.tr()),
+          ],
+        ),
+      ),
+    ];
+
+    if (!kIsWeb) {
+      shareButtons.add(
+        Tooltip(
+          message: 'sharePostPhoto'.tr(),
+          child: FilledButton.tonal(
+            onPressed: () => sharePostAsScreenshot(context, ref, post),
+            style: FilledButton.styleFrom(
+              shape: const RoundedRectangleBorder(
+                borderRadius: BorderRadius.only(
+                  topRight: Radius.circular(kButtonRadius),
+                  bottomRight: Radius.circular(kButtonRadius),
+                ),
+              ),
+            ),
+            child: const Icon(Symbols.share_reviews, size: 18),
+          ),
+        ),
+      );
+    }
+
+    actions.add(
+      Row(
+        mainAxisSize: MainAxisSize.min,
+        children:
+            shareButtons
+                .map((e) => SizedBox(height: kButtonHeight, child: e))
+                .expand((widget) => [widget, const VerticalDivider(width: 1)])
+                .toList()
+              ..removeLast(),
+      ),
+    );
+
+    actions.add(
+      FilledButton.tonalIcon(
+        onPressed: () {
+          Clipboard.setData(
+            ClipboardData(text: 'https://solian.app/posts/${post.id}'),
+          );
+        },
+        icon: const Icon(Symbols.link),
+        label: Text('copyLink'.tr()),
+      ),
+    );
+
+    actions.add(
+      FilledButton.tonalIcon(
+        onPressed: () {
+          showAbuseReportSheet(context, resourceIdentifier: 'post/${post.id}');
+        },
+        icon: const Icon(Symbols.flag),
+        label: Text('abuseReport'.tr()),
+      ),
+    );
+
+    // Add gaps between actions (excluding first one) using FP style
+    final children =
+        actions.asMap().entries.expand((entry) {
+          final index = entry.key;
+          final action = entry.value;
+          if (index == 0) {
+            return [action];
+          } else {
+            return [const Gap(8), action];
+          }
+        }).toList();
+
+    return Container(
+      height: kButtonHeight,
+      margin: const EdgeInsets.only(bottom: 12),
+      child: ListView(
+        scrollDirection: Axis.horizontal,
+        padding: EdgeInsets.symmetric(horizontal: renderingPadding.horizontal),
+        children: children,
+      ),
+    );
+  }
+}
+
 class PostDetailScreen extends HookConsumerWidget {
   final String id;
   const PostDetailScreen({super.key, required this.id});
@@ -66,29 +427,58 @@ class PostDetailScreen extends HookConsumerWidget {
           return Stack(
             fit: StackFit.expand,
             children: [
-              CustomScrollView(
-                slivers: [
-                  SliverToBoxAdapter(
-                    child: Center(
-                      child: ConstrainedBox(
-                        constraints: BoxConstraints(maxWidth: 600),
-                        child: PostItem(
-                          item: post!,
-                          isFullPost: true,
-                          isEmbedReply: false,
-                          onUpdate: (newItem) {
-                            // Update the local state with the new post data
-                            ref
-                                .read(postStateProvider(id).notifier)
-                                .updatePost(newItem);
-                          },
+              ExtendedRefreshIndicator(
+                onRefresh: () async {
+                  ref.invalidate(postProvider(id));
+                  ref.invalidate(postRepliesNotifierProvider(id));
+                },
+                child: CustomScrollView(
+                  physics: const AlwaysScrollableScrollPhysics(),
+                  slivers: [
+                    SliverToBoxAdapter(
+                      child: Center(
+                        child: ConstrainedBox(
+                          constraints: BoxConstraints(maxWidth: 600),
+                          child: PostItem(
+                            item: post!,
+                            isFullPost: true,
+                            isEmbedReply: false,
+                            onUpdate: (newItem) {
+                              // Update the local state with the new post data
+                              ref
+                                  .read(postStateProvider(id).notifier)
+                                  .updatePost(newItem);
+                            },
+                          ),
                         ),
                       ),
                     ),
-                  ),
-                  PostRepliesList(postId: id, maxWidth: 600),
-                  SliverGap(MediaQuery.of(context).padding.bottom + 80),
-                ],
+                    SliverToBoxAdapter(
+                      child: Center(
+                        child: ConstrainedBox(
+                          constraints: BoxConstraints(maxWidth: 600),
+                          child: PostActionButtons(
+                            post: post,
+                            renderingPadding: const EdgeInsets.symmetric(
+                              horizontal: 8,
+                            ),
+                            onRefresh: () {
+                              ref.invalidate(postProvider(id));
+                              ref.invalidate(postRepliesNotifierProvider(id));
+                            },
+                            onUpdate: (newItem) {
+                              ref
+                                  .read(postStateProvider(id).notifier)
+                                  .updatePost(newItem);
+                            },
+                          ),
+                        ),
+                      ),
+                    ),
+                    PostRepliesList(postId: id, maxWidth: 600),
+                    SliverGap(MediaQuery.of(context).padding.bottom + 80),
+                  ],
+                ),
               ),
               if (user.value != null)
                 Positioned(
@@ -126,7 +516,7 @@ class PostDetailScreen extends HookConsumerWidget {
         error:
             (e, _) => ResponseErrorWidget(
               error: e,
-              onRetry: () => ref.invalidate(postStateProvider(id)),
+              onRetry: () => ref.invalidate(postProvider(id)),
             ),
       ),
     );

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

@@ -27,6 +27,224 @@ import 'package:styled_widget/styled_widget.dart';
 
 part 'pub_profile.g.dart';
 
+class _PublisherBasisWidget extends StatelessWidget {
+  final SnPublisher data;
+  final AsyncValue<SnSubscriptionStatus> subStatus;
+  final ValueNotifier<bool> subscribing;
+  final VoidCallback subscribe;
+  final VoidCallback unsubscribe;
+
+  const _PublisherBasisWidget({
+    required this.data,
+    required this.subStatus,
+    required this.subscribing,
+    required this.subscribe,
+    required this.unsubscribe,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      spacing: 20,
+      children: [
+        GestureDetector(
+          child: Badge(
+            isLabelVisible: data.type == 0,
+            padding: EdgeInsets.all(4),
+            label: Icon(
+              Symbols.launch,
+              size: 16,
+              color: Theme.of(context).colorScheme.onPrimary,
+            ),
+            backgroundColor: Theme.of(context).colorScheme.primary,
+            offset: Offset(0, 48),
+            child: ProfilePictureWidget(
+              file: data.picture,
+              radius: 32,
+              borderRadius: data.type == 0 ? null : 12,
+            ),
+          ),
+          onTap: () {
+            if (data.account?.name != null) {
+              Navigator.pop(context, true);
+              context.pushNamed(
+                'accountProfile',
+                pathParameters: {'name': data.account!.name},
+              );
+            }
+          },
+        ),
+        Expanded(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            children: [
+              Row(
+                spacing: 6,
+                children: [
+                  Text(data.nick).fontSize(20),
+                  if (data.verification != null)
+                    VerificationMark(mark: data.verification!),
+                  Expanded(
+                    child: Text(
+                      '@${data.name}',
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                    ).fontSize(14).opacity(0.85),
+                  ),
+                ],
+              ),
+              if (data.type == 0 && data.account != null)
+                Row(
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  spacing: 6,
+                  children: [
+                    Icon(
+                      data.type == 0 ? Symbols.person : Symbols.workspaces,
+                      fill: 1,
+                      size: 17,
+                    ),
+                    Text(
+                      'publisherBelongsTo'.tr(args: ['@${data.account!.name}']),
+                    ).fontSize(14),
+                  ],
+                ).opacity(0.85),
+              const Gap(4),
+              if (data.type == 0 && data.account != null)
+                AccountStatusWidget(
+                  uname: data.account!.name,
+                  padding: EdgeInsets.zero,
+                ),
+              subStatus
+                  .when(
+                    data:
+                        (status) => FilledButton.icon(
+                          onPressed:
+                              subscribing.value
+                                  ? null
+                                  : (status.isSubscribed
+                                      ? unsubscribe
+                                      : subscribe),
+                          icon: Icon(
+                            status.isSubscribed
+                                ? Symbols.remove_circle
+                                : Symbols.add_circle,
+                          ),
+                          label:
+                              Text(
+                                status.isSubscribed
+                                    ? 'unsubscribe'
+                                    : 'subscribe',
+                              ).tr(),
+                          style: ButtonStyle(
+                            visualDensity: VisualDensity(vertical: -2),
+                          ),
+                        ),
+                    error: (_, _) => const SizedBox(),
+                    loading:
+                        () => const SizedBox(
+                          height: 36,
+                          child: Center(
+                            child: SizedBox(
+                              width: 20,
+                              height: 20,
+                              child: CircularProgressIndicator(strokeWidth: 2),
+                            ),
+                          ),
+                        ),
+                  )
+                  .padding(top: 8),
+            ],
+          ),
+        ),
+      ],
+    ).padding(horizontal: 24, top: 24);
+  }
+}
+
+class _PublisherBadgesWidget extends StatelessWidget {
+  final SnPublisher data;
+  final AsyncValue<List<SnAccountBadge>> badges;
+
+  const _PublisherBadgesWidget({required this.data, required this.badges});
+
+  @override
+  Widget build(BuildContext context) {
+    return (badges.value?.isNotEmpty ?? false)
+        ? Card(
+          child: BadgeList(
+            badges: badges.value!,
+          ).padding(horizontal: 26, vertical: 20),
+        ).padding(horizontal: 4)
+        : const SizedBox.shrink();
+  }
+}
+
+class _PublisherVerificationWidget extends StatelessWidget {
+  final SnPublisher data;
+
+  const _PublisherVerificationWidget({required this.data});
+
+  @override
+  Widget build(BuildContext context) {
+    return (data.verification != null)
+        ? Card(
+          margin: EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+          child: VerificationStatusCard(mark: data.verification!),
+        )
+        : const SizedBox.shrink();
+  }
+}
+
+class _PublisherBioWidget extends StatelessWidget {
+  final SnPublisher data;
+
+  const _PublisherBioWidget({required this.data});
+
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      margin: EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          Text('bio').tr().bold().fontSize(15).padding(bottom: 8),
+          if (data.bio.isEmpty)
+            Text('descriptionNone').tr().italic()
+          else
+            MarkdownTextContent(
+              content: data.bio,
+              linesMargin: EdgeInsets.zero,
+            ),
+        ],
+      ).padding(horizontal: 20, vertical: 16),
+    );
+  }
+}
+
+class _PublisherCategoryTabWidget extends StatelessWidget {
+  final TabController categoryTabController;
+
+  const _PublisherCategoryTabWidget({required this.categoryTabController});
+
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      margin: EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+      child: TabBar(
+        controller: categoryTabController,
+        dividerColor: Colors.transparent,
+        splashBorderRadius: const BorderRadius.all(Radius.circular(8)),
+        tabs: [
+          Tab(text: 'all'.tr()),
+          Tab(text: 'postTypePost'.tr()),
+          Tab(text: 'postArticle'.tr()),
+        ],
+      ),
+    );
+  }
+}
+
 @riverpod
 Future<SnPublisher> publisher(Ref ref, String uname) async {
   final apiClient = ref.watch(apiClientProvider);
@@ -132,170 +350,6 @@ class PublisherProfileScreen extends HookConsumerWidget {
       offset: Offset(1.0, 1.0),
     );
 
-    Widget publisherBasisWidget(SnPublisher data) => Row(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      spacing: 20,
-      children: [
-        GestureDetector(
-          child: Badge(
-            isLabelVisible: data.type == 0,
-            padding: EdgeInsets.all(4),
-            label: Icon(
-              Symbols.launch,
-              size: 16,
-              color: Theme.of(context).colorScheme.onPrimary,
-            ),
-            backgroundColor: Theme.of(context).colorScheme.primary,
-            offset: Offset(0, 48),
-            child: ProfilePictureWidget(
-              file: data.picture,
-              radius: 32,
-              borderRadius: data.type == 0 ? null : 12,
-            ),
-          ),
-          onTap: () {
-            Navigator.pop(context, true);
-            if (data.account?.name != null) {
-              context.pushNamed(
-                'accountProfile',
-                pathParameters: {'name': data.account!.name},
-              );
-            }
-          },
-        ),
-        Expanded(
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.stretch,
-            children: [
-              Row(
-                spacing: 6,
-                children: [
-                  Text(data.nick).fontSize(20),
-                  if (data.verification != null)
-                    VerificationMark(mark: data.verification!),
-                  Expanded(
-                    child: Text(
-                      '@${data.name}',
-                      maxLines: 1,
-                      overflow: TextOverflow.ellipsis,
-                    ).fontSize(14).opacity(0.85),
-                  ),
-                ],
-              ),
-              if (data.type == 0 && data.account != null)
-                Row(
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  spacing: 6,
-                  children: [
-                    Icon(
-                      data.type == 0 ? Symbols.person : Symbols.workspaces,
-                      fill: 1,
-                      size: 17,
-                    ),
-                    Text(
-                      'publisherBelongsTo'.tr(args: ['@${data.account!.name}']),
-                    ).fontSize(14),
-                  ],
-                ).opacity(0.85),
-              const Gap(4),
-              if (data.type == 0 && data.account != null)
-                AccountStatusWidget(
-                  uname: data.account!.name,
-                  padding: EdgeInsets.zero,
-                ),
-              subStatus
-                  .when(
-                    data:
-                        (status) => FilledButton.icon(
-                          onPressed:
-                              subscribing.value
-                                  ? null
-                                  : (status.isSubscribed
-                                      ? unsubscribe
-                                      : subscribe),
-                          icon: Icon(
-                            status.isSubscribed
-                                ? Symbols.remove_circle
-                                : Symbols.add_circle,
-                          ),
-                          label:
-                              Text(
-                                status.isSubscribed
-                                    ? 'unsubscribe'
-                                    : 'subscribe',
-                              ).tr(),
-                          style: ButtonStyle(
-                            visualDensity: VisualDensity(vertical: -2),
-                          ),
-                        ),
-                    error: (_, _) => const SizedBox(),
-                    loading:
-                        () => const SizedBox(
-                          height: 36,
-                          child: Center(
-                            child: SizedBox(
-                              width: 20,
-                              height: 20,
-                              child: CircularProgressIndicator(strokeWidth: 2),
-                            ),
-                          ),
-                        ),
-                  )
-                  .padding(top: 8),
-            ],
-          ),
-        ),
-      ],
-    ).padding(horizontal: 24, top: 24);
-
-    Widget publisherBadgesWidget(SnPublisher data) =>
-        (badges.value?.isNotEmpty ?? false)
-            ? Card(
-              child: BadgeList(
-                badges: badges.value!,
-              ).padding(horizontal: 26, vertical: 20),
-            ).padding(horizontal: 4)
-            : const SizedBox.shrink();
-
-    Widget publisherVerificationWidget(SnPublisher data) =>
-        (data.verification != null)
-            ? Card(
-              margin: EdgeInsets.symmetric(horizontal: 8, vertical: 4),
-              child: VerificationStatusCard(mark: data.verification!),
-            )
-            : const SizedBox.shrink();
-
-    Widget publisherBioWidget(SnPublisher data) => Card(
-      margin: EdgeInsets.symmetric(horizontal: 8, vertical: 4),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.stretch,
-        children: [
-          Text('bio').tr().bold().fontSize(15).padding(bottom: 8),
-          if (data.bio.isEmpty)
-            Text('descriptionNone').tr().italic()
-          else
-            MarkdownTextContent(
-              content: data.bio,
-              linesMargin: EdgeInsets.zero,
-            ),
-        ],
-      ).padding(horizontal: 20, vertical: 16),
-    );
-
-    Widget publisherCategoryTabWidget() => Card(
-      margin: EdgeInsets.symmetric(horizontal: 8, vertical: 4),
-      child: TabBar(
-        controller: categoryTabController,
-        dividerColor: Colors.transparent,
-        splashBorderRadius: const BorderRadius.all(Radius.circular(8)),
-        tabs: [
-          Tab(text: 'all'.tr()),
-          Tab(text: 'postTypePost'.tr()),
-          Tab(text: 'postArticle'.tr()),
-        ],
-      ),
-    );
-
     return publisher.when(
       data:
           (data) => AppScaffold(
@@ -351,7 +405,9 @@ class PublisherProfileScreen extends HookConsumerWidget {
                               SliverGap(16),
                               SliverPostList(pubName: name, pinned: true),
                               SliverToBoxAdapter(
-                                child: publisherCategoryTabWidget(),
+                                child: _PublisherCategoryTabWidget(
+                                  categoryTabController: categoryTabController,
+                                ),
                               ),
                               SliverPostList(
                                 key: ValueKey(categoryTab.value),
@@ -377,10 +433,19 @@ class PublisherProfileScreen extends HookConsumerWidget {
                               child: Column(
                                 crossAxisAlignment: CrossAxisAlignment.stretch,
                                 children: [
-                                  publisherBasisWidget(data).padding(bottom: 8),
-                                  publisherBadgesWidget(data),
-                                  publisherVerificationWidget(data),
-                                  publisherBioWidget(data),
+                                  _PublisherBasisWidget(
+                                    data: data,
+                                    subStatus: subStatus,
+                                    subscribing: subscribing,
+                                    subscribe: subscribe,
+                                    unsubscribe: unsubscribe,
+                                  ).padding(bottom: 8),
+                                  _PublisherBadgesWidget(
+                                    data: data,
+                                    badges: badges,
+                                  ),
+                                  _PublisherVerificationWidget(data: data),
+                                  _PublisherBioWidget(data: data),
                                 ],
                               ),
                             ),
@@ -432,15 +497,32 @@ class PublisherProfileScreen extends HookConsumerWidget {
                           ),
                         ),
                         SliverToBoxAdapter(
-                          child: publisherBasisWidget(data).padding(bottom: 8),
+                          child: _PublisherBasisWidget(
+                            data: data,
+                            subStatus: subStatus,
+                            subscribing: subscribing,
+                            subscribe: subscribe,
+                            unsubscribe: unsubscribe,
+                          ).padding(bottom: 8),
                         ),
-                        SliverToBoxAdapter(child: publisherBadgesWidget(data)),
                         SliverToBoxAdapter(
-                          child: publisherVerificationWidget(data),
+                          child: _PublisherBadgesWidget(
+                            data: data,
+                            badges: badges,
+                          ),
+                        ),
+                        SliverToBoxAdapter(
+                          child: _PublisherVerificationWidget(data: data),
+                        ),
+                        SliverToBoxAdapter(
+                          child: _PublisherBioWidget(data: data),
                         ),
-                        SliverToBoxAdapter(child: publisherBioWidget(data)),
                         SliverPostList(pubName: name, pinned: true),
-                        SliverToBoxAdapter(child: publisherCategoryTabWidget()),
+                        SliverToBoxAdapter(
+                          child: _PublisherCategoryTabWidget(
+                            categoryTabController: categoryTabController,
+                          ),
+                        ),
                         SliverPostList(
                           key: ValueKey(categoryTab.value),
                           pubName: name,

lib/screens/realm/realm_detail.dart

@@ -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/settings.dart

@@ -450,6 +450,20 @@ class SettingsScreen extends HookConsumerWidget {
           },
         ),
       ),
+      ListTile(
+        minLeadingWidth: 48,
+        title: Text('settingsDataSavingMode').tr(),
+        contentPadding: const EdgeInsets.only(left: 24, right: 17),
+        leading: const Icon(Symbols.data_saver_on_rounded),
+        trailing: Switch(
+          value: settings.dataSavingMode,
+          onChanged: (value) {
+            ref
+                .read(appSettingsNotifierProvider.notifier)
+                .setDataSavingMode(value);
+          },
+        ),
+      ),
     ];
 
     // Desktop-specific settings

lib/screens/tray_manager.dart

@@ -48,7 +48,11 @@ class TrayService {
   void handleAction(MenuItem item) {
     switch (item.key) {
       case 'show_window':
-        appWindow.show();
+        if (appWindow.isVisible) {
+          appWindow.restore();
+        } else {
+          appWindow.show();
+        }
         break;
       case 'exit_app':
         appWindow.close();

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/update_service.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:developer';
 import 'dart:io';
 
+import 'package:archive/archive.dart';
 import 'package:dio/dio.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
@@ -10,6 +11,9 @@ import 'package:flutter_app_update/update_model.dart';
 import 'package:island/widgets/content/markdown.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:package_info_plus/package_info_plus.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:path/path.dart' as path;
+import 'package:process_run/process_run.dart';
 import 'package:collection/collection.dart'; // Added for firstWhereOrNull
 import 'package:styled_widget/styled_widget.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -180,9 +184,13 @@ class UpdateService {
       useRootNavigator: true,
       builder: (ctx) {
         String? androidUpdateUrl;
+        String? windowsUpdateUrl;
         if (Platform.isAndroid) {
           androidUpdateUrl = _getAndroidUpdateUrl(release.assets);
         }
+        if (Platform.isWindows) {
+          windowsUpdateUrl = _getWindowsUpdateUrl();
+        }
         return _UpdateSheet(
           release: release,
           onOpen: () async {
@@ -192,6 +200,7 @@ class UpdateService {
             }
           },
           androidUpdateUrl: androidUpdateUrl,
+          windowsUpdateUrl: windowsUpdateUrl,
           useProxy: useProxy, // Pass the useProxy flag
         );
       },
@@ -211,15 +220,270 @@ class UpdateService {
 
     // Prioritize arm64, then armeabi, then x86_64
     if (arm64 != null) {
-      return arm64.browserDownloadUrl;
+      return 'https://fs.solsynth.dev/d/official/solian/${arm64.name}';
     } else if (armeabi != null) {
-      return armeabi.browserDownloadUrl;
+      return 'https://fs.solsynth.dev/d/official/solian/${armeabi.name}';
     } else if (x86_64 != null) {
-      return x86_64.browserDownloadUrl;
+      return 'https://fs.solsynth.dev/d/official/solian/${x86_64.name}';
     }
     return null;
   }
 
+  String _getWindowsUpdateUrl() {
+    return 'https://fs.solsynth.dev/d/official/solian/build-output-windows-installer.zip';
+  }
+
+  /// Downloads the Windows installer ZIP file
+  Future<String?> _downloadWindowsInstaller(String url) async {
+    try {
+      log('[Update] Starting Windows installer download from: $url');
+
+      final tempDir = await getTemporaryDirectory();
+      final fileName =
+          'solian-installer-${DateTime.now().millisecondsSinceEpoch}.zip';
+      final filePath = path.join(tempDir.path, fileName);
+
+      final response = await _dio.download(
+        url,
+        filePath,
+        onReceiveProgress: (received, total) {
+          if (total != -1) {
+            log(
+              '[Update] Download progress: ${(received / total * 100).toStringAsFixed(1)}%',
+            );
+          }
+        },
+      );
+
+      if (response.statusCode == 200) {
+        log('[Update] Windows installer downloaded successfully to: $filePath');
+        return filePath;
+      } else {
+        log(
+          '[Update] Failed to download Windows installer. Status: ${response.statusCode}',
+        );
+        return null;
+      }
+    } catch (e) {
+      log('[Update] Error downloading Windows installer: $e');
+      return null;
+    }
+  }
+
+  /// Extracts the ZIP file to a temporary directory
+  Future<String?> _extractWindowsInstaller(String zipPath) async {
+    try {
+      log('[Update] Extracting Windows installer from: $zipPath');
+
+      final tempDir = await getTemporaryDirectory();
+      final extractDir = path.join(
+        tempDir.path,
+        'solian-installer-${DateTime.now().millisecondsSinceEpoch}',
+      );
+
+      final zipFile = File(zipPath);
+      final bytes = await zipFile.readAsBytes();
+      final archive = ZipDecoder().decodeBytes(bytes);
+
+      for (final file in archive) {
+        final filename = file.name;
+        if (file.isFile) {
+          final data = file.content as List<int>;
+          final filePath = path.join(extractDir, filename);
+          await Directory(path.dirname(filePath)).create(recursive: true);
+          await File(filePath).writeAsBytes(data);
+        } else {
+          final dirPath = path.join(extractDir, filename);
+          await Directory(dirPath).create(recursive: true);
+        }
+      }
+
+      log('[Update] Windows installer extracted successfully to: $extractDir');
+      return extractDir;
+    } catch (e) {
+      log('[Update] Error extracting Windows installer: $e');
+      return null;
+    }
+  }
+
+  /// Runs the setup.exe file
+  Future<bool> _runWindowsInstaller(String extractDir) async {
+    try {
+      log('[Update] Running Windows installer from: $extractDir');
+
+      final setupExePath = path.join(extractDir, 'setup.exe');
+
+      if (!await File(setupExePath).exists()) {
+        log('[Update] setup.exe not found in extracted directory');
+        return false;
+      }
+
+      final shell = Shell();
+      final results = await shell.run(setupExePath);
+      final result = results.first;
+
+      if (result.exitCode == 0) {
+        log('[Update] Windows installer completed successfully');
+        return true;
+      } else {
+        log(
+          '[Update] Windows installer failed with exit code: ${result.exitCode}',
+        );
+        log('[Update] Installer output: ${result.stdout}');
+        log('[Update] Installer errors: ${result.stderr}');
+        return false;
+      }
+    } catch (e) {
+      log('[Update] Error running Windows installer: $e');
+      return false;
+    }
+  }
+
+  /// Performs automatic Windows update: download, extract, and install
+  Future<void> _performAutomaticWindowsUpdate(
+    BuildContext context,
+    String url,
+  ) async {
+    if (!context.mounted) return;
+
+    // Show progress dialog
+    showDialog(
+      context: context,
+      barrierDismissible: false,
+      builder:
+          (context) => const AlertDialog(
+            title: Text('Installing Update'),
+            content: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                CircularProgressIndicator(),
+                SizedBox(height: 16),
+                Text('Downloading installer...'),
+              ],
+            ),
+          ),
+    );
+
+    try {
+      // Step 1: Download
+      if (!context.mounted) return;
+      Navigator.of(context).pop(); // Close progress dialog
+      showDialog(
+        context: context,
+        barrierDismissible: false,
+        builder:
+            (context) => const AlertDialog(
+              title: Text('Installing Update'),
+              content: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  CircularProgressIndicator(),
+                  SizedBox(height: 16),
+                  Text('Extracting installer...'),
+                ],
+              ),
+            ),
+      );
+
+      final zipPath = await _downloadWindowsInstaller(url);
+      if (zipPath == null) {
+        if (!context.mounted) return;
+        Navigator.of(context).pop();
+        _showErrorDialog(context, 'Failed to download installer');
+        return;
+      }
+
+      // Step 2: Extract
+      if (!context.mounted) return;
+      Navigator.of(context).pop(); // Close progress dialog
+      showDialog(
+        context: context,
+        barrierDismissible: false,
+        builder:
+            (context) => const AlertDialog(
+              title: Text('Installing Update'),
+              content: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  CircularProgressIndicator(),
+                  SizedBox(height: 16),
+                  Text('Running installer...'),
+                ],
+              ),
+            ),
+      );
+
+      final extractDir = await _extractWindowsInstaller(zipPath);
+      if (extractDir == null) {
+        if (!context.mounted) return;
+        Navigator.of(context).pop();
+        _showErrorDialog(context, 'Failed to extract installer');
+        return;
+      }
+
+      // Step 3: Run installer
+      if (!context.mounted) return;
+      Navigator.of(context).pop(); // Close progress dialog
+
+      final success = await _runWindowsInstaller(extractDir);
+      if (!context.mounted) return;
+
+      if (success) {
+        showDialog(
+          context: context,
+          builder:
+              (context) => AlertDialog(
+                title: const Text('Update Complete'),
+                content: const Text(
+                  'The application has been updated successfully. Please restart the application.',
+                ),
+                actions: [
+                  TextButton(
+                    onPressed: () {
+                      Navigator.of(context).pop();
+                      // Close the update sheet
+                      Navigator.of(context).pop();
+                    },
+                    child: const Text('OK'),
+                  ),
+                ],
+              ),
+        );
+      } else {
+        _showErrorDialog(context, 'Failed to run installer');
+      }
+
+      // Cleanup
+      try {
+        await File(zipPath).delete();
+        await Directory(extractDir).delete(recursive: true);
+      } catch (e) {
+        log('[Update] Error cleaning up temporary files: $e');
+      }
+    } catch (e) {
+      if (!context.mounted) return;
+      Navigator.of(context).pop(); // Close any open dialogs
+      _showErrorDialog(context, 'Update failed: $e');
+    }
+  }
+
+  void _showErrorDialog(BuildContext context, String message) {
+    showDialog(
+      context: context,
+      builder:
+          (context) => AlertDialog(
+            title: const Text('Update Failed'),
+            content: Text(message),
+            actions: [
+              TextButton(
+                onPressed: () => Navigator.of(context).pop(),
+                child: const Text('OK'),
+              ),
+            ],
+          ),
+    );
+  }
+
   /// Fetch the latest release info from GitHub.
   /// Public so other screens (e.g., About) can manually trigger update checks.
   Future<GithubReleaseInfo?> fetchLatestRelease() async {
@@ -277,10 +541,12 @@ class _UpdateSheet extends StatefulWidget {
     required this.release,
     required this.onOpen,
     this.androidUpdateUrl,
+    this.windowsUpdateUrl,
     this.useProxy = false,
   });
 
   final String? androidUpdateUrl;
+  final String? windowsUpdateUrl;
   final bool useProxy;
   final GithubReleaseInfo release;
   final VoidCallback onOpen;
@@ -299,8 +565,11 @@ class _UpdateSheetState extends State<_UpdateSheet> {
   }
 
   Future<void> _installUpdate(String url) async {
-    final downloadUrl =
-        _useProxy ? 'https://ghfast.top/${Uri.encodeComponent(url)}' : url;
+    String downloadUrl = url;
+    if (_useProxy) {
+      final fileName = url.split('/').last;
+      downloadUrl = 'https://fs.solsynth.dev/d/rainyun02/solian/$fileName';
+    }
 
     UpdateModel model = UpdateModel(
       downloadUrl,
@@ -350,7 +619,7 @@ class _UpdateSheetState extends State<_UpdateSheet> {
             ),
             if (!kIsWeb && Platform.isAndroid)
               SwitchListTile(
-                title: const Text('Use GitHub Proxy for Download'),
+                title: const Text('Use secondary source for download'),
                 value: _useProxy,
                 onChanged: (value) {
                   setState(() {
@@ -376,6 +645,25 @@ class _UpdateSheetState extends State<_UpdateSheet> {
                           label: const Text('Install update'),
                         ),
                       ),
+                    if (!kIsWeb &&
+                        Platform.isWindows &&
+                        widget.windowsUpdateUrl != null)
+                      Expanded(
+                        child: FilledButton.icon(
+                          onPressed: () {
+                            // Access the UpdateService instance to call the automatic update method
+                            final updateService = UpdateService(
+                              useProxy: widget.useProxy,
+                            );
+                            updateService._performAutomaticWindowsUpdate(
+                              context,
+                              widget.windowsUpdateUrl!,
+                            );
+                          },
+                          icon: const Icon(Symbols.update),
+                          label: const Text('Install update'),
+                        ),
+                      ),
                     Expanded(
                       child: FilledButton.icon(
                         onPressed: widget.onOpen,

lib/utils/share_utils.dart

@@ -0,0 +1,62 @@
+import 'dart:io';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/post.dart';
+import 'package:island/pods/config.dart';
+import 'package:island/widgets/alert.dart';
+import 'package:island/widgets/post/post_item_screenshot.dart';
+import 'package:path_provider/path_provider.dart' show getTemporaryDirectory;
+import 'package:screenshot/screenshot.dart';
+import 'package:share_plus/share_plus.dart';
+
+/// Shares a post as a screenshot image
+Future<void> sharePostAsScreenshot(
+  BuildContext context,
+  WidgetRef ref,
+  SnPost post,
+) async {
+  if (kIsWeb) return;
+
+  final screenshotController = ScreenshotController();
+
+  showLoadingModal(context);
+  await screenshotController
+      .captureFromWidget(
+        ProviderScope(
+          overrides: [
+            sharedPreferencesProvider.overrideWithValue(
+              ref.watch(sharedPreferencesProvider),
+            ),
+          ],
+          child: Directionality(
+            textDirection: TextDirection.ltr,
+            child: SizedBox(
+              width: 520,
+              child: PostItemScreenshot(item: post, isFullPost: true),
+            ),
+          ),
+        ),
+        context: context,
+        pixelRatio: MediaQuery.of(context).devicePixelRatio,
+        delay: const Duration(seconds: 1),
+      )
+      .then((Uint8List? image) async {
+        if (image == null) return;
+        final directory = await getTemporaryDirectory();
+        final imagePath = await File('${directory.path}/image.png').create();
+        await imagePath.writeAsBytes(image);
+
+        if (!context.mounted) return;
+        hideLoadingModal(context);
+        final box = context.findRenderObject() as RenderBox?;
+        await Share.shareXFiles([
+          XFile(imagePath.path),
+        ], sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size);
+      })
+      .catchError((err) {
+        if (context.mounted) hideLoadingModal(context);
+        showErrorAlert(err);
+      });
+}

lib/widgets/account/event_details_widget.dart

@@ -46,6 +46,10 @@ class EventDetailsWidget extends StatelessWidget {
                       size: 12,
                       fill: 1,
                     ).padding(top: 4, right: 4),
+                    Icon(
+                      tip.isPositive ? Symbols.thumb_up : Symbols.thumb_down,
+                      size: 14,
+                    ).padding(top: 2.5),
                     Expanded(
                       child: Column(
                         crossAxisAlignment: CrossAxisAlignment.start,

lib/widgets/app_scaffold.dart

@@ -1,4 +1,5 @@
 import 'dart:io';
+import 'dart:ui';
 import 'package:bitsdojo_window/bitsdojo_window.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/foundation.dart';
@@ -15,6 +16,15 @@ import 'package:material_symbols_icons/material_symbols_icons.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:styled_widget/styled_widget.dart';
 
+class AppScrollBehavior extends MaterialScrollBehavior {
+  @override
+  Set<PointerDeviceKind> get dragDevices => {
+    PointerDeviceKind.touch, // default
+    PointerDeviceKind.trackpad, // default
+    PointerDeviceKind.mouse, // add mouse dragging
+  };
+}
+
 class WindowScaffold extends HookConsumerWidget {
   final Widget child;
   const WindowScaffold({super.key, required this.child});

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_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();
@@ -63,7 +67,11 @@ class AppWrapper extends HookConsumerWidget with TrayListener {
   }
 
   void _trayIconPrimaryAction() {
-    appWindow.show();
+    if (appWindow.isVisible) {
+      appWindow.restore();
+    } else {
+      appWindow.show();
+    }
   }
 
   void _trayIconSecondaryAction() {

lib/widgets/check_in.dart

@@ -1,8 +1,10 @@
+import 'dart:async';
 import 'dart:convert';
 
 import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:go_router/go_router.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -14,6 +16,7 @@ import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/content/cloud_files.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:slide_countdown/slide_countdown.dart';
 import 'package:styled_widget/styled_widget.dart';
 
 part 'check_in.g.dart';
@@ -34,6 +37,17 @@ Future<SnCheckInResult?> checkInResultToday(Ref ref) async {
   }
 }
 
+@riverpod
+Future<SnNotableDay?> nextNotableDay(Ref ref) async {
+  final client = ref.watch(apiClientProvider);
+  try {
+    final resp = await client.get('/id/notable/me/next');
+    return SnNotableDay.fromJson(resp.data);
+  } catch (err) {
+    return null;
+  }
+}
+
 class CheckInWidget extends HookConsumerWidget {
   final EdgeInsets? margin;
   final VoidCallback? onChecked;
@@ -42,6 +56,38 @@ class CheckInWidget extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     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 age =
+          now.year -
+          birthday.year -
+          ((now.month < birthday.month ||
+                  (now.month == birthday.month && now.day < birthday.day))
+              ? 1
+              : 0);
+      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);
@@ -72,94 +118,165 @@ class CheckInWidget extends HookConsumerWidget {
       margin:
           margin ?? EdgeInsets.only(left: 16, right: 16, top: 16, bottom: 8),
       child: Row(
-        crossAxisAlignment: CrossAxisAlignment.center,
-        spacing: 16,
         children: [
-          ClipRRect(
-            borderRadius: BorderRadius.circular(8),
-            child: Container(
-              color: Theme.of(context).colorScheme.secondaryContainer,
-              width: 56,
-              height: 56,
-              child:
-                  Column(
-                    mainAxisSize: MainAxisSize.min,
-                    crossAxisAlignment: CrossAxisAlignment.center,
-                    children: [
-                      Text(DateFormat('EEE').format(DateTime.now()))
-                          .fontSize(16)
-                          .bold()
-                          .textColor(
-                            Theme.of(context).colorScheme.onSecondaryContainer,
-                          ),
-                      Text(DateFormat('MM/dd').format(DateTime.now()))
-                          .fontSize(12)
-                          .textColor(
-                            Theme.of(context).colorScheme.onSecondaryContainer,
-                          ),
-                    ],
-                  ).center(),
-            ),
-          ),
           Expanded(
-            child: 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(),
-                      Text(
-                        result.tips
-                            .map(
-                              (e) => '${e.isPositive ? '宜' : '忌'} ${e.title}',
-                            )
-                            .join('  ·  '),
-                      ).fontSize(11),
-                    ],
-                  );
-                },
-                loading: () => _CheckInNoneWidget(),
-                error:
-                    (err, stack) => Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Text('error').tr().fontSize(15).bold(),
-                        Text(err.toString()).fontSize(11),
-                      ],
+            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,
+                        ),
+                      ),
                     ),
-              ),
+                  ],
+                ),
+                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 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: () => Text('checkInNoneHint').tr().fontSize(11),
+                    error:
+                        (err, stack) => Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Text('error').tr().fontSize(15).bold(),
+                            Text(err.toString()).fontSize(11),
+                          ],
+                        ),
+                  ),
+                ).alignment(Alignment.centerLeft),
+              ],
             ),
           ),
-          IconButton.outlined(
-            onPressed: () {
-              if (todayResult.valueOrNull == null) {
-                checkIn();
-              } else {
-                context.pushNamed(
-                  'accountCalendar',
-                  pathParameters: {'name': 'me'},
-                );
-              }
-            },
-            icon: AnimatedSwitcher(
-              duration: const Duration(milliseconds: 300),
-              child: todayResult.when(
-                data:
-                    (result) => Icon(
+          Column(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            spacing: 3,
+            children: [
+              AnimatedSwitcher(
+                duration: const Duration(milliseconds: 300),
+                child: todayResult.when(
+                  data: (result) {
+                    return Text(
                       result == null
-                          ? Symbols.local_fire_department
-                          : Symbols.event,
-                      key: ValueKey(result != null),
-                    ),
-                loading: () => const Icon(Symbols.refresh),
-                error: (_, _) => const Icon(Symbols.error),
+                          ? '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(),
+                ),
               ),
-            ),
+              IconButton.outlined(
+                iconSize: 16,
+                visualDensity: const VisualDensity(
+                  horizontal: -3,
+                  vertical: -2,
+                ),
+                onPressed: () {
+                  if (todayResult.valueOrNull == null) {
+                    checkIn();
+                  } else {
+                    context.pushNamed(
+                      'accountCalendar',
+                      pathParameters: {'name': 'me'},
+                    );
+                  }
+                },
+                icon: AnimatedSwitcher(
+                  duration: const Duration(milliseconds: 300),
+                  child: todayResult.when(
+                    data:
+                        (result) => Icon(
+                          result == null
+                              ? Symbols.local_fire_department
+                              : Symbols.event,
+                          key: ValueKey(result != null),
+                        ),
+                    loading: () => const Icon(Symbols.refresh),
+                    error: (_, _) => const Icon(Symbols.error),
+                  ),
+                ),
+              ),
+            ],
           ),
         ],
       ).padding(horizontal: 16, vertical: 12),
@@ -167,21 +284,6 @@ class CheckInWidget extends HookConsumerWidget {
   }
 }
 
-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),
-      ],
-    );
-  }
-}
-
 class CheckInActivityWidget extends StatelessWidget {
   final SnActivity item;
   const CheckInActivityWidget({super.key, required this.item});

lib/widgets/check_in.g.dart

@@ -26,5 +26,24 @@ final checkInResultTodayProvider =
 @Deprecated('Will be removed in 3.0. Use Ref instead')
 // ignore: unused_element
 typedef CheckInResultTodayRef = AutoDisposeFutureProviderRef<SnCheckInResult?>;
+String _$nextNotableDayHash() => r'698370bec4be28774d332412c5a701f914064c90';
+
+/// See also [nextNotableDay].
+@ProviderFor(nextNotableDay)
+final nextNotableDayProvider =
+    AutoDisposeFutureProvider<SnNotableDay?>.internal(
+      nextNotableDay,
+      name: r'nextNotableDayProvider',
+      debugGetCreateSourceHash:
+          const bool.fromEnvironment('dart.vm.product')
+              ? null
+              : _$nextNotableDayHash,
+      dependencies: null,
+      allTransitiveDependencies: null,
+    );
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+typedef NextNotableDayRef = AutoDisposeFutureProviderRef<SnNotableDay?>;
 // 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/content/alert.native.dart

@@ -6,17 +6,21 @@ 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?['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/attachment_preview.dart

@@ -321,7 +321,7 @@ class AttachmentPreview extends HookConsumerWidget {
                               children: [
                                 Icon(fallbackIcon),
                                 const Gap(6),
-                                Text(file.name),
+                                Text(file.name, textAlign: TextAlign.center),
                                 FutureBuilder(
                                   future: file.length(),
                                   builder: (context, snapshot) {

lib/widgets/content/cloud_file_collection.dart

@@ -5,11 +5,11 @@ import 'dart:ui';
 
 import 'package:dismissible_page/dismissible_page.dart';
 import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter_blurhash/flutter_blurhash.dart';
 import 'package:file_saver/file_saver.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_blurhash/flutter_blurhash.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
 import 'package:gal/gal.dart';
@@ -804,164 +804,213 @@ class _CloudFileListEntry extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final dataSaving = ref.watch(
+      appSettingsNotifierProvider.select((s) => s.dataSavingMode),
+    );
     final showMature = useState(false);
+    final showDataSaving = useState(!dataSaving);
+    final lockedByDS = dataSaving && !showDataSaving.value;
+    final lockedByMature = file.sensitiveMarks.isNotEmpty && !showMature.value;
+    final meta = file.fileMeta is Map ? file.fileMeta as Map : const {};
+    final hasRatio =
+        meta.containsKey('ratio') &&
+        (meta['ratio'] is num && (meta['ratio'] as num) != 0);
+    final ratio =
+        (meta['ratio'] is num && (meta['ratio'] as num) != 0)
+            ? (meta['ratio'] as num).toDouble()
+            : 1.0;
 
-    var content = Stack(
-      fit: StackFit.expand,
-      children: [
-        if (isImage)
-          Positioned.fill(
-            child:
-                file.fileMeta?['blur'] is String
-                    ? BlurHash(hash: file.fileMeta?['blur'])
-                    : ImageFiltered(
-                      imageFilter: ImageFilter.blur(sigmaX: 10, sigmaY: 10),
-                      child: CloudFileWidget(item: file, noBlurhash: true),
-                    ),
-          ),
-        if (isImage)
-          CloudFileWidget(
+    final fit = hasRatio ? BoxFit.cover : BoxFit.contain;
+
+    Widget bg = const SizedBox.shrink();
+    if (isImage) {
+      if (meta['blur'] is String) {
+        bg = BlurHash(hash: meta['blur'] as String);
+      } else if (!lockedByDS && !lockedByMature) {
+        bg = ImageFiltered(
+          imageFilter: ImageFilter.blur(sigmaX: 10, sigmaY: 10),
+          child: CloudFileWidget(
+            fit: BoxFit.cover,
             item: file,
-            heroTag: heroTag,
             noBlurhash: true,
-            fit: BoxFit.contain,
-          )
-        else
-          CloudFileWidget(item: file, heroTag: heroTag, fit: BoxFit.contain),
-      ],
+            useInternalGate: false,
+          ),
+        );
+      } else {
+        bg = const ColoredBox(color: Colors.black26);
+      }
+    }
+
+    final bool fullyUnlocked = !lockedByDS && !lockedByMature;
+    Widget fg =
+        fullyUnlocked
+            ? (isImage
+                ? CloudFileWidget(
+                  item: file,
+                  heroTag: heroTag,
+                  noBlurhash: true,
+                  fit: fit,
+                  useInternalGate: false,
+                )
+                : CloudFileWidget(
+                  item: file,
+                  heroTag: heroTag,
+                  fit: fit,
+                  useInternalGate: false,
+                ))
+            : AspectRatio(aspectRatio: ratio, child: const SizedBox.shrink());
+
+    Widget overlays;
+    if (lockedByDS) {
+      overlays = _DataSavingOverlay();
+    } else if (file.sensitiveMarks.isNotEmpty) {
+      overlays = _SensitiveOverlay(
+        file: file,
+        isRevealed: showMature.value,
+        onHide: () => showMature.value = false,
+      );
+    } else {
+      overlays = const SizedBox.shrink();
+    }
+
+    final content = Stack(
+      fit: StackFit.expand,
+      children: [if (isImage) Positioned.fill(child: bg), fg, overlays],
     );
 
-    if (file.sensitiveMarks.isNotEmpty) {
-      // Show a blurred overlay only when not revealed yet, with a smooth transition
-      content = Stack(
-        children: [
-          content,
-          // Toggle blur overlay with animation
-          Positioned.fill(
-            child: AnimatedSwitcher(
-              duration: const Duration(milliseconds: 250),
-              switchInCurve: Curves.easeOut,
-              switchOutCurve: Curves.easeIn,
-              layoutBuilder:
-                  (currentChild, previousChildren) => Stack(
-                    fit: StackFit.expand,
-                    children: [
-                      ...previousChildren,
-                      if (currentChild != null) currentChild,
-                    ],
-                  ),
-              child:
-                  showMature.value
-                      ? const SizedBox.shrink(key: ValueKey('revealed'))
-                      : ColoredBox(
-                        key: const ValueKey('blurred'),
-                        color: Colors.transparent,
-                        child: BackdropFilter(
-                          filter: ImageFilter.blur(sigmaX: 64, sigmaY: 64),
-                          child: Stack(
-                            fit: StackFit.expand,
-                            children: [
-                              const ColoredBox(color: Colors.transparent),
-                              Center(
-                                child: Container(
-                                  margin: const EdgeInsets.all(12),
-                                  padding: const EdgeInsets.symmetric(
-                                    horizontal: 12,
-                                    vertical: 8,
-                                  ),
-                                  decoration: BoxDecoration(
-                                    color: Colors.black54,
-                                    borderRadius: BorderRadius.circular(12),
-                                  ),
-                                  child: ConstrainedBox(
-                                    constraints: const BoxConstraints(
-                                      maxWidth: 280,
-                                    ),
-                                    child: Column(
-                                      mainAxisSize: MainAxisSize.min,
-                                      children: [
-                                        const Icon(
-                                          Icons.warning,
-                                          color: Colors.white,
-                                          fill: 1,
-                                          size: 24,
-                                        ),
-                                        const Gap(4),
-                                        Text(
-                                          file.sensitiveMarks
-                                              .map(
-                                                (e) =>
-                                                    SensitiveCategory
-                                                        .values[e]
-                                                        .i18nKey
-                                                        .tr(),
-                                              )
-                                              .join(' · '),
-                                          style: const TextStyle(
-                                            color: Colors.white,
-                                            fontWeight: FontWeight.w600,
-                                          ),
-                                          textAlign: TextAlign.center,
-                                        ),
-                                        Text(
-                                          'Sensitive Content',
-                                          style: TextStyle(
-                                            color: Colors.white,
-                                            fontSize: 13,
-                                          ),
-                                        ),
-                                        const Gap(4),
-                                        Text(
-                                          'Tap to Reveal',
-                                          style: TextStyle(
-                                            color: Colors.white,
-                                            fontSize: 11,
-                                          ),
-                                        ),
-                                      ],
-                                    ),
-                                  ).padding(horizontal: 24, vertical: 16),
-                                ),
-                              ),
-                            ],
-                          ),
-                        ),
-                      ),
-            ),
-          ),
-          // When revealed (no blur), show a small control at top-left to re-enable blur
-          if (showMature.value)
-            Positioned(
-              top: 3,
-              left: 4,
-              child: IconButton(
-                iconSize: 16,
-                constraints: const BoxConstraints(),
-                icon: const Icon(Icons.visibility_off, color: Colors.white),
-                tooltip: 'Blur content',
-                onPressed: () {
-                  showMature.value = false;
-                },
-              ),
-            ),
-        ],
-      );
-    }
-
-    if (onTap != null) {
-      return InkWell(
-        borderRadius: const BorderRadius.all(Radius.circular(16)),
-        onTap: () {
-          if (!showMature.value) {
-            showMature.value = true;
-          } else {
-            onTap?.call();
-          }
-        },
-        child: content,
-      );
-    }
-
-    return content;
+    return InkWell(
+      borderRadius: const BorderRadius.all(Radius.circular(16)),
+      onTap: () {
+        if (lockedByDS) {
+          showDataSaving.value = true;
+        } else if (lockedByMature) {
+          showMature.value = true;
+        } else {
+          onTap?.call();
+        }
+      },
+      child: content,
+    );
+  }
+}
+
+class _SensitiveOverlay extends StatelessWidget {
+  final SnCloudFile file;
+  final VoidCallback? onHide;
+  final bool isRevealed;
+
+  const _SensitiveOverlay({
+    required this.file,
+    this.onHide,
+    this.isRevealed = false,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    if (isRevealed) {
+      return Positioned(
+        top: 3,
+        left: 4,
+        child: IconButton(
+          iconSize: 16,
+          constraints: const BoxConstraints(),
+          icon: const Icon(
+            Icons.visibility_off,
+            color: Colors.white,
+            shadows: [
+              Shadow(
+                color: Colors.black,
+                blurRadius: 5.0,
+                offset: Offset(1.0, 1.0),
+              ),
+            ],
+          ),
+          tooltip: 'Blur content',
+          onPressed: onHide,
+        ),
+      );
+    }
+
+    return BackdropFilter(
+      filter: ImageFilter.blur(sigmaX: 64, sigmaY: 64),
+      child: Container(
+        color: Colors.transparent,
+        child: Center(
+          child: _OverlayCard(
+            icon: Icons.warning,
+            title: file.sensitiveMarks
+                .map((e) => SensitiveCategory.values[e].i18nKey.tr())
+                .join(' · '),
+            subtitle: 'Sensitive Content',
+            hint: 'Tap to Reveal',
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _DataSavingOverlay extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return ColoredBox(
+      color: Colors.black38,
+      child: Center(
+        child: _OverlayCard(
+          icon: Symbols.image,
+          title: 'Data Saving Mode',
+          subtitle: '',
+          hint: 'Tap to Load',
+        ),
+      ),
+    );
+  }
+}
+
+class _OverlayCard extends StatelessWidget {
+  final IconData icon;
+  final String title;
+  final String subtitle;
+  final String hint;
+
+  const _OverlayCard({
+    required this.icon,
+    required this.title,
+    required this.subtitle,
+    required this.hint,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      margin: const EdgeInsets.all(12),
+      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+      decoration: BoxDecoration(
+        color: Colors.black54,
+        borderRadius: BorderRadius.circular(12),
+      ),
+      constraints: const BoxConstraints(maxWidth: 280),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Icon(icon, color: Colors.white, size: 24),
+          const Gap(4),
+          Text(
+            title,
+            style: const TextStyle(
+              color: Colors.white,
+              fontWeight: FontWeight.w600,
+            ),
+            textAlign: TextAlign.center,
+          ),
+          Text(
+            subtitle,
+            style: const TextStyle(color: Colors.white, fontSize: 13),
+          ),
+          const Gap(4),
+          Text(hint, style: const TextStyle(color: Colors.white, fontSize: 11)),
+        ],
+      ),
+    );
   }
 }

lib/widgets/content/cloud_files.dart

@@ -14,6 +14,7 @@ import 'package:island/widgets/content/audio.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:styled_widget/styled_widget.dart';
 import 'package:url_launcher/url_launcher_string.dart';
+import 'package:island/widgets/data_saving_gate.dart';
 
 import 'image.dart';
 import 'video.dart';
@@ -23,86 +24,97 @@ class CloudFileWidget extends HookConsumerWidget {
   final BoxFit fit;
   final String? heroTag;
   final bool noBlurhash;
+  final bool useInternalGate;
   const CloudFileWidget({
     super.key,
     required this.item,
     this.fit = BoxFit.cover,
     this.heroTag,
     this.noBlurhash = false,
+    this.useInternalGate = true,
   });
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final dataSaving = ref.watch(
+      appSettingsNotifierProvider.select((s) => s.dataSavingMode),
+    );
     final serverUrl = ref.watch(serverUrlProvider);
     final uri = '$serverUrl/drive/files/${item.id}';
 
-    var ratio =
-        item.fileMeta?['ratio'] is num
-            ? item.fileMeta!['ratio'].toDouble()
-            : 1.0;
+    final unlocked = useState(false);
+
+    final meta = item.fileMeta is Map ? (item.fileMeta as Map) : const {};
+    final blurHash = noBlurhash ? null : (meta['blur'] as String?);
+    var ratio = meta['ratio'] is num ? (meta['ratio'] as num).toDouble() : 1.0;
     if (ratio == 0) ratio = 1.0;
+
+    Widget cloudImage() => UniversalImage(uri: uri, blurHash: blurHash, fit: fit);
+    Widget cloudVideo() => CloudVideoWidget(item: item);
+
+    Widget dataPlaceHolder(IconData icon) => _DataSavingPlaceholder(
+          icon: icon,
+          onTap: () {
+            unlocked.value = true;
+          },
+        );
+
     var content = switch (item.mimeType?.split('/').firstOrNull) {
-      "image" => AspectRatio(
-        aspectRatio: ratio,
-        child: UniversalImage(
-          uri: uri,
-          blurHash:
-              noBlurhash
-                  ? null
-                  : (item.fileMeta is String ? item.fileMeta!['blur'] : null),
+      'image' => AspectRatio(
+          aspectRatio: ratio,
+          child: (useInternalGate && dataSaving && !unlocked.value) ? dataPlaceHolder(Symbols.image) : cloudImage(),
         ),
-      ),
-      "video" => AspectRatio(
-        aspectRatio: ratio,
-        child: CloudVideoWidget(item: item),
-      ),
-      "audio" => Center(
-        child: ConstrainedBox(
-          constraints: BoxConstraints(
-            maxWidth: math.min(360, MediaQuery.of(context).size.width * 0.8),
+      'video' => AspectRatio(
+          aspectRatio: ratio,
+          child: (useInternalGate && dataSaving && !unlocked.value) ? dataPlaceHolder(Symbols.play_arrow) : cloudVideo(),
+        ),
+      'audio' => Center(
+          child: ConstrainedBox(
+            constraints: BoxConstraints(
+              maxWidth: math.min(360, MediaQuery.of(context).size.width * 0.8),
+            ),
+            child: UniversalAudio(uri: uri, filename: item.name),
           ),
-          child: UniversalAudio(uri: uri, filename: item.name),
         ),
-      ),
       _ => Column(
-        mainAxisSize: MainAxisSize.min,
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: [
-          Icon(
-            Symbols.insert_drive_file,
-            size: 48,
-            color: Theme.of(context).colorScheme.onSurfaceVariant,
-          ),
-          const Gap(8),
-          Text(
-            item.name,
-            maxLines: 1,
-            overflow: TextOverflow.ellipsis,
-            style: TextStyle(
-              fontSize: 14,
+          mainAxisSize: MainAxisSize.min,
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Icon(
+              Symbols.insert_drive_file,
+              size: 48,
               color: Theme.of(context).colorScheme.onSurfaceVariant,
             ),
-          ),
-          Text(
-            formatFileSize(item.size),
-            style: TextStyle(
-              fontSize: 12,
-              color: Theme.of(context).colorScheme.onSurfaceVariant,
+            const Gap(8),
+            Text(
+              item.name,
+              maxLines: 1,
+              overflow: TextOverflow.ellipsis,
+              style: TextStyle(
+                fontSize: 14,
+                color: Theme.of(context).colorScheme.onSurfaceVariant,
+              ),
             ),
-          ),
-          const Gap(8),
-          TextButton.icon(
-            onPressed: () {
-              launchUrlString(
-                'https://fs.solian.app/files/${item.id}',
-                mode: LaunchMode.externalApplication,
-              );
-            },
-            icon: const Icon(Symbols.launch),
-            label: Text('openInBrowser').tr(),
-          ),
-        ],
-      ).padding(all: 8),
+            Text(
+              formatFileSize(item.size),
+              style: TextStyle(
+                fontSize: 12,
+                color: Theme.of(context).colorScheme.onSurfaceVariant,
+              ),
+            ),
+            const Gap(8),
+            TextButton.icon(
+              onPressed: () {
+                launchUrlString(
+                  'https://fs.solian.app/files/${item.id}',
+                  mode: LaunchMode.externalApplication,
+                );
+              },
+              icon: const Icon(Symbols.launch),
+              label: Text('openInBrowser').tr(),
+            ),
+          ],
+        ).padding(all: 8),
     };
 
     if (heroTag != null) {
@@ -113,6 +125,35 @@ class CloudFileWidget extends HookConsumerWidget {
   }
 }
 
+class _DataSavingPlaceholder extends StatelessWidget {
+  final IconData icon;
+  final VoidCallback onTap;
+  const _DataSavingPlaceholder({required this.icon, required this.onTap});
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: onTap,
+      child: Container(
+        color: Colors.black26,
+        alignment: Alignment.center,
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Icon(icon, size: 36,
+              color: Theme.of(context).colorScheme.onSurfaceVariant),
+            const Gap(8),
+            Text(
+              'dataSavingHint'.tr(),
+              style: Theme.of(context).textTheme.bodySmall,
+              textAlign: TextAlign.center,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
 class CloudVideoWidget extends HookConsumerWidget {
   final SnCloudFile item;
   const CloudVideoWidget({super.key, required this.item});
@@ -311,32 +352,35 @@ class ProfilePictureWidget extends ConsumerWidget {
     this.fallbackColor,
   });
 
-  @override
+@override
   Widget build(BuildContext context, WidgetRef ref) {
     final serverUrl = ref.watch(serverUrlProvider);
-    final uri = '$serverUrl/drive/files/${file?.id ?? fileId}';
+    final String? id = file?.id ?? fileId;
+
+    final fallback = Icon(
+      fallbackIcon ?? Symbols.account_circle,
+      size: radius,
+      color: fallbackColor ?? Theme.of(context).colorScheme.onPrimaryContainer,
+    ).center();
 
     return ClipRRect(
-      borderRadius:
-          borderRadius == null
-              ? BorderRadius.all(Radius.circular(radius))
-              : BorderRadius.all(Radius.circular(borderRadius!)),
+      borderRadius: borderRadius == null
+          ? BorderRadius.all(Radius.circular(radius))
+          : BorderRadius.all(Radius.circular(borderRadius!)),
       child: Container(
         width: radius * 2,
         height: radius * 2,
         color: Theme.of(context).colorScheme.primaryContainer,
-        child:
-            file != null
-                ? CloudFileWidget(item: file!, fit: BoxFit.cover)
-                : fileId == null
-                ? Icon(
-                  fallbackIcon ?? Symbols.account_circle,
-                  size: radius,
-                  color:
-                      fallbackColor ??
-                      Theme.of(context).colorScheme.onPrimaryContainer,
-                ).center()
-                : UniversalImage(uri: uri, fit: BoxFit.cover),
+        child: id == null
+            ? fallback
+            : DataSavingGate(
+                bypass: true,
+                placeholder: fallback,
+                content: () => UniversalImage(
+                  uri: '$serverUrl/drive/files/$id',
+                  fit: BoxFit.cover,
+                ),
+              ),
       ),
     );
   }

lib/widgets/data_saving_gate.dart

@@ -0,0 +1,27 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/pods/config.dart';
+
+
+typedef WidgetBuilder0 = Widget Function();
+
+class DataSavingGate extends ConsumerWidget {
+  final bool bypass;
+  final WidgetBuilder0 content;
+  final Widget placeholder;
+
+  const DataSavingGate({
+    super.key,
+    required this.bypass,
+    required this.content,
+    required this.placeholder,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final dataSaving =
+        ref.watch(appSettingsNotifierProvider.select((s) => s.dataSavingMode));
+    if (bypass || !dataSaving) return content();
+    return placeholder;
+  }
+}

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

@@ -37,6 +37,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 +57,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 +122,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 +154,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 +173,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));
@@ -253,6 +253,7 @@ class ComposeLogic {
         tags: [],
         categories: [],
         collections: [],
+        embedView: state.embedView.value,
         createdAt: DateTime.now(),
         updatedAt: DateTime.now(),
         deletedAt: null,
@@ -279,10 +280,6 @@ class ComposeLogic {
     }
 
     try {
-      if (state._autoSaveTimer == null) {
-        return;
-      }
-
       final draft = SnPost(
         id: state.draftId,
         title: state.titleController.text,
@@ -329,6 +326,7 @@ class ComposeLogic {
         tags: [],
         categories: [],
         collections: [],
+        embedView: state.embedView.value,
         createdAt: DateTime.now(),
         updatedAt: DateTime.now(),
         deletedAt: null,
@@ -577,6 +575,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,
@@ -660,6 +670,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 +765,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';
@@ -33,13 +34,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,
@@ -112,6 +121,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'492ae59a5dbbfb5c98f863f036023193b6e08668';
+
+/// 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);
+      }
+    }
+  }
+}

lib/widgets/post/post_item.dart

@@ -18,8 +18,10 @@ import 'package:island/screens/posts/compose.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/content/markdown.dart';
 import 'package:island/widgets/post/post_item_screenshot.dart';
+import 'package:island/widgets/post/post_award_sheet.dart';
 import 'package:island/widgets/post/post_pin_sheet.dart';
 import 'package:island/widgets/post/post_shared.dart';
+import 'package:island/widgets/post/embed_view_renderer.dart';
 import 'package:island/widgets/safety/abuse_report_helper.dart';
 import 'package:island/widgets/share/share_sheet.dart';
 import 'package:material_symbols_icons/symbols.dart';
@@ -245,6 +247,18 @@ class PostActionableItem extends HookConsumerWidget {
                   );
                 },
               ),
+            MenuAction(
+              title: 'award'.tr(),
+              image: MenuImage.icon(Symbols.star),
+              callback: () {
+                showModalBottomSheet(
+                  context: context,
+                  isScrollControlled: true,
+                  useRootNavigator: true,
+                  builder: (context) => PostAwardSheet(post: item),
+                );
+              },
+            ),
             MenuSeparator(),
             MenuAction(
               title: 'share'.tr(),
@@ -422,6 +436,7 @@ class PostItem extends HookConsumerWidget {
                 MarkdownTextContent(
                   content: translatedText.value!,
                   isSelectable: isTextSelectable,
+                  attachments: item.attachments,
                 ),
               ],
             )
@@ -536,6 +551,12 @@ class PostItem extends HookConsumerWidget {
           translationSection: translationSection,
           renderingPadding: renderingPadding,
         ),
+        if (item.embedView != null)
+          EmbedViewRenderer(
+            embedView: item.embedView!,
+            maxHeight: 400,
+            borderRadius: BorderRadius.circular(12),
+          ).padding(horizontal: renderingPadding.horizontal, vertical: 8),
         if (isShowReference)
           ReferencedPostWidget(item: item, renderingPadding: renderingPadding),
         if (item.repliesCount > 0 && isEmbedReply)

lib/widgets/post/post_shared.dart

@@ -141,6 +141,7 @@ class PostReplyPreview extends HookConsumerWidget {
                               Expanded(
                                 child: MarkdownTextContent(
                                   content: post.content!,
+                                  attachments: post.attachments,
                                 ).padding(top: 2),
                               )
                             else
@@ -210,6 +211,7 @@ class PostReplyPreview extends HookConsumerWidget {
                         Expanded(
                           child: MarkdownTextContent(
                             content: data.value!.content!,
+                            attachments: data.value!.attachments,
                           ),
                         )
                       else
@@ -745,7 +747,10 @@ class PostBody extends ConsumerWidget {
                     style: Theme.of(context).textTheme.bodyMedium,
                   )
                 else
-                  MarkdownTextContent(content: '${item.content!}...'),
+                  MarkdownTextContent(
+                    content: '${item.content!}...',
+                    attachments: item.attachments,
+                  ),
               ],
             ),
           )
@@ -784,6 +789,7 @@ class PostBody extends ConsumerWidget {
                           ? '${item.content!}...'
                           : item.content ?? '',
                   isSelectable: isTextSelectable,
+                  attachments: item.attachments,
                 ),
                 if (translationSection != null) translationSection!,
               ],
@@ -900,6 +906,7 @@ class PostBody extends ConsumerWidget {
                               poll: SnPollWithStats.fromJson(embedData['poll']),
                               onSubmit: (_) {},
                               isReadonly: !isInteractive,
+                              isInitiallyExpanded: isFullPost,
                             ).padding(horizontal: 16, vertical: 12),
                   ),
                   _ => Text('Unable show embed: ${embedData['type']}'),

pubspec.lock

@@ -50,7 +50,7 @@ packages:
     source: hosted
     version: "2.0.3"
   archive:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: archive
       sha256: "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd"
@@ -485,10 +485,10 @@ packages:
     dependency: "direct main"
     description:
       name: drift_flutter
-      sha256: ccfb42bc942e59f81500b16228df59cf8eb40d2fbd96637ff677df923350af7b
+      sha256: b52bd710f809db11e25259d429d799d034ba1c5224ce6a73fe8419feb980d44c
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.5"
+    version: "0.2.6"
   dropdown_button2:
     dependency: "direct main"
     description:
@@ -1789,6 +1789,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.0"
+  pausable_timer:
+    dependency: transitive
+    description:
+      name: pausable_timer
+      sha256: "6ef1a95441ec3439de6fb63f39a011b67e693198e7dae14e20675c3c00e86074"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.0+3"
   petitparser:
     dependency: transitive
     description:
@@ -1877,6 +1885,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.0.3"
+  process_run:
+    dependency: "direct main"
+    description:
+      name: process_run
+      sha256: "6ec839cdd3e6de4685318e7686cd4abb523c3d3a55af0e8d32a12ae19bc66622"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.4"
   protobuf:
     dependency: transitive
     description:
@@ -2190,7 +2206,7 @@ packages:
     source: hosted
     version: "2.4.1"
   shelf:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: shelf
       sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12
@@ -2198,7 +2214,7 @@ packages:
     source: hosted
     version: "1.4.2"
   shelf_web_socket:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: shelf_web_socket
       sha256: "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925"
@@ -2250,6 +2266,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  slide_countdown:
+    dependency: "direct main"
+    description:
+      name: slide_countdown
+      sha256: "363914f96389502467d4dc9c0f26e88f93df3d8e37de2d5ff05b16d981fe973d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
   source_gen:
     dependency: transitive
     description:
@@ -2677,7 +2701,7 @@ packages:
     source: hosted
     version: "3.4.0"
   wakelock_plus:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: wakelock_plus
       sha256: a474e314c3e8fb5adef1f9ae2d247e57467ad557fa7483a2b895bc1b421c5678
@@ -2736,10 +2760,10 @@ packages:
     dependency: transitive
     description:
       name: webrtc_interface
-      sha256: "86fe3afc81a08481dfb25cf14a5a94e27062ecef25544783f352c914e0bbc1ca"
+      sha256: "2e604a31703ad26781782fb14fa8a4ee621154ee2c513d2b9938e486fa695233"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.2+hotfix.2"
+    version: "1.3.0"
   win32:
     dependency: transitive
     description:

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 3.2.0+129
+version: 3.2.0+132
 
 environment:
   sdk: ^3.7.2
@@ -85,7 +85,7 @@ dependencies:
   web_socket_channel: ^3.0.3
   material_symbols_icons: ^4.2872.0
   drift: ^2.28.1
-  drift_flutter: ^0.2.5
+  drift_flutter: ^0.2.6
   path: ^1.9.1
   collection: ^1.19.1
   markdown_editor_plus: ^0.2.15
@@ -132,6 +132,8 @@ dependencies:
   flutter_typeahead: ^5.2.0
   waveform_flutter: ^1.2.0
   flutter_app_update: ^3.2.2
+  archive: ^4.0.7
+  process_run: ^1.2.4
   firebase_crashlytics: ^5.0.1
   firebase_analytics: ^12.0.1
   material_color_utilities: ^0.11.1
@@ -141,6 +143,10 @@ dependencies:
   tray_manager: ^0.5.1
   flutter_webrtc: ^1.1.0
   flutter_local_notifications: ^19.4.1
+  wakelock_plus: ^1.3.2
+  slide_countdown: ^2.0.2
+  shelf: ^1.4.2
+  shelf_web_socket: ^3.0.0
 
 dev_dependencies:
   flutter_test: