🚀 Launch 3.2.0+133

✨ Seprate uploading action in chat
✨ File uploader
2025-09-24 19:30:36 +08:00 · 2025-09-24 16:53:32 +08:00 · 2025-09-24 16:45:24 +08:00 · 2025-09-24 16:16:21 +08:00 · 2025-09-24 16:09:40 +08:00 · 2025-09-24 15:56:56 +08:00
266 changed files with 29756 additions and 7380 deletions
--- a/README.md
+++ b/README.md
@@ -62,4 +62,3 @@ If you want to build the release version, use the flutter build command. Learn m
 ```bash
 flutter build <platform>
 ```
-
--- a/android/app/build.gradle.kts
+++ b/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")
--- a/android/app/src/main/res/drawable/ic_notification.png
+++ b/android/app/src/main/res/drawable/ic_notification.png
--- a/android/app/src/main/res/drawable/ic_notification.xml
+++ b/android/app/src/main/res/drawable/ic_notification.xml
@@ -0,0 +1,41 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="192dp"
+    android:height="192dp"
+    android:viewportWidth="192"
+    android:viewportHeight="192">
+  <path
+      android:pathData="M54,147h86"
+      android:strokeLineJoin="round"
+      android:strokeWidth="12"
+      android:fillColor="#00000000"
+      android:strokeColor="#000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M57,111s-2,-4.5 -2,-10m22,22s-4,7 -11,4m9,-22s-2,-4.5 -2,-10"
+      android:strokeLineJoin="round"
+      android:strokeWidth="10"
+      android:fillColor="#00000000"
+      android:strokeColor="#000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M54,147a32,32 0,0 1,-12 -61.67A39,39 0,0 1,81 46m59,101a30,30 0,0 0,29.93 -28"
+      android:strokeLineJoin="round"
+      android:strokeWidth="12"
+      android:fillColor="#00000000"
+      android:strokeColor="#000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M132,75m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="8"
+      android:fillColor="#00000000"
+      android:strokeColor="#000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M112.5,41.22C100.84,47.96 93,60.56 93,75c0,6.38 1.53,12.39 4.24,17.71m69.51,-35.42A38.84,38.84 0,0 1,171 75c0,14.43 -7.84,27.03 -19.49,33.78m-0.79,-43.32A20.9,20.9 0,0 1,153 75c0,7.77 -4.22,14.56 -10.49,18.19m-21,-36.38C115.22,60.44 111,67.23 111,75a20.9,20.9 0,0 0,2.28 9.53"
+      android:strokeLineJoin="round"
+      android:strokeWidth="10"
+      android:fillColor="#00000000"
+      android:strokeColor="#000"
+      android:strokeLineCap="round"/>
+</vector>
--- a/assets/i18n/en-US.json
+++ b/assets/i18n/en-US.json
@@ -30,6 +30,8 @@
  "fieldEmailAddressMustBeValid": "The email address must be valid.",
  "logout": "Logout",
  "updateYourProfile": "Profile Settings",
+  "settingsDefaultPool": "Default file pool",
+  "settingsDefaultPoolHelper": "Select the default storage pool for file uploads",
  "accountBasicInfo": "Basic Info",
  "accountProfile": "Your Profile",
  "saveChanges": "Save Changes",
@@ -133,6 +135,25 @@
    "other": "{} replies"
  },
  "forward": "Forward",
+  "award": "Award",
+  "awardPost": "Award Post",
+  "awardMessage": "Message",
+  "awardMessageHint": "Enter your award message...",
+  "awardAttitude": "Attitude",
+  "awardAttitudePositive": "Positive",
+  "awardAttitudeNegative": "Negative",
+  "awardAmount": "Amount",
+  "awardAmountHint": "Enter amount...",
+  "awardAmountRequired": "Amount is required",
+  "awardAmountInvalid": "Please enter a valid amount",
+  "awardMessageTooLong": "Message is too long (max 4096 characters)",
+  "awardSuccess": "Award sent successfully!",
+  "awardSubmit": "Award",
+  "awardPostPreview": "Post Preview",
+  "awardNoContent": "No content available",
+  "awardByPublisher": "By {}",
+  "awardBenefits": "Award Benefits",
+  "awardBenefitsDescription": "Awarding this post increases its value and visibility. Higher valued posts have a better chance of being featured and highlighted in the community.",
  "repliedTo": "Replied to",
  "forwarded": "Forwarded",
  "hasAttachments": {
@@ -149,6 +170,7 @@
  "addPhoto": "Add photo",
  "addAudio": "Add audio",
  "addFile": "Add file",
+  "uploadFile": "Upload File",
  "recordAudio": "Record Audio",
  "linkAttachment": "Link Attachment",
  "fileIdCannotBeEmpty": "File ID cannot be empty",
@@ -195,6 +217,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 +251,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",
@@ -311,6 +336,18 @@
  "levelingProgress": "Leveling Progress",
  "levelingProgressExperience": "{} EXP",
  "levelingProgressLevel": "Level {}",
+  "levelingStage1": "Novice",
+  "levelingStage2": "Apprentice",
+  "levelingStage3": "Journeyman",
+  "levelingStage4": "Adept",
+  "levelingStage5": "Expert",
+  "levelingStage6": "Master",
+  "levelingStage7": "Grandmaster",
+  "levelingStage8": "Legend",
+  "levelingStage9": "Myth",
+  "levelingStage10": "Immortal",
+  "levelingStage11": "Divine",
+  "levelingStage12": "Transcendent",
  "fileUploadingProgress": "Uploading file #{}: {}%",
  "removeChatMember": "Remove Chat Room Member",
  "removeChatMemberHint": "Are you sure to remove this member from the room?",
@@ -334,9 +371,11 @@
  "walletCreate": "Create a Wallet",
  "settingsServerUrl": "Server URL",
  "settingsApplied": "The settings has been applied.",
+  "settingsCustomFontsHelper": "Use comma to seprate.",
  "notifications": "Notifications",
  "posts": "Posts",
  "settingsBackgroundImage": "Background Image",
+  "settingsBackgroundImageEnable": "Show Background Image",
  "settingsBackgroundImageClear": "Clear Background Image",
  "settingsBackgroundGenerateColor": "Generate color scheme from Bacground Image",
  "messageNone": "No content to display",
@@ -347,6 +386,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",
@@ -385,6 +426,7 @@
  "postSettings": "Settings",
  "postPublisherUnselected": "Publisher Unspecified",
  "postType": "Post Type",
+  "postTypePost": "Post",
  "articleAttachmentHint": "Attachments must be uploaded and inserted into the article body to be visible.",
  "postVisibility": "Post Visibility",
  "postVisibilityPublic": "Public",
@@ -420,6 +462,8 @@
  "lastActiveAt": "Last active at {}",
  "authDeviceLogout": "Logout",
  "authDeviceLogoutHint": "Are you sure you want to logout this device? This will also disable the push notification to this device.",
+  "authDeviceChallenges": "Device Usage",
+  "authDeviceHint": "Swipe left to edit label, swipe right to logout device.",
  "typingHint": {
    "one": "{} is typing...",
    "other": "{} are typing..."
@@ -441,9 +485,12 @@
  "settingsKeyboardShortcutSettings": "Settings",
  "settingsKeyboardShortcutNewMessage": "New Message",
  "settingsKeyboardShortcutCloseDialog": "Close Dialog",
+  "settingsMessageDisplayStyle": "Message Display Style",
  "close": "Close",
  "drafts": "Drafts",
  "noDrafts": "No drafts yet",
+  "searchDrafts": "Search drafts...",
+  "noSearchResults": "No search results",
  "articleDrafts": "Article drafts",
  "postDrafts": "Post drafts",
  "saveDraft": "Save draft",
@@ -490,6 +537,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",
@@ -632,8 +683,9 @@
  "chatJoin": "Join the Chat",
  "realmJoin": "Join the Realm",
  "realmJoinSuccess": "Successfully joined the realm.",
-  "discoverRealms": "Discover realms",
-  "discoverPublishers": "Discover publishers",
+  "discoverRealms": "Realms",
+  "discoverPublishers": "Publishers",
+  "discoverShuffledPost": "Random Posts",
  "search": "Search",
  "publisherMembers": "Collaborators",
  "developerHub": "Developer Hub",
@@ -642,6 +694,18 @@
  "enrollDeveloperHint": "Enroll one of your publishers to become a developer.",
  "noPublishersToEnroll": "You don't have any publishers that can be enrolled as a developer.",
  "totalCustomApps": "Total Custom Apps",
+  "projects": "Projects",
+  "noProjects": "No projects found.",
+  "deleteProject": "Delete Project",
+  "deleteProjectHint": "Are you sure you want to delete this project? This action cannot be undone.",
+  "createProject": "Create Project",
+  "editProject": "Edit Project",
+  "projectDetails": "Project Details",
+  "createBot": "Create Bot",
+  "bots": "Bots",
+  "noBots": "No bots yet.",
+  "deleteBotHint": "Are you sure you want to delete this bot? This action cannot be undone.",
+  "deleteBot": "Delete Bot",
  "customApps": "Custom Apps",
  "noCustomApps": "No custom apps yet.",
  "createCustomApp": "Create Custom App",
@@ -679,7 +743,7 @@
  "publisherFeatureDevelopDescription": "Unlock development abilities for your publisher, including custom apps, API keys, and more.",
  "publisherFeatureDevelopHint": "Currently, this feature is under active development, you need send a request to unlock this feature.",
  "learnMore": "Learn More",
-  "discoverWebArticles": "Articles from external sites",
+  "discoverWebArticles": "Web Feed Articles",
  "webArticlesStand": "Article Stand",
  "about": "About",
  "membershipCancel": "Cancel Membership",
@@ -836,5 +900,167 @@
  "pollAddOption": "Add option",
  "pollOptionLabel": "Option label",
  "pollLongTextAnswerPreview": "Long text answer (preview)",
-  "pollShortTextAnswerPreview": "Short text answer (preview)"
+  "pollShortTextAnswerPreview": "Short text answer (preview)",
+  "messageJumpNotLoaded": "The referenced message was not loaded, unable to jump to it.",
+  "postUnlinkRealm": "No linked realm",
+  "postSlug": "Slug",
+  "postSlugHint": "The slug can be used to access your post via URL in the webpage, it should be publisher-wide unique.",
+  "attachmentOnDevice": "On-device",
+  "attachmentOnCloud": "On-cloud",
+  "attachments": "Attachments",
+  "uploadAttachment": "Upload Attachment",
+  "attachmentPreview": "Attachment Preview",
+  "selectPool": "Select Pool",
+  "choosePool": "Choose a pool",
+  "errorLoadingPools": "Error loading pools",
+  "quotaCostInfo": "This upload will cost {} quota points",
+  "uploadConstraints": "Upload Constraints",
+  "fileSizeExceeded": "File size exceeds the maximum limit of {}",
+  "fileTypeNotAccepted": "File type is not accepted by this pool",
+  "publisherCollabInvitation": "Collabration invitations",
+  "publisherCollabInvitationCount": {
+    "zero": "No invitation",
+    "one": "{} available invitation",
+    "other": "{} available invitations"
+  },
+  "failedToLoadUserInfo": "Failed to load user info",
+  "failedToLoadUserInfoNetwork": "It seems be network issue, you can tap the button below to try again.",
+  "failedToLoadUserInfoUnauthorized": "It seems your session has been logged out or not available anymore, you can still try agian to fetch the user info if you want.",
+  "okay": "Okay",
+  "postDetail": "Post Detail",
+  "postCount": {
+    "zero": "No posts",
+    "one": "{} post",
+    "other": "{} posts"
+  },
+  "mimeType": "MIME Type",
+  "fileSize": "File Size",
+  "fileHash": "File Hash",
+  "exifData": "EXIF Data",
+  "postShuffle": "Shuffle Posts",
+  "leveling": "Leveling",
+  "levelingHistory": "Leveling History",
+  "stellarProgram": "Stellar Program",
+  "socialCredits": "Social Credits",
+  "credits": "Credits",
+  "creditsStatus": "Credits Status",
+  "socialCreditsDescription": "Social Credit is a way for Solar Network to evaluate users. It is calculated based on their behavior and interactions. With a base score of 100, higher scores indicate a user's credibility within the community. Scores change over time to reflect a user's recent behavior. Users with higher credit ratings enjoy more benefits, while users with lower credit ratings may have some functionality restricted.",
+  "socialCreditsLevelPoor": "Poor",
+  "socialCreditsLevelNormal": "Normal",
+  "socialCreditsLevelGood": "Good",
+  "socialCreditsLevelExcellent": "Excellent",
+  "orderByPopularity": "Sort by popularity",
+  "orderByReleaseDate": "Sort by release date",
+  "editBot": "Edit Bot",
+  "botAutomatedBy": "Automated by {}",
+  "botDetails": "Bot Details",
+  "overview": "Overview",
+  "keys": "Keys",
+  "botNotFound": "Bot not found.",
+  "newBotKey": "New Bot Key",
+  "newBotKeyHint": "Enter a name for your new key. The key will be shown only once.",
+  "revokeBotKey": "Revoke Bot Key",
+  "revokeBotKeyHint": "Are you sure you want to revoke this key? This action cannot be undone and any application using this key will stop working.",
+  "noBotKeys": "No bot keys yet.",
+  "revoke": "Revoke",
+  "keyName": "Key Name",
+  "newKeyGenerated": "New Key Generated",
+  "copyKeyHint": "Please copy this key and store it somewhere safe. You will not be able to see it again.",
+  "rotateKey": "Rotate Key",
+  "rotateBotKey": "Rotate Bot Key",
+  "rotateBotKeyHint": "Are you sure you want to rotate this key? The old key will become invalid immediately. This action cannot be undone.",
+  "webFeedArticleCount": {
+    "zero": "No articles",
+    "one": "{} article",
+    "other": "{} articles"
+  },
+  "webFeedSubscribed": "The feed has been subscribed",
+  "webFeedUnsubscribed": "The feed has been unsubscribed",
+  "appDetails": "App Details",
+  "secrets": "Secrets",
+  "appNotFound": "App not found.",
+  "secretCopied": "Secret copied to clipboard.",
+  "deleteSecret": "Delete Secret",
+  "deleteSecretHint": "Are you sure you want to delete this secret? This action cannot be undone.",
+  "generateSecret": "Generate New Secret",
+  "createdAt": "Created at {}",
+  "newSecretGenerated": "New Secret Generated",
+  "copySecretHint": "Please copy this secret and store it somewhere safe. You will not be able to see it again.",
+  "expiresIn": "Expires In (seconds)",
+  "isOidc": "OIDC Compliant",
+  "pinPost": "Pin Post",
+  "unpinPost": "Unpin Post",
+  "pinnedPost": "Pinned",
+  "publisherPage": "Publisher Page",
+  "realmPage": "Realm Page",
+  "replyPage": "Reply Page",
+  "pinPostPublisherHint": "Pin this post to your publisher page",
+  "pinPostRealmHint": "Pin this post to the realm page",
+  "pinPostRealmDisabledHint": "This post doesn't belong to any realm",
+  "pinPostReplyHint": "Pin this post to the reply page",
+  "pinPostReplyDisabledHint": "This post is not a reply",
+  "pin": "Pin",
+  "unpinPostHint": "Are you sure you want to unpin this post?",
+  "all": "All",
+  "statusPresent": "Present",
+  "accountAutomated": "Automated",
+  "chatBreakClearButton": "Clear",
+  "chatBreak5m": "5m",
+  "chatBreak10m": "10m",
+  "chatBreak15m": "15m",
+  "chatBreak30m": "30m",
+  "chatBreakCustomMinutes": "Custom (minutes)",
+  "errorGeneric": "Error: {}",
+  "searchMessages": "Search Messages",
+  "messagesCount": "{} messages",
+  "dotSeparator": "·",
+  "roleValidationHint": "Role must be between 0 and 100",
+  "searchMessagesHint": "Search messages...",
+  "searchLinks": "Links",
+  "searchAttachments": "Attachments",
+  "noMessagesFound": "No messages found",
+  "openInBrowser": "Open in Browser",
+  "highlightPost": "Highlight Post",
+  "filters": "Filters",
+  "apply": "Apply",
+  "pubName": "Pub Name",
+  "realm": "Realm",
+  "shuffle": "Shuffle",
+  "pinned": "Pinned",
+  "noResultsFound": "No results found",
+  "toggleFilters": "Toggle filters",
+  "notableDayNext": "{} is in",
+  "expandPoll": "Expand Poll",
+  "collapsePoll": "Collapse Poll",
+  "embedView": "Embed View",
+  "auto": "Auto",
+  "manual": "Manual",
+  "iframeCode": "Iframe Code",
+  "iframeCodeHint": "<iframe src=\"...\" width=\"...\" height=\"...\">",
+  "parseIframe": "Parse Iframe",
+  "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",
+  "messageActions": "Message Actions",
+  "viewEmbedLoadHint": "Tap to load",
+  "files": "Files",
+  "confirmDeleteFile": "Are you sure you want to delete this file?",
+  "deleteFile": "Delete File",
+  "failedToDeleteFile": "Failed to delete file",
+  "drive": "Drive",
+  "allPools": "All Pools",
+  "includeRecycled": "Include Recycled",
+  "confirmDeleteRecycledFiles": "Are you sure you want to delete all recycled files?",
+  "deleteRecycledFiles": "Delete Recycled Files",
+  "recycledFilesDeleted": "Recycled files deleted successfully",
+  "failedToDeleteRecycledFiles": "Failed to delete recycled files",
+  "upload": "Upload"
 }
--- a/assets/i18n/zh-CN.json
+++ b/assets/i18n/zh-CN.json
@@ -122,6 +122,9 @@
  "addVideo": "添加视频",
  "addPhoto": "添加照片",
  "addFile": "添加文件",
+  "uploadFile": "上传文件",
+  "settingsDefaultPool": "选择文件池",
+  "settingsDefaultPoolHelper": "为文件上传选择一个默认池",
  "createDirectMessage": "创建新私人消息",
  "gotoDirectMessage": "前往私信",
  "react": "反应",
@@ -158,11 +161,12 @@
  "checkIn": "签到",
  "checkInNone": "尚未签到",
  "checkInNoneHint": "通过签到获取您的财富提示和每日奖励。",
-    "checkInResultLevel0": "最差运气",
-    "checkInResultLevel1": "坏运气",
-    "checkInResultLevel2": "一个普通的日常",
-    "checkInResultLevel3": "好运",
-    "checkInResultLevel4": "最佳运气",
+  "checkInResultLevel0": "大凶",
+  "checkInResultLevel1": "凶",
+  "checkInResultLevel2": "中平",
+  "checkInResultLevel3": "吉",
+  "checkInResultLevel4": "大吉",
+  "checkInResultLevel5": "生日快乐 🥳",
  "checkInActivityTitle": "{} 在 {} 签到并获得了 {}",
  "eventCalander": "活动日历",
  "eventCalanderEmpty": "该日无活动。",
@@ -279,6 +283,18 @@
  "levelingProgress": "等级进度",
  "levelingProgressExperience": "{} 经验值",
  "levelingProgressLevel": "等级 {}",
+  "levelingStage1": "新手",
+  "levelingStage2": "学徒",
+  "levelingStage3": "熟练工",
+  "levelingStage4": "行家",
+  "levelingStage5": "专家",
+  "levelingStage6": "大师",
+  "levelingStage7": "宗师",
+  "levelingStage8": "传奇",
+  "levelingStage9": "神话",
+  "levelingStage10": "不朽",
+  "levelingStage11": "神圣",
+  "levelingStage12": "超凡",
  "fileUploadingProgress": "正在上传文件 #{}: {}%",
  "removeChatMember": "移除聊天室成员",
  "removeChatMemberHint": "确定要将此成员从聊天室中移除吗？",
@@ -300,9 +316,11 @@
  "walletCreate": "创建钱包",
  "settingsServerUrl": "服务器 URL",
  "settingsApplied": "设置已应用。",
+  "settingsCustomFontsHelper": "用逗号分隔。",
  "notifications": "通知",
  "posts": "帖子",
  "settingsBackgroundImage": "背景图片",
+  "settingsBackgroundImageEnable": "显示背景图片",
  "settingsBackgroundImageClear": "清除背景图片",
  "settingsBackgroundGenerateColor": "从背景图像生成主题色",
  "messageNone": "没有内容可显示",
@@ -313,6 +331,8 @@
  "chatBreakNone": "无",
  "settingsRealmCompactView": "紧凑领域视图",
  "settingsMixedFeed": "混合动态",
+  "settingsDataSavingMode": "流量节省模式",
+  "dataSavingHint": "流量节省模式",
  "settingsAutoTranslate": "自动翻译",
  "settingsHideBottomNav": "隐藏底部导航",
  "settingsSoundEffects": "音效",
@@ -344,7 +364,7 @@
  "accountSettingsHelpContent": "此页面允许您管理您的帐户安全性、隐私和其他设置。如果您需要帮助，请联系管理员。",
  "unauthorized": "未授权",
  "unauthorizedHint": "您未登录或会话已过期，请重新登录。",
-    "publisherBelongsTo": "属于",
+  "publisherBelongsTo": "属于 {}",
  "postContent": "内容",
  "postSettings": "设置",
  "postPublisherUnselected": "未指定发布者",
@@ -811,5 +831,53 @@
  "filesListAdditional": {
    "one": "+{} 个文件被折叠",
    "other": "+{} 个文件被折叠"
-    }
+  },
+  "messageJumpNotLoaded": "引用的消息没有被加载，无法跳转。",
+  "postUnlinkRealm": "不关联领域",
+  "postSlug": "别名",
+  "postSlugHint": "这个别名可以用于在网页通过 URL 浏览到你的帖子，它应该在同一发布者中是唯一。",
+  "attachmentOnDevice": "离线",
+  "attachmentOnCloud": "在线",
+  "publisherCollabInvitation": "协作邀请",
+  "publisherCollabInvitationCount": {
+    "zero": "无邀请",
+    "one": "{} 个可用邀请",
+    "other": "{} 个可用邀请"
+  },
+  "failedToLoadUserInfo": "加载用户信息失败",
+  "failedToLoadUserInfoNetwork": "这看起来是个网络问题，你可以按下面的按钮来重试",
+  "failedToLoadUserInfoUnauthorized": "看来您的会话已被注销或不再可用，如果您愿意，您仍然可以再次尝试获取用户信息。",
+  "okay": "了解",
+  "postDetail": "帖子详情",
+  "mimeType": "类型",
+  "fileSize": "大小",
+  "fileHash": "哈希",
+  "exifData": "EXIF 数据",
+  "leveling": "等级",
+  "levelingHistory": "经验记录",
+  "stellarProgram": "恒星计划",
+  "socialCredits": "社会信用点",
+  "credits": "信用",
+  "socialCreditsDescription": "社会信用是 Solar Network 评价用户的一种方式。它基于用户的行为和互动来计算。以 100 分为基准，分数越高表示用户在社区中的信誉越好。分数会随着时间的推移而变化，反映用户的最新行为。信用等级高的用户可以享受到更多的福利，反之的用户部份功能可能受到限制。",
+  "socialCreditsLevelPoor": "糟糕",
+  "socialCreditsLevelNormal": "正常",
+  "socialCreditsLevelGood": "良好",
+  "socialCreditsLevelExcellent": "优秀",
+  "appDetails": "应用详情",
+  "secrets": "密钥",
+  "appNotFound": "应用未找到。",
+  "secretCopied": "密钥已复制到剪贴板。",
+  "deleteSecret": "删除密钥",
+  "deleteSecretHint": "您确定要删除此密钥吗？此操作无法撤销。",
+  "generateSecret": "生成新密钥",
+  "createdAt": "创建于 {}",
+  "newSecretGenerated": "已生成新密钥",
+  "copySecretHint": "请复制此密钥并将其存放在安全的地方。您将无法再次看到它。",
+  "expiresIn": "过期时间（秒）",
+  "isOidc": "OIDC 兼容",
+  "statusPresent": "至今",
+  "accountAutomated": "机器人",
+  "openInBrowser": "在浏览器中打开",
+  "highlightPost": "精选帖子",
+  "notableDayNext": "距离 {} 还有"
 }
--- a/assets/i18n/zh-TW.json
+++ b/assets/i18n/zh-TW.json
@@ -122,6 +122,10 @@
    "addVideo": "添加視頻",
    "addPhoto": "添加照片",
    "addFile": "添加文件",
+    "uploadFile": "上傳文件",
+    "settingsDefaultPool": "選擇文件池",
+    "settingsDefaultPoolHelper": "爲文件上傳選擇一個默認池",
+ 
    "createDirectMessage": "創建新私人消息",
    "gotoDirectMessage": "前往私信",
    "react": "反應",
@@ -303,6 +307,7 @@
    "notifications": "通知",
    "posts": "帖子",
    "settingsBackgroundImage": "背景圖片",
+  "settingsBackgroundImageEnable": "顯示背景圖片",
  "settingsBackgroundImageClear": "清除背景圖片",
    "settingsBackgroundGenerateColor": "從背景圖像生成主題色",
    "messageNone": "沒有內容可顯示",
@@ -314,6 +319,8 @@
    "settingsRealmCompactView": "緊湊領域視圖",
    "settingsMixedFeed": "混合動態",
    "settingsAutoTranslate": "自動翻譯",
+    "settingsDataSavingMode": "低數據模式",
+    "dataSavingHint": "低數據模式",
    "settingsHideBottomNav": "隱藏底部導航",
    "settingsSoundEffects": "音效",
    "settingsAprilFoolFeatures": "愚人節功能",
@@ -811,5 +818,17 @@
    "filesListAdditional": {
        "one": "+{} 個文件被摺疊",
        "other": "+{} 個文件被摺疊"
-    }
+    },
+    "appDetails": "應用程式詳情",
+    "secrets": "密鑰",
+    "appNotFound": "找不到應用程式。",
+    "secretCopied": "密鑰已複製到剪貼簿。",
+    "deleteSecret": "刪除密鑰",
+    "deleteSecretHint": "您確定要刪除此密鑰嗎？此操作無法復原。",
+    "generateSecret": "產生新密鑰",
+    "createdAt": "建立於 {}",
+    "newSecretGenerated": "已產生新密鑰",
+    "copySecretHint": "請複製此密鑰並將其存放在安全的地方。您將無法再次看到它。",
+    "expiresIn": "過期時間（秒）",
+    "isOidc": "OIDC 相容"
 }
--- a/assets/icons/icon-outline.svg
+++ b/assets/icons/icon-outline.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="192" height="192" fill="none">
+    <path stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="12"
+        d="M54 147h86" />
+    <path stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="10"
+        d="M57 111s-2-4.5-2-10m22 22s-4 7-11 4m9-22s-2-4.5-2-10" />
+    <path stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="12"
+        d="M54 147a32 32 0 0 1-11.999-61.665A39 39 0 0 1 81 46m59 101a30 30 0 0 0 29.933-28" />
+    <circle cx="132" cy="75" r="4" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"
+        stroke-width="8" />
+    <path stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="10"
+        d="M112.5 41.217C100.843 47.961 93 60.564 93 75c0 6.375 1.53 12.393 4.242 17.707m69.513-35.419A38.84 38.84 0 0 1 171 75c0 14.433-7.84 27.034-19.493 33.779m-.793-43.317A20.9 20.9 0 0 1 153 75c0 7.77-4.221 14.556-10.495 18.188m-21.003-36.38C115.224 60.44 111 67.226 111 75a20.9 20.9 0 0 0 2.284 9.533" />
+</svg>
--- a/assets/images/media-offline.jpg
+++ b/assets/images/media-offline.jpg
--- a/assets/images/stickers/angry.png
+++ b/assets/images/stickers/angry.png
--- a/assets/images/stickers/clap.png
+++ b/assets/images/stickers/clap.png
--- a/assets/images/stickers/confuse.png
+++ b/assets/images/stickers/confuse.png
--- a/assets/images/stickers/party.png
+++ b/assets/images/stickers/party.png
--- a/assets/images/stickers/pray.png
+++ b/assets/images/stickers/pray.png
--- a/assets/images/stickers/thumb_up.png
+++ b/assets/images/stickers/thumb_up.png
--- a/build.yaml
+++ b/build.yaml
@@ -5,3 +5,7 @@ targets:
        options:
          explicit_to_json: true
          field_rename: snake
+      drift_dev:
+        options:
+          databases:
+            app_database: lib/database/drift_db.dart
--- a/drift_schemas/app_database/drift_schema_v6.json
+++ b/drift_schemas/app_database/drift_schema_v6.json
--- a/ios/Flutter/AppFrameworkInfo.plist
+++ b/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
  <key>CFBundleVersion</key>
  <string>1.0</string>
  <key>MinimumOSVersion</key>
-  <string>12.0</string>
+  <string>13.0</string>
 </dict>
 </plist>
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -40,83 +40,85 @@ PODS:
  - file_picker (0.0.1):
    - DKImagePickerController/PhotoGallery
    - Flutter
-  - Firebase/CoreOnly (12.0.0):
-    - FirebaseCore (~> 12.0.0)
-  - Firebase/Crashlytics (12.0.0):
+  - file_saver (0.0.1):
+    - Flutter
+  - Firebase/CoreOnly (12.2.0):
+    - FirebaseCore (~> 12.2.0)
+  - Firebase/Crashlytics (12.2.0):
    - Firebase/CoreOnly
-    - FirebaseCrashlytics (~> 12.0.0)
-  - Firebase/Messaging (12.0.0):
+    - FirebaseCrashlytics (~> 12.2.0)
+  - Firebase/Messaging (12.2.0):
    - Firebase/CoreOnly
-    - FirebaseMessaging (~> 12.0.0)
-  - firebase_analytics (12.0.0):
+    - FirebaseMessaging (~> 12.2.0)
+  - firebase_analytics (12.0.1):
    - firebase_core
-    - FirebaseAnalytics (= 12.0.0)
+    - FirebaseAnalytics (= 12.2.0)
    - Flutter
-  - firebase_core (4.0.0):
-    - Firebase/CoreOnly (= 12.0.0)
+  - firebase_core (4.1.0):
+    - Firebase/CoreOnly (= 12.2.0)
    - Flutter
-  - firebase_crashlytics (5.0.0):
-    - Firebase/Crashlytics (= 12.0.0)
+  - firebase_crashlytics (5.0.1):
+    - Firebase/Crashlytics (= 12.2.0)
    - firebase_core
    - Flutter
-  - firebase_messaging (16.0.0):
-    - Firebase/Messaging (= 12.0.0)
+  - firebase_messaging (16.0.1):
+    - Firebase/Messaging (= 12.2.0)
    - firebase_core
    - Flutter
-  - FirebaseAnalytics (12.0.0):
-    - FirebaseAnalytics/Default (= 12.0.0)
-    - FirebaseCore (~> 12.0.0)
-    - FirebaseInstallations (~> 12.0.0)
+  - FirebaseAnalytics (12.2.0):
+    - FirebaseAnalytics/Default (= 12.2.0)
+    - FirebaseCore (~> 12.2.0)
+    - FirebaseInstallations (~> 12.2.0)
    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
    - GoogleUtilities/MethodSwizzler (~> 8.1)
    - GoogleUtilities/Network (~> 8.1)
    - "GoogleUtilities/NSData+zlib (~> 8.1)"
    - nanopb (~> 3.30910.0)
-  - FirebaseAnalytics/Default (12.0.0):
-    - FirebaseCore (~> 12.0.0)
-    - FirebaseInstallations (~> 12.0.0)
-    - GoogleAppMeasurement/Default (= 12.0.0)
+  - FirebaseAnalytics/Default (12.2.0):
+    - FirebaseCore (~> 12.2.0)
+    - FirebaseInstallations (~> 12.2.0)
+    - GoogleAppMeasurement/Default (= 12.2.0)
    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
    - GoogleUtilities/MethodSwizzler (~> 8.1)
    - GoogleUtilities/Network (~> 8.1)
    - "GoogleUtilities/NSData+zlib (~> 8.1)"
    - nanopb (~> 3.30910.0)
-  - FirebaseCore (12.0.0):
-    - FirebaseCoreInternal (~> 12.0.0)
+  - FirebaseCore (12.2.0):
+    - FirebaseCoreInternal (~> 12.2.0)
    - GoogleUtilities/Environment (~> 8.1)
    - GoogleUtilities/Logger (~> 8.1)
-  - FirebaseCoreExtension (12.0.0):
-    - FirebaseCore (~> 12.0.0)
-  - FirebaseCoreInternal (12.0.0):
+  - FirebaseCoreExtension (12.2.0):
+    - FirebaseCore (~> 12.2.0)
+  - FirebaseCoreInternal (12.2.0):
    - "GoogleUtilities/NSData+zlib (~> 8.1)"
-  - FirebaseCrashlytics (12.0.0):
-    - FirebaseCore (~> 12.0.0)
-    - FirebaseInstallations (~> 12.0.0)
-    - FirebaseRemoteConfigInterop (~> 12.0.0)
-    - FirebaseSessions (~> 12.0.0)
+  - FirebaseCrashlytics (12.2.0):
+    - FirebaseCore (~> 12.2.0)
+    - FirebaseInstallations (~> 12.2.0)
+    - FirebaseRemoteConfigInterop (~> 12.2.0)
+    - FirebaseSessions (~> 12.2.0)
    - GoogleDataTransport (~> 10.1)
    - GoogleUtilities/Environment (~> 8.1)
    - nanopb (~> 3.30910.0)
    - PromisesObjC (~> 2.4)
-  - FirebaseInstallations (12.0.0):
-    - FirebaseCore (~> 12.0.0)
+  - FirebaseInstallations (12.2.0):
+    - FirebaseCore (~> 12.2.0)
    - GoogleUtilities/Environment (~> 8.1)
    - GoogleUtilities/UserDefaults (~> 8.1)
    - PromisesObjC (~> 2.4)
-  - FirebaseMessaging (12.0.0):
-    - FirebaseCore (~> 12.0.0)
-    - FirebaseInstallations (~> 12.0.0)
+  - FirebaseMessaging (12.2.0):
+    - FirebaseCore (~> 12.2.0)
+    - FirebaseInstallations (~> 12.2.0)
    - GoogleDataTransport (~> 10.1)
    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
    - GoogleUtilities/Environment (~> 8.1)
    - GoogleUtilities/Reachability (~> 8.1)
    - GoogleUtilities/UserDefaults (~> 8.1)
    - nanopb (~> 3.30910.0)
-  - FirebaseRemoteConfigInterop (12.0.0)
-  - FirebaseSessions (12.0.0):
-    - FirebaseCore (~> 12.0.0)
-    - FirebaseCoreExtension (~> 12.0.0)
-    - FirebaseInstallations (~> 12.0.0)
+  - FirebaseRemoteConfigInterop (12.2.0)
+  - FirebaseSessions (12.2.0):
+    - FirebaseCore (~> 12.2.0)
+    - FirebaseCoreExtension (~> 12.2.0)
+    - FirebaseInstallations (~> 12.2.0)
    - GoogleDataTransport (~> 10.1)
    - GoogleUtilities/Environment (~> 8.1)
    - GoogleUtilities/UserDefaults (~> 8.1)
@@ -134,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):
@@ -145,33 +149,33 @@ PODS:
  - flutter_udid (0.0.1):
    - Flutter
    - SAMKeychain
-  - flutter_webrtc (1.0.0):
+  - flutter_webrtc (1.2.0):
    - Flutter
-    - WebRTC-SDK (= 137.7151.02)
+    - WebRTC-SDK (= 137.7151.04)
  - gal (1.0.0):
    - Flutter
    - FlutterMacOS
-  - GoogleAdsOnDeviceConversion (2.1.0):
+  - GoogleAdsOnDeviceConversion (2.3.0):
    - GoogleUtilities/Logger (~> 8.1)
    - GoogleUtilities/Network (~> 8.1)
    - nanopb (~> 3.30910.0)
-  - GoogleAppMeasurement/Core (12.0.0):
+  - GoogleAppMeasurement/Core (12.2.0):
    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
    - GoogleUtilities/MethodSwizzler (~> 8.1)
    - GoogleUtilities/Network (~> 8.1)
    - "GoogleUtilities/NSData+zlib (~> 8.1)"
    - nanopb (~> 3.30910.0)
-  - GoogleAppMeasurement/Default (12.0.0):
-    - GoogleAdsOnDeviceConversion (= 2.1.0)
-    - GoogleAppMeasurement/Core (= 12.0.0)
-    - GoogleAppMeasurement/IdentitySupport (= 12.0.0)
+  - GoogleAppMeasurement/Default (12.2.0):
+    - GoogleAdsOnDeviceConversion (= 2.3.0)
+    - GoogleAppMeasurement/Core (= 12.2.0)
+    - GoogleAppMeasurement/IdentitySupport (= 12.2.0)
    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
    - GoogleUtilities/MethodSwizzler (~> 8.1)
    - GoogleUtilities/Network (~> 8.1)
    - "GoogleUtilities/NSData+zlib (~> 8.1)"
    - nanopb (~> 3.30910.0)
-  - GoogleAppMeasurement/IdentitySupport (12.0.0):
-    - GoogleAppMeasurement/Core (= 12.0.0)
+  - GoogleAppMeasurement/IdentitySupport (12.2.0):
+    - GoogleAppMeasurement/Core (= 12.2.0)
    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
    - GoogleUtilities/MethodSwizzler (~> 8.1)
    - GoogleUtilities/Network (~> 8.1)
@@ -215,7 +219,7 @@ PODS:
  - livekit_client (2.5.0):
    - Flutter
    - flutter_webrtc
-    - WebRTC-SDK (= 137.7151.02)
+    - WebRTC-SDK (= 137.7151.04)
  - local_auth_darwin (0.0.1):
    - Flutter
    - FlutterMacOS
@@ -245,12 +249,12 @@ PODS:
    - PromisesObjC (= 2.4.0)
  - receive_sharing_intent (1.8.1):
    - Flutter
-  - record_ios (1.0.0):
+  - record_ios (1.1.0):
    - Flutter
  - SAMKeychain (1.5.3)
-  - SDWebImage (5.21.1):
-    - SDWebImage/Core (= 5.21.1)
-  - SDWebImage/Core (5.21.1)
+  - SDWebImage (5.21.2):
+    - SDWebImage/Core (= 5.21.2)
+  - SDWebImage/Core (5.21.2)
  - share_plus (0.0.1):
    - Flutter
  - shared_preferences_foundation (0.0.1):
@@ -295,7 +299,7 @@ PODS:
    - Flutter
  - wakelock_plus (0.0.1):
    - Flutter
-  - WebRTC-SDK (137.7151.02)
+  - WebRTC-SDK (137.7151.04)

 DEPENDENCIES:
  - Alamofire
@@ -303,6 +307,7 @@ DEPENDENCIES:
  - croppy (from `.symlinks/plugins/croppy/ios`)
  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
  - file_picker (from `.symlinks/plugins/file_picker/ios`)
+  - file_saver (from `.symlinks/plugins/file_saver/ios`)
  - firebase_analytics (from `.symlinks/plugins/firebase_analytics/ios`)
  - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
  - firebase_crashlytics (from `.symlinks/plugins/firebase_crashlytics/ios`)
@@ -311,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`)
@@ -381,6 +387,8 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/device_info_plus/ios"
  file_picker:
    :path: ".symlinks/plugins/file_picker/ios"
+  file_saver:
+    :path: ".symlinks/plugins/file_saver/ios"
  firebase_analytics:
    :path: ".symlinks/plugins/firebase_analytics/ios"
  firebase_core:
@@ -397,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:
@@ -464,40 +474,42 @@ SPEC CHECKSUMS:
  DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
  DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
  file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
-  Firebase: 800d487043c0557d9faed71477a38d9aafb08a41
-  firebase_analytics: cd56fc56f75c1df30a6ff5290cd56e230996a76d
-  firebase_core: 633e1851ffe1b9ab875f6467a4f574c79cef02e4
-  firebase_crashlytics: 2c6c1a17900a38081d938330e9f48e60ec5b255d
-  firebase_messaging: d17feef781edc84ebefe62624fb384358ad96361
-  FirebaseAnalytics: 6d790cd1b159b4eb61a99948df0934ce505a34f7
-  FirebaseCore: 055f4ab117d5964158c833f3d5e7ec6d91648d4a
-  FirebaseCoreExtension: 639afb3de6abd611952be78a794c54a47fa0f361
-  FirebaseCoreInternal: dedc28e569a4be85f38f3d6af1070a2e12018d55
-  FirebaseCrashlytics: db75aa0cab8d00f68406fa247c32fe17ade884d7
-  FirebaseInstallations: d4c7c958f99c8860d7fcece786314ae790e2f988
-  FirebaseMessaging: af49f8d7c0a3d2a017d9302c80946f45a7777dde
-  FirebaseRemoteConfigInterop: bfa0ea72ba3dc5af739777296424e46bd6f42613
-  FirebaseSessions: 4e784acda213108aafef536535cdfc03504acc42
-  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
+  file_saver: 6cdbcddd690cb02b0c1a0c225b37cd805c2bf8b6
+  Firebase: 26f6f8d460603af3df970ad505b16b15f5e2e9a1
+  firebase_analytics: 111ff65791a430356bd6c7e4d7339537fc6a15ae
+  firebase_core: 3ff52146406557dddd01d570e807e203ec7e1302
+  firebase_crashlytics: 3637078b718a52dc9fb4d64e37c969e86b87ff6f
+  firebase_messaging: 3dcc998dd98e1e54af75d0cccae8606eba43553c
+  FirebaseAnalytics: e04e23bc070e3014aa5cf4980f9df7ce5cd79ec8
+  FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd
+  FirebaseCoreExtension: 73af080c22a2f7b44cefa391dc08f7e4ee162cb5
+  FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b
+  FirebaseCrashlytics: f83cbf176d5c637ade108c0aacf1ccbd5ec499bf
+  FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed
+  FirebaseMessaging: 43ec73bbfedd0c385a849bb91593ab4ad4b9e48e
+  FirebaseRemoteConfigInterop: 0896fd52ab72586a355c8f389ff85aaa9e5375e1
+  FirebaseSessions: f4692789e770bec66ce17d772c0e9561c4f11737
+  Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
  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
  flutter_timezone: 7c838e17ffd4645d261e87037e5bebf6d38fe544
  flutter_udid: f7c3884e6ec2951efe4f9de082257fc77c4d15e9
-  flutter_webrtc: 6f7da106613d52ade777d5b4875a43f48c28b457
+  flutter_webrtc: c3e21fc0dcd9d8eb246ae4d5256fcbeb2f5ecd22
  gal: baecd024ebfd13c441269ca7404792a7152fde89
-  GoogleAdsOnDeviceConversion: 2be6297a4f048459e0ae17fad9bfd2844e10cf64
-  GoogleAppMeasurement: 8f6ab04ad6ae493b53fcf56bd26323fb2f1384f3
+  GoogleAdsOnDeviceConversion: 9090c435cde08903e8dd1ba2c77fbec9e46d9afe
+  GoogleAppMeasurement: 09f341dfa8527d1612a09cbfe809a242c0b737af
  GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
  GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
  image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
  irondash_engine_context: 8e58ca8e0212ee9d1c7dc6a42121849986c88486
  Kingfisher: ff0d31a1f07bdff6a1ebb3ba08b8e6e567b6500c
-  livekit_client: e3b79b99405428aac439b6b76a254cd9a11dbbfb
-  local_auth_darwin: d2e8c53ef0c4f43c646462e3415432c4dab3ae19
+  livekit_client: a6f5fa86ac28ccd7ded53626a5379961db311ab4
+  local_auth_darwin: c3ee6cce0a8d56be34c8ccb66ba31f7f180aaebb
  media_kit_libs_ios_video: 5a18affdb97d1f5d466dc79988b13eff6c5e2854
  media_kit_video: 1746e198cb697d1ffb734b1d05ec429d1fcd1474
  nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
@@ -510,9 +522,9 @@ SPEC CHECKSUMS:
  PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
  PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
  receive_sharing_intent: 222384f00ffe7e952bbfabaa9e3967cb87e5fe00
-  record_ios: fee1c924aa4879b882ebca2b4bce6011bcfc3d8b
+  record_ios: f75fa1d57f840012775c0e93a38a7f3ceea1a374
  SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
-  SDWebImage: f29024626962457f3470184232766516dee8dfea
+  SDWebImage: 9f177d83116802728e122410fb25ad88f5c7608a
  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
  sign_in_with_apple: c5dcc141574c8c54d5ac99dd2163c0c72ad22418
@@ -524,7 +536,7 @@ SPEC CHECKSUMS:
  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
  volume_controller: 3657a1f65bedb98fa41ff7dc5793537919f31b12
  wakelock_plus: e29112ab3ef0b318e58cfa5c32326458be66b556
-  WebRTC-SDK: d20de357dcbf7c9696b124b39f3ff62125107e4b
+  WebRTC-SDK: 40d4f5ba05cadff14e4db5614aec402a633f007e

 PODFILE CHECKSUM: c818292390b02fa379036ea099713a332bd7193f

--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -566,7 +566,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n";
 		};
 		4815E0A19398E51078F4160D /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -853,7 +853,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -883,6 +883,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.solian;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_ENABLE_EXPLICIT_MODULES = "$(SWIFT_USE_INTEGRATED_DRIVER)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -897,6 +898,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.solian.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -915,6 +917,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.solian.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -931,6 +934,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.solian.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1078,7 +1082,7 @@
 				INFOPLIST_FILE = SolianShareExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = SolianShareExtension;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1093,6 +1097,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_ENABLE_EXPLICIT_MODULES = NO;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1121,7 +1126,7 @@
 				INFOPLIST_FILE = SolianShareExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = SolianShareExtension;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1134,6 +1139,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_ENABLE_EXPLICIT_MODULES = NO;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -1161,7 +1167,7 @@
 				INFOPLIST_FILE = SolianShareExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = SolianShareExtension;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1174,6 +1180,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_ENABLE_EXPLICIT_MODULES = NO;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -1348,7 +1355,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -1399,7 +1406,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -1431,6 +1438,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.solian;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_ENABLE_EXPLICIT_MODULES = "$(SWIFT_USE_INTEGRATED_DRIVER)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -1459,6 +1467,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.solian;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_ENABLE_EXPLICIT_MODULES = "$(SWIFT_USE_INTEGRATED_DRIVER)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
--- a/ios/SolianNotificationService/NotificationService.swift
+++ b/ios/SolianNotificationService/NotificationService.swift
@@ -47,6 +47,7 @@ class NotificationService: UNNotificationServiceExtension {
    private func processNotification(request: UNNotificationRequest, content: UNMutableNotificationContent) throws {
        switch content.userInfo["type"] as? String {
        case "messages.new":
+            content.categoryIdentifier = "REPLYABLE_MESSAGE"
            try handleMessagingNotification(request: request, content: content)
        default:
            try handleDefaultNotification(content: content)
@@ -60,8 +61,6 @@ class NotificationService: UNNotificationServiceExtension {
        
        let pfpIdentifier = meta["pfp"] as? String
        
-        content.categoryIdentifier = "REPLYABLE_MESSAGE"
-        
        let metaCopy = meta as? [String: Any] ?? [:]
        let pfpUrl = pfpIdentifier != nil ? getAttachmentUrl(for: pfpIdentifier!) : nil
        
--- a/lib/database/draft.dart
+++ b/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};
--- a/lib/database/drift_db.dart
+++ b/lib/database/drift_db.dart
@@ -12,7 +12,7 @@ class AppDatabase extends _$AppDatabase {
  AppDatabase(super.e);

  @override
-  int get schemaVersion => 4;
+  int get schemaVersion => 7;

  @override
  MigrationStrategy get migration => MigrationStrategy(
@@ -21,16 +21,87 @@ class AppDatabase extends _$AppDatabase {
    },
    onUpgrade: (Migrator m, int from, int to) async {
      if (from < 2) {
-        // Add isRead column with default value false
-        await m.addColumn(chatMessages, chatMessages.isRead);
+        // Add isDeleted column with default value false
+        await m.addColumn(chatMessages, chatMessages.isDeleted);
      }
      if (from < 4) {
        // 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);
+      }
+      if (from < 7) {
+        // Add new columns from SnChatMessage
+        await m.addColumn(chatMessages, chatMessages.updatedAt);
+        await m.addColumn(chatMessages, chatMessages.deletedAt);
+        await m.addColumn(chatMessages, chatMessages.type);
+        await m.addColumn(chatMessages, chatMessages.meta);
+        await m.addColumn(chatMessages, chatMessages.membersMentioned);
+        await m.addColumn(chatMessages, chatMessages.editedAt);
+        await m.addColumn(chatMessages, chatMessages.attachments);
+        await m.addColumn(chatMessages, chatMessages.reactions);
+        await m.addColumn(chatMessages, chatMessages.repliedMessageId);
+        await m.addColumn(chatMessages, chatMessages.forwardedMessageId);
+      }
    },
  );

+  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, {
@@ -58,28 +129,70 @@ class AppDatabase extends _$AppDatabase {
    )).write(ChatMessagesCompanion(status: Value(status)));
  }

-  Future<int> markMessageAsRead(String id) {
-    return (update(chatMessages)..where(
-      (m) => m.id.equals(id),
-    )).write(ChatMessagesCompanion(isRead: const Value(true)));
-  }
-
  Future<int> deleteMessage(String id) {
    return (delete(chatMessages)..where((m) => m.id.equals(id))).go();
  }

+  Future<int> getTotalMessagesForRoom(String roomId) {
+    return (select(
+      chatMessages,
+    )..where((m) => m.roomId.equals(roomId))).get().then((list) => list.length);
+  }
+
+  Future<List<LocalChatMessage>> searchMessages(
+    String roomId,
+    String query, {
+    bool? withAttachments,
+  }) async {
+    var selectStatement = select(chatMessages)
+      ..where((m) => m.roomId.equals(roomId));
+
+    if (query.isNotEmpty) {
+      final searchTerm = '%$query%';
+      selectStatement =
+          selectStatement..where(
+            (m) =>
+                m.content.like(searchTerm) |
+                m.meta.like(searchTerm) |
+                m.attachments.like(searchTerm) |
+                m.type.like(searchTerm),
+          );
+    }
+
+    if (withAttachments == true) {
+      selectStatement =
+          selectStatement..where((m) => m.attachments.equals('[]').not());
+    }
+
+    final messages =
+        await (selectStatement
+              ..orderBy([(m) => OrderingTerm.desc(m.createdAt)]))
+            .get();
+    return messages.map((msg) => companionToMessage(msg)).toList();
+  }
+
  // Convert between Drift and model objects
  ChatMessagesCompanion messageToCompanion(LocalChatMessage message) {
+    final remote = message.toRemoteMessage();
    return ChatMessagesCompanion(
      id: Value(message.id),
      roomId: Value(message.roomId),
      senderId: Value(message.senderId),
-      content: Value(message.toRemoteMessage().content),
+      content: Value(remote.content),
      nonce: Value(message.nonce),
      data: Value(jsonEncode(message.data)),
      createdAt: Value(message.createdAt),
      status: Value(message.status),
-      isRead: Value(message.isRead),
+      updatedAt: Value(remote.updatedAt),
+      deletedAt: Value(remote.deletedAt),
+      type: Value(remote.type),
+      meta: Value(remote.meta),
+      membersMentioned: Value(remote.membersMentioned),
+      editedAt: Value(remote.editedAt),
+      attachments: Value(remote.attachments.map((e) => e.toJson()).toList()),
+      reactions: Value(remote.reactions.map((e) => e.toJson()).toList()),
+      repliedMessageId: Value(remote.repliedMessageId),
+      forwardedMessageId: Value(remote.forwardedMessageId),
    );
  }

@@ -93,7 +206,18 @@ class AppDatabase extends _$AppDatabase {
      createdAt: dbMessage.createdAt,
      status: dbMessage.status,
      nonce: dbMessage.nonce,
-      isRead: dbMessage.isRead,
+      content: dbMessage.content,
+      isDeleted: dbMessage.isDeleted,
+      updatedAt: dbMessage.updatedAt,
+      deletedAt: dbMessage.deletedAt,
+      type: dbMessage.type,
+      meta: dbMessage.meta,
+      membersMentioned: dbMessage.membersMentioned,
+      editedAt: dbMessage.editedAt,
+      attachments: dbMessage.attachments,
+      reactions: dbMessage.reactions,
+      repliedMessageId: dbMessage.repliedMessageId,
+      forwardedMessageId: dbMessage.forwardedMessageId,
    );
  }

@@ -101,10 +225,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);
  }
@@ -116,4 +261,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();
+  }
 }
--- a/lib/database/drift_db.g.dart
+++ b/lib/database/drift_db.g.dart
--- a/lib/database/message.dart
+++ b/lib/database/message.dart
@@ -1,7 +1,41 @@
+import 'dart:convert';
+
 import 'package:drift/drift.dart';
 import 'package:island/models/chat.dart';
 import 'package:island/models/file.dart';

+class MapConverter extends TypeConverter<Map<String, dynamic>, String> {
+  const MapConverter();
+
+  @override
+  Map<String, dynamic> fromSql(String fromDb) => json.decode(fromDb);
+
+  @override
+  String toSql(Map<String, dynamic> value) => json.encode(value);
+}
+
+class ListStringConverter extends TypeConverter<List<String>, String> {
+  const ListStringConverter();
+
+  @override
+  List<String> fromSql(String fromDb) => List<String>.from(json.decode(fromDb));
+
+  @override
+  String toSql(List<String> value) => json.encode(value);
+}
+
+class ListMapConverter
+    extends TypeConverter<List<Map<String, dynamic>>, String> {
+  const ListMapConverter();
+
+  @override
+  List<Map<String, dynamic>> fromSql(String fromDb) =>
+      List<Map<String, dynamic>>.from(json.decode(fromDb));
+
+  @override
+  String toSql(List<Map<String, dynamic>> value) => json.encode(value);
+}
+
 class ChatMessages extends Table {
  TextColumn get id => text()();
  TextColumn get roomId => text()();
@@ -11,7 +45,24 @@ class ChatMessages extends Table {
  TextColumn get data => text()();
  DateTimeColumn get createdAt => dateTime()();
  IntColumn get status => intEnum<MessageStatus>()();
-  BoolColumn get isRead => boolean().withDefault(const Constant(false))();
+  BoolColumn get isDeleted =>
+      boolean().nullable().withDefault(const Constant(false))();
+  DateTimeColumn get updatedAt => dateTime().nullable()();
+  DateTimeColumn get deletedAt => dateTime().nullable()();
+  TextColumn get type => text().withDefault(const Constant('text'))();
+  TextColumn get meta =>
+      text().map(const MapConverter()).withDefault(const Constant('{}'))();
+  TextColumn get membersMentioned =>
+      text()
+          .map(const ListStringConverter())
+          .withDefault(const Constant('[]'))();
+  DateTimeColumn get editedAt => dateTime().nullable()();
+  TextColumn get attachments =>
+      text().map(const ListMapConverter()).withDefault(const Constant('[]'))();
+  TextColumn get reactions =>
+      text().map(const ListMapConverter()).withDefault(const Constant('[]'))();
+  TextColumn get repliedMessageId => text().nullable()();
+  TextColumn get forwardedMessageId => text().nullable()();

  @override
  Set<Column> get primaryKey => {id};
@@ -25,8 +76,19 @@ class LocalChatMessage {
  final DateTime createdAt;
  MessageStatus status;
  final String? nonce;
+  final String? content;
+  final bool? isDeleted;
+  final DateTime? updatedAt;
+  final DateTime? deletedAt;
+  final String type;
+  final Map<String, dynamic> meta;
+  final List<String> membersMentioned;
+  final DateTime? editedAt;
+  final List<Map<String, dynamic>> attachments;
+  final List<Map<String, dynamic>> reactions;
+  final String? repliedMessageId;
+  final String? forwardedMessageId;
  List<UniversalFile>? localAttachments;
-  bool isRead;

  LocalChatMessage({
    required this.id,
@@ -36,8 +98,19 @@ class LocalChatMessage {
    required this.createdAt,
    required this.nonce,
    required this.status,
+    this.content,
+    this.isDeleted,
+    this.updatedAt,
+    this.deletedAt,
+    required this.type,
+    required this.meta,
+    required this.membersMentioned,
+    this.editedAt,
+    required this.attachments,
+    required this.reactions,
+    this.repliedMessageId,
+    this.forwardedMessageId,
    this.localAttachments,
-    this.isRead = false,
  });

  SnChatMessage toRemoteMessage() {
@@ -48,7 +121,6 @@ class LocalChatMessage {
    SnChatMessage message,
    MessageStatus status, {
    String? nonce,
-    bool isRead = false,
  }) {
    return LocalChatMessage(
      id: message.id,
@@ -58,7 +130,18 @@ class LocalChatMessage {
      createdAt: message.createdAt,
      status: status,
      nonce: nonce ?? message.nonce,
-      isRead: isRead,
+      content: message.content,
+      isDeleted: false,
+      updatedAt: message.updatedAt,
+      deletedAt: null,
+      type: message.type,
+      meta: message.meta,
+      membersMentioned: message.membersMentioned,
+      editedAt: message.editedAt,
+      attachments: message.attachments.map((e) => e.toJson()).toList(),
+      reactions: message.reactions.map((e) => e.toJson()).toList(),
+      repliedMessageId: message.repliedMessageId,
+      forwardedMessageId: message.forwardedMessageId,
    );
  }
 }
--- a/lib/database/message_repository.dart
+++ b/lib/database/message_repository.dart
@@ -1,484 +0,0 @@
-import 'package:dio/dio.dart';
-import 'package:island/database/drift_db.dart';
-import 'package:island/database/message.dart';
-import 'package:island/models/chat.dart';
-import 'package:island/models/file.dart';
-import 'package:island/services/file.dart';
-import 'package:island/widgets/alert.dart';
-import 'package:uuid/uuid.dart';
-
-class MessageRepository {
-  final SnChatRoom room;
-  final SnChatMember identity;
-  final Dio _apiClient;
-  final AppDatabase _database;
-
-  final Map<String, LocalChatMessage> pendingMessages = {};
-  final Map<String, Map<int, double>> fileUploadProgress = {};
-  int? _totalCount;
-
-  MessageRepository(this.room, this.identity, this._apiClient, this._database);
-
-  Future<LocalChatMessage?> getLastMessages() async {
-    final dbMessages = await _database.getMessagesForRoom(
-      room.id,
-      offset: 0,
-      limit: 1,
-    );
-
-    if (dbMessages.isEmpty) {
-      return null;
-    }
-
-    return _database.companionToMessage(dbMessages.first);
-  }
-
-  Future<bool> syncMessages() async {
-    final lastMessage = await getLastMessages();
-    if (lastMessage == null) return false;
-    try {
-      final resp = await _apiClient.post(
-        '/sphere/chat/${room.id}/sync',
-        data: {
-          'last_sync_timestamp':
-              lastMessage.toRemoteMessage().updatedAt.millisecondsSinceEpoch,
-        },
-      );
-
-      final response = MessageSyncResponse.fromJson(resp.data);
-      for (final change in response.changes) {
-        switch (change.action) {
-          case MessageChangeAction.create:
-            await receiveMessage(change.message!);
-            break;
-          case MessageChangeAction.update:
-            await receiveMessageUpdate(change.message!);
-            break;
-          case MessageChangeAction.delete:
-            await receiveMessageDeletion(change.messageId.toString());
-            break;
-        }
-      }
-    } catch (err) {
-      showErrorAlert(err);
-    }
-    return true;
-  }
-
-  Future<List<LocalChatMessage>> listMessages({
-    int offset = 0,
-    int take = 20,
-    bool synced = false,
-  }) async {
-    try {
-      // For initial load, fetch latest messages in the background to sync.
-      if (offset == 0 && !synced) {
-        // Not awaiting this is intentional, for a quicker UI response.
-        // The UI should rely on a stream from the database to get updates.
-        _fetchAndCacheMessages(room.id, offset: 0, take: take).catchError((_) {
-          // Best effort, errors will be handled by later fetches.
-          return <LocalChatMessage>[];
-        });
-      }
-
-      final localMessages = await _getCachedMessages(
-        room.id,
-        offset: offset,
-        take: take,
-      );
-
-      // If local cache has messages, return them. This is the common case for scrolling up.
-      if (localMessages.isNotEmpty) {
-        return localMessages;
-      }
-
-      // If local cache is empty, we've probably reached the end of cached history.
-      // Fetch from remote. This will also be hit on first load if cache is empty.
-      return await _fetchAndCacheMessages(room.id, offset: offset, take: take);
-    } catch (e) {
-      // Final fallback to cache in case of network errors during fetch.
-      final localMessages = await _getCachedMessages(
-        room.id,
-        offset: offset,
-        take: take,
-      );
-
-      if (localMessages.isNotEmpty) {
-        return localMessages;
-      }
-      rethrow;
-    }
-  }
-
-  Future<List<LocalChatMessage>> _getCachedMessages(
-    String roomId, {
-    int offset = 0,
-    int take = 20,
-  }) async {
-    // Get messages from local database
-    final dbMessages = await _database.getMessagesForRoom(
-      roomId,
-      offset: offset,
-      limit: take,
-    );
-    final dbLocalMessages =
-        dbMessages.map(_database.companionToMessage).toList();
-
-    // Combine with pending messages for the first page
-    if (offset == 0) {
-      final pendingForRoom =
-          pendingMessages.values.where((msg) => msg.roomId == roomId).toList();
-
-      final allMessages = [...pendingForRoom, ...dbLocalMessages];
-      allMessages.sort((a, b) => b.createdAt.compareTo(a.createdAt));
-
-      // Remove duplicates by ID, preserving the order
-      final uniqueMessages = <LocalChatMessage>[];
-      final seenIds = <String>{};
-      for (final message in allMessages) {
-        if (seenIds.add(message.id)) {
-          uniqueMessages.add(message);
-        }
-      }
-      return uniqueMessages;
-    }
-
-    return dbLocalMessages;
-  }
-
-  Future<List<LocalChatMessage>> _fetchAndCacheMessages(
-    String roomId, {
-    int offset = 0,
-    int take = 20,
-  }) async {
-    // Use cached total count if available, otherwise fetch it
-    if (_totalCount == null) {
-      final response = await _apiClient.get(
-        '/sphere/chat/$roomId/messages',
-        queryParameters: {'offset': 0, 'take': 1},
-      );
-      _totalCount = int.parse(response.headers['x-total']?.firstOrNull ?? '0');
-    }
-
-    if (offset >= _totalCount!) {
-      return [];
-    }
-
-    final response = await _apiClient.get(
-      '/sphere/chat/$roomId/messages',
-      queryParameters: {'offset': offset, 'take': take},
-    );
-
-    final List<dynamic> data = response.data;
-    // Update total count from response headers
-    _totalCount = int.parse(response.headers['x-total']?.firstOrNull ?? '0');
-
-    final messages =
-        data.map((json) {
-          final remoteMessage = SnChatMessage.fromJson(json);
-          return LocalChatMessage.fromRemoteMessage(
-            remoteMessage,
-            MessageStatus.sent,
-          );
-        }).toList();
-
-    for (final message in messages) {
-      await _database.saveMessage(_database.messageToCompanion(message));
-      if (message.nonce != null) {
-        pendingMessages.removeWhere(
-          (_, pendingMsg) => pendingMsg.nonce == message.nonce,
-        );
-      }
-    }
-
-    return messages;
-  }
-
-  Future<LocalChatMessage> sendMessage(
-    String token,
-    String baseUrl,
-    String roomId,
-    String content,
-    String nonce, {
-    required List<UniversalFile> attachments,
-    Map<String, dynamic>? meta,
-    SnChatMessage? replyingTo,
-    SnChatMessage? forwardingTo,
-    SnChatMessage? editingTo,
-    Function(LocalChatMessage)? onPending,
-    Function(String, Map<int, double>)? onProgress,
-  }) async {
-    // Generate a unique nonce for this message
-    final nonce = const Uuid().v4();
-
-    // Create a local message with pending status
-    final mockMessage = SnChatMessage(
-      id: 'pending_$nonce',
-      chatRoomId: roomId,
-      senderId: identity.id,
-      content: content,
-      createdAt: DateTime.now(),
-      updatedAt: DateTime.now(),
-      nonce: nonce,
-      sender: identity,
-    );
-
-    final localMessage = LocalChatMessage.fromRemoteMessage(
-      mockMessage,
-      MessageStatus.pending,
-    );
-
-    // Store in memory and database
-    pendingMessages[localMessage.id] = localMessage;
-    fileUploadProgress[localMessage.id] = {};
-    await _database.saveMessage(_database.messageToCompanion(localMessage));
-    onPending?.call(localMessage);
-
-    try {
-      var cloudAttachments = List.empty(growable: true);
-      // Upload files
-      for (var idx = 0; idx < attachments.length; idx++) {
-        final cloudFile =
-            await putMediaToCloud(
-              fileData: attachments[idx],
-              atk: token,
-              baseUrl: baseUrl,
-              filename: attachments[idx].data.name ?? 'Post media',
-              mimetype:
-                  attachments[idx].data.mimeType ??
-                  switch (attachments[idx].type) {
-                    UniversalFileType.image => 'image/unknown',
-                    UniversalFileType.video => 'video/unknown',
-                    UniversalFileType.audio => 'audio/unknown',
-                    UniversalFileType.file => 'application/octet-stream',
-                  },
-              onProgress: (progress, _) {
-                fileUploadProgress[localMessage.id]?[idx] = progress;
-                onProgress?.call(
-                  localMessage.id,
-                  fileUploadProgress[localMessage.id] ?? {},
-                );
-              },
-            ).future;
-        if (cloudFile == null) {
-          throw ArgumentError('Failed to upload the file...');
-        }
-        cloudAttachments.add(cloudFile);
-      }
-
-      // Send to server
-      final response = await _apiClient.request(
-        editingTo == null
-            ? '/sphere/chat/$roomId/messages'
-            : '/sphere/chat/$roomId/messages/${editingTo.id}',
-        data: {
-          'content': content,
-          'attachments_id': cloudAttachments.map((e) => e.id).toList(),
-          'replied_message_id': replyingTo?.id,
-          'forwarded_message_id': forwardingTo?.id,
-          'meta': meta,
-          'nonce': nonce,
-        },
-        options: Options(method: editingTo == null ? 'POST' : 'PATCH'),
-      );
-
-      // Update with server response
-      final remoteMessage = SnChatMessage.fromJson(response.data);
-      final updatedMessage = LocalChatMessage.fromRemoteMessage(
-        remoteMessage,
-        MessageStatus.sent,
-      );
-
-      // Remove from pending and update in database
-      pendingMessages.remove(localMessage.id);
-      await _database.deleteMessage(localMessage.id);
-      await _database.saveMessage(_database.messageToCompanion(updatedMessage));
-
-      return updatedMessage;
-    } catch (e) {
-      // Update status to failed
-      localMessage.status = MessageStatus.failed;
-      pendingMessages[localMessage.id] = localMessage;
-      await _database.updateMessageStatus(
-        localMessage.id,
-        MessageStatus.failed,
-      );
-      rethrow;
-    }
-  }
-
-  Future<LocalChatMessage> retryMessage(String pendingMessageId) async {
-    final message = await getMessageById(pendingMessageId);
-    if (message == null) {
-      throw Exception('Message not found');
-    }
-
-    // Update status back to pending
-    message.status = MessageStatus.pending;
-    pendingMessages[pendingMessageId] = message;
-    await _database.updateMessageStatus(
-      pendingMessageId,
-      MessageStatus.pending,
-    );
-
-    try {
-      // Send to server
-      var remoteMessage = message.toRemoteMessage();
-      final response = await _apiClient.post(
-        '/sphere/chat/${message.roomId}/messages',
-        data: {
-          'content': remoteMessage.content,
-          'attachments_id': remoteMessage.attachments,
-          'meta': remoteMessage.meta,
-          'nonce': message.nonce,
-        },
-      );
-
-      // Update with server response
-      remoteMessage = SnChatMessage.fromJson(response.data);
-      final updatedMessage = LocalChatMessage.fromRemoteMessage(
-        remoteMessage,
-        MessageStatus.sent,
-      );
-
-      // Remove from pending and update in database
-      pendingMessages.remove(pendingMessageId);
-      await _database.deleteMessage(pendingMessageId);
-      await _database.saveMessage(_database.messageToCompanion(updatedMessage));
-
-      return updatedMessage;
-    } catch (e) {
-      // Update status to failed
-      message.status = MessageStatus.failed;
-      pendingMessages[pendingMessageId] = message;
-      await _database.updateMessageStatus(
-        pendingMessageId,
-        MessageStatus.failed,
-      );
-      rethrow;
-    }
-  }
-
-  Future<LocalChatMessage> receiveMessage(SnChatMessage remoteMessage) async {
-    final localMessage = LocalChatMessage.fromRemoteMessage(
-      remoteMessage,
-      MessageStatus.sent,
-    );
-
-    if (remoteMessage.nonce != null) {
-      pendingMessages.removeWhere(
-        (_, pendingMsg) => pendingMsg.nonce == remoteMessage.nonce,
-      );
-    }
-
-    await _database.saveMessage(_database.messageToCompanion(localMessage));
-    return localMessage;
-  }
-
-  Future<LocalChatMessage> receiveMessageUpdate(
-    SnChatMessage remoteMessage,
-  ) async {
-    final localMessage = LocalChatMessage.fromRemoteMessage(
-      remoteMessage,
-      MessageStatus.sent,
-    );
-
-    await _database.updateMessage(_database.messageToCompanion(localMessage));
-    return localMessage;
-  }
-
-  Future<void> receiveMessageDeletion(String messageId) async {
-    // Remove from pending messages if exists
-    pendingMessages.remove(messageId);
-
-    // Delete from local database
-    await _database.deleteMessage(messageId);
-  }
-
-  Future<LocalChatMessage> updateMessage(
-    String messageId,
-    String content, {
-    List<SnCloudFile>? attachments,
-    Map<String, dynamic>? meta,
-  }) async {
-    final message = pendingMessages[messageId];
-    if (message != null) {
-      // Update pending message
-      final rmMessage = message.toRemoteMessage();
-      final updatedRemoteMessage = rmMessage.copyWith(
-        content: content,
-        meta: meta ?? rmMessage.meta,
-      );
-      final updatedLocalMessage = LocalChatMessage.fromRemoteMessage(
-        updatedRemoteMessage,
-        MessageStatus.pending,
-      );
-      pendingMessages[messageId] = updatedLocalMessage;
-      await _database.updateMessage(
-        _database.messageToCompanion(updatedLocalMessage),
-      );
-      return message;
-    }
-
-    try {
-      // Update on server
-      final response = await _apiClient.put(
-        '/sphere/chat/${room.id}/messages/$messageId',
-        data: {'content': content, 'attachments': attachments, 'meta': meta},
-      );
-
-      // Update local copy
-      final remoteMessage = SnChatMessage.fromJson(response.data);
-      final updatedMessage = LocalChatMessage.fromRemoteMessage(
-        remoteMessage,
-        MessageStatus.sent,
-      );
-      await _database.updateMessage(
-        _database.messageToCompanion(updatedMessage),
-      );
-      return updatedMessage;
-    } catch (e) {
-      rethrow;
-    }
-  }
-
-  Future<void> deleteMessage(String messageId) async {
-    try {
-      await _apiClient.delete('/sphere/chat/${room.id}/messages/$messageId');
-      pendingMessages.remove(messageId);
-      await _database.deleteMessage(messageId);
-    } catch (e) {
-      rethrow;
-    }
-  }
-
-  Future<LocalChatMessage?> getMessageById(String messageId) async {
-    try {
-      // Attempt to get the message from the local database
-      final localMessage =
-          await (_database.select(_database.chatMessages)
-            ..where((tbl) => tbl.id.equals(messageId))).getSingleOrNull();
-      if (localMessage != null) {
-        return _database.companionToMessage(localMessage);
-      }
-
-      // If not found locally, fetch from the server
-      final response = await _apiClient.get(
-        '/sphere/chat/${room.id}/messages/$messageId',
-      );
-      final remoteMessage = SnChatMessage.fromJson(response.data);
-      final message = LocalChatMessage.fromRemoteMessage(
-        remoteMessage,
-        MessageStatus.sent,
-      );
-
-      // Save the fetched message to the local database
-      await _database.saveMessage(_database.messageToCompanion(message));
-      return message;
-    } catch (e) {
-      if (e is DioException) return null;
-      // Handle errors
-      rethrow;
-    }
-  }
-}
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -8,7 +8,7 @@ import 'package:firebase_crashlytics/firebase_crashlytics.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
+
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -30,7 +30,6 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:image_picker_platform_interface/image_picker_platform_interface.dart';
 import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:url_launcher/url_launcher_string.dart';
-import 'package:flutter_langdetect/flutter_langdetect.dart' as langdetect;

@pragma('vm:entry-point')
 Future<void> _firebaseMessagingBackgroundHandler(RemoteMessage message) async {
@@ -52,7 +51,6 @@ void main() async {
  }

  try {
-    await langdetect.initLangDetect();
    await EasyLocalization.ensureInitialized();

    if (kIsWeb || !Platform.isLinux) {
@@ -169,12 +167,12 @@ class IslandApp extends HookConsumerWidget {
    final theme = ref.watch(themeProvider);

    void handleMessage(RemoteMessage notification) {
-      if (notification.data['action_uri'] != null) {
-        var uri = notification.data['action_uri'] as String;
+      if (notification.data['meta']?['action_uri'] != null) {
+        var uri = notification.data['meta']['action_uri'] as String;
        if (uri.startsWith('/')) {
          // In-app routes
          final router = ref.read(routerProvider);
-          router.go(notification.data['action_uri']);
+          router.push(notification.data['meta']['action_uri']);
        } else {
          // External links
          launchUrlString(uri);
@@ -183,30 +181,9 @@ class IslandApp extends HookConsumerWidget {
    }

    useEffect(() {
-      if (!kIsWeb && Platform.isLinux) {
+      if (!kIsWeb && (Platform.isLinux || Platform.isWindows)) {
        return null;
      }
-      const channel = MethodChannel('dev.solsynth.solian/notifications');
-
-      Future<void> handleInitialLink() async {
-        final String? link = await channel.invokeMethod('initialLink');
-        if (link != null) {
-          final router = ref.read(routerProvider);
-          router.go(link);
-        }
-      }
-
-      if (!kIsWeb && Platform.isAndroid) {
-        handleInitialLink();
-      }
-
-      channel.setMethodCallHandler((call) async {
-        if (call.method == 'newLink') {
-          final String link = call.arguments;
-          final router = ref.read(routerProvider);
-          router.go(link);
-        }
-      });

      // When the app is opened from a terminated state.
      FirebaseMessaging.instance.getInitialMessage().then((message) {
@@ -246,6 +223,7 @@ class IslandApp extends HookConsumerWidget {
          if (user.value != null) {
            final apiClient = ref.read(apiClientProvider);
            subscribePushNotification(apiClient);
+            initializeLocalNotifications();
            final wsNotifier = ref.read(websocketStateProvider.notifier);
            wsNotifier.connect();
          }
@@ -262,6 +240,7 @@ class IslandApp extends HookConsumerWidget {
      themeMode: ThemeMode.system,
      routerConfig: router,
      supportedLocales: context.supportedLocales,
+      scrollBehavior: AppScrollBehavior(),
      localizationsDelegates: [
        ...context.localizationDelegates,
        CroppyLocalizations.delegate,
--- a/lib/models/account.dart
+++ b/lib/models/account.dart
@@ -13,10 +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,
@@ -70,6 +73,8 @@ sealed class SnAccountProfile with _$SnAccountProfile {
    SnAccountBadge? activeBadge,
    required int experience,
    required int level,
+    @Default(100) double socialCredits,
+    @Default(0) int socialCreditsLevel,
    required double levelingProgress,
    required SnCloudFile? picture,
    required SnCloudFile? background,
@@ -131,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,
@@ -208,3 +214,37 @@ sealed class SnAuthDeviceWithChallenge with _$SnAuthDeviceWithChallenge {
  factory SnAuthDeviceWithChallenge.fromJson(Map<String, dynamic> json) =>
      _$SnAuthDeviceWithChallengeFromJson(json);
 }
+
+@freezed
+sealed class SnExperienceRecord with _$SnExperienceRecord {
+  const factory SnExperienceRecord({
+    required String id,
+    required int delta,
+    required String reasonType,
+    required String reason,
+    @Default(1.0) double? bonusMultiplier,
+    required DateTime createdAt,
+    required DateTime updatedAt,
+    required DateTime? deletedAt,
+  }) = _SnExperienceRecord;
+
+  factory SnExperienceRecord.fromJson(Map<String, dynamic> json) =>
+      _$SnExperienceRecordFromJson(json);
+}
+
+@freezed
+sealed class SnSocialCreditRecord with _$SnSocialCreditRecord {
+  const factory SnSocialCreditRecord({
+    required String id,
+    required double delta,
+    required String reasonType,
+    required String reason,
+    required DateTime? expiredAt,
+    required DateTime createdAt,
+    required DateTime updatedAt,
+    required DateTime? deletedAt,
+  }) = _SnSocialCreditRecord;
+
+  factory SnSocialCreditRecord.fromJson(Map<String, dynamic> json) =>
+      _$SnSocialCreditRecordFromJson(json);
+}
--- a/lib/models/account.freezed.dart
+++ b/lib/models/account.freezed.dart
--- a/lib/models/account.g.dart
+++ b/lib/models/account.g.dart
@@ -11,7 +11,9 @@ _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>),
  perkSubscription:
      json['perk_subscription'] == null
@@ -24,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:
@@ -38,10 +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(),
@@ -84,6 +94,8 @@ _SnAccountProfile _$SnAccountProfileFromJson(Map<String, dynamic> json) =>
              ),
      experience: (json['experience'] as num).toInt(),
      level: (json['level'] as num).toInt(),
+      socialCredits: (json['social_credits'] as num?)?.toDouble() ?? 100,
+      socialCreditsLevel: (json['social_credits_level'] as num?)?.toInt() ?? 0,
      levelingProgress: (json['leveling_progress'] as num).toDouble(),
      picture:
          json['picture'] == null
@@ -126,6 +138,8 @@ Map<String, dynamic> _$SnAccountProfileToJson(_SnAccountProfile instance) =>
      'active_badge': instance.activeBadge?.toJson(),
      'experience': instance.experience,
      'level': instance.level,
+      'social_credits': instance.socialCredits,
+      'social_credits_level': instance.socialCreditsLevel,
      'leveling_progress': instance.levelingProgress,
      'picture': instance.picture?.toJson(),
      'background': instance.background?.toJson(),
@@ -221,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),
@@ -237,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(),
@@ -348,3 +364,62 @@ Map<String, dynamic> _$SnAuthDeviceWithChallengeeToJson(
  'challenges': instance.challenges.map((e) => e.toJson()).toList(),
  'is_current': instance.isCurrent,
 };
+
+_SnExperienceRecord _$SnExperienceRecordFromJson(Map<String, dynamic> json) =>
+    _SnExperienceRecord(
+      id: json['id'] as String,
+      delta: (json['delta'] as num).toInt(),
+      reasonType: json['reason_type'] as String,
+      reason: json['reason'] as String,
+      bonusMultiplier: (json['bonus_multiplier'] as num?)?.toDouble() ?? 1.0,
+      createdAt: DateTime.parse(json['created_at'] as String),
+      updatedAt: DateTime.parse(json['updated_at'] as String),
+      deletedAt:
+          json['deleted_at'] == null
+              ? null
+              : DateTime.parse(json['deleted_at'] as String),
+    );
+
+Map<String, dynamic> _$SnExperienceRecordToJson(_SnExperienceRecord instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'delta': instance.delta,
+      'reason_type': instance.reasonType,
+      'reason': instance.reason,
+      'bonus_multiplier': instance.bonusMultiplier,
+      'created_at': instance.createdAt.toIso8601String(),
+      'updated_at': instance.updatedAt.toIso8601String(),
+      'deleted_at': instance.deletedAt?.toIso8601String(),
+    };
+
+_SnSocialCreditRecord _$SnSocialCreditRecordFromJson(
+  Map<String, dynamic> json,
+) => _SnSocialCreditRecord(
+  id: json['id'] as String,
+  delta: (json['delta'] as num).toDouble(),
+  reasonType: json['reason_type'] as String,
+  reason: json['reason'] as String,
+  expiredAt:
+      json['expired_at'] == null
+          ? null
+          : DateTime.parse(json['expired_at'] as String),
+  createdAt: DateTime.parse(json['created_at'] as String),
+  updatedAt: DateTime.parse(json['updated_at'] as String),
+  deletedAt:
+      json['deleted_at'] == null
+          ? null
+          : DateTime.parse(json['deleted_at'] as String),
+);
+
+Map<String, dynamic> _$SnSocialCreditRecordToJson(
+  _SnSocialCreditRecord instance,
+) => <String, dynamic>{
+  'id': instance.id,
+  'delta': instance.delta,
+  'reason_type': instance.reasonType,
+  'reason': instance.reason,
+  'expired_at': instance.expiredAt?.toIso8601String(),
+  'created_at': instance.createdAt.toIso8601String(),
+  'updated_at': instance.updatedAt.toIso8601String(),
+  'deleted_at': instance.deletedAt?.toIso8601String(),
+};
--- a/lib/models/activity.dart
+++ b/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({
@@ -54,7 +68,7 @@ sealed class SnEventCalendarEntry with _$SnEventCalendarEntry {
  const factory SnEventCalendarEntry({
    required DateTime date,
    required SnCheckInResult? checkInResult,
-    required List<dynamic> statuses,
+    required List<SnAccountStatus> statuses,
  }) = _SnEventCalendarEntry;

  factory SnEventCalendarEntry.fromJson(Map<String, dynamic> json) =>
--- a/lib/models/activity.freezed.dart
+++ b/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 {

@@ -861,7 +1136,7 @@ as String,
 /// @nodoc
 mixin _$SnEventCalendarEntry {

- DateTime get date; SnCheckInResult? get checkInResult; List<dynamic> get statuses;
+ DateTime get date; SnCheckInResult? get checkInResult; List<SnAccountStatus> get statuses;
 /// Create a copy of SnEventCalendarEntry
 /// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@@ -894,7 +1169,7 @@ abstract mixin class $SnEventCalendarEntryCopyWith<$Res>  {
  factory $SnEventCalendarEntryCopyWith(SnEventCalendarEntry value, $Res Function(SnEventCalendarEntry) _then) = _$SnEventCalendarEntryCopyWithImpl;
@useResult
 $Res call({
- DateTime date, SnCheckInResult? checkInResult, List<dynamic> statuses
+ DateTime date, SnCheckInResult? checkInResult, List<SnAccountStatus> statuses
 });


@@ -916,7 +1191,7 @@ class _$SnEventCalendarEntryCopyWithImpl<$Res>
 date: null == date ? _self.date : date // ignore: cast_nullable_to_non_nullable
 as DateTime,checkInResult: freezed == checkInResult ? _self.checkInResult : checkInResult // ignore: cast_nullable_to_non_nullable
 as SnCheckInResult?,statuses: null == statuses ? _self.statuses : statuses // ignore: cast_nullable_to_non_nullable
-as List<dynamic>,
+as List<SnAccountStatus>,
  ));
 }
 /// Create a copy of SnEventCalendarEntry
@@ -1010,7 +1285,7 @@ return $default(_that);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( DateTime date,  SnCheckInResult? checkInResult,  List<dynamic> statuses)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( DateTime date,  SnCheckInResult? checkInResult,  List<SnAccountStatus> statuses)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _SnEventCalendarEntry() when $default != null:
 return $default(_that.date,_that.checkInResult,_that.statuses);case _:
@@ -1031,7 +1306,7 @@ return $default(_that.date,_that.checkInResult,_that.statuses);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( DateTime date,  SnCheckInResult? checkInResult,  List<dynamic> statuses)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( DateTime date,  SnCheckInResult? checkInResult,  List<SnAccountStatus> statuses)  $default,) {final _that = this;
 switch (_that) {
 case _SnEventCalendarEntry():
 return $default(_that.date,_that.checkInResult,_that.statuses);}
@@ -1048,7 +1323,7 @@ return $default(_that.date,_that.checkInResult,_that.statuses);}
 /// }
 /// ```

-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( DateTime date,  SnCheckInResult? checkInResult,  List<dynamic> statuses)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( DateTime date,  SnCheckInResult? checkInResult,  List<SnAccountStatus> statuses)?  $default,) {final _that = this;
 switch (_that) {
 case _SnEventCalendarEntry() when $default != null:
 return $default(_that.date,_that.checkInResult,_that.statuses);case _:
@@ -1063,13 +1338,13 @@ return $default(_that.date,_that.checkInResult,_that.statuses);case _:
@JsonSerializable()

 class _SnEventCalendarEntry implements SnEventCalendarEntry {
-  const _SnEventCalendarEntry({required this.date, required this.checkInResult, required final  List<dynamic> statuses}): _statuses = statuses;
+  const _SnEventCalendarEntry({required this.date, required this.checkInResult, required final  List<SnAccountStatus> statuses}): _statuses = statuses;
  factory _SnEventCalendarEntry.fromJson(Map<String, dynamic> json) => _$SnEventCalendarEntryFromJson(json);

@override final  DateTime date;
@override final  SnCheckInResult? checkInResult;
- final  List<dynamic> _statuses;
-@override List<dynamic> get statuses {
+ final  List<SnAccountStatus> _statuses;
+@override List<SnAccountStatus> get statuses {
  if (_statuses is EqualUnmodifiableListView) return _statuses;
  // ignore: implicit_dynamic_type
  return EqualUnmodifiableListView(_statuses);
@@ -1109,7 +1384,7 @@ abstract mixin class _$SnEventCalendarEntryCopyWith<$Res> implements $SnEventCal
  factory _$SnEventCalendarEntryCopyWith(_SnEventCalendarEntry value, $Res Function(_SnEventCalendarEntry) _then) = __$SnEventCalendarEntryCopyWithImpl;
@override @useResult
 $Res call({
- DateTime date, SnCheckInResult? checkInResult, List<dynamic> statuses
+ DateTime date, SnCheckInResult? checkInResult, List<SnAccountStatus> statuses
 });


@@ -1131,7 +1406,7 @@ class __$SnEventCalendarEntryCopyWithImpl<$Res>
 date: null == date ? _self.date : date // ignore: cast_nullable_to_non_nullable
 as DateTime,checkInResult: freezed == checkInResult ? _self.checkInResult : checkInResult // ignore: cast_nullable_to_non_nullable
 as SnCheckInResult?,statuses: null == statuses ? _self._statuses : statuses // ignore: cast_nullable_to_non_nullable
-as List<dynamic>,
+as List<SnAccountStatus>,
  ));
 }

--- a/lib/models/activity.g.dart
+++ b/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,
@@ -87,7 +108,10 @@ _SnEventCalendarEntry _$SnEventCalendarEntryFromJson(
          : SnCheckInResult.fromJson(
            json['check_in_result'] as Map<String, dynamic>,
          ),
-  statuses: json['statuses'] as List<dynamic>,
+  statuses:
+      (json['statuses'] as List<dynamic>)
+          .map((e) => SnAccountStatus.fromJson(e as Map<String, dynamic>))
+          .toList(),
 );

 Map<String, dynamic> _$SnEventCalendarEntryToJson(
@@ -95,5 +119,5 @@ Map<String, dynamic> _$SnEventCalendarEntryToJson(
 ) => <String, dynamic>{
  'date': instance.date.toIso8601String(),
  'check_in_result': instance.checkInResult?.toJson(),
-  'statuses': instance.statuses,
+  'statuses': instance.statuses.map((e) => e.toJson()).toList(),
 };
--- a/lib/models/auth.dart
+++ b/lib/models/auth.dart
@@ -11,11 +11,25 @@ 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({
    required String id,
-    required DateTime expiredAt,
+    required DateTime? expiredAt,
    required int stepRemain,
    required int stepTotal,
    required int failedAttempts,
@@ -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,
@@ -43,7 +57,7 @@ sealed class SnAuthSession with _$SnAuthSession {
    required String id,
    required String? label,
    required DateTime lastGrantedAt,
-    required DateTime expiredAt,
+    required DateTime? expiredAt,
    required String accountId,
    required String challengeId,
    required SnAuthChallenge challenge,
--- a/lib/models/auth.freezed.dart
+++ b/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 = freezed,Object? longitude = freezed,Object? countryCode = freezed,Object? country = freezed,Object? city = freezed,}) {
+  return _then(_self.copyWith(
+latitude: freezed == latitude ? _self.latitude : latitude // ignore: cast_nullable_to_non_nullable
+as double?,longitude: freezed == longitude ? _self.longitude : longitude // ignore: cast_nullable_to_non_nullable
+as double?,countryCode: freezed == countryCode ? _self.countryCode : countryCode // ignore: cast_nullable_to_non_nullable
+as String?,country: freezed == country ? _self.country : country // ignore: cast_nullable_to_non_nullable
+as String?,city: freezed == city ? _self.city : city // ignore: cast_nullable_to_non_nullable
+as String?,
+  ));
+}
+
+}
+
+
+/// 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 = freezed,Object? longitude = freezed,Object? countryCode = freezed,Object? country = freezed,Object? city = freezed,}) {
+  return _then(_GeoIpLocation(
+latitude: freezed == latitude ? _self.latitude : latitude // ignore: cast_nullable_to_non_nullable
+as double?,longitude: freezed == longitude ? _self.longitude : longitude // ignore: cast_nullable_to_non_nullable
+as double?,countryCode: freezed == countryCode ? _self.countryCode : countryCode // ignore: cast_nullable_to_non_nullable
+as String?,country: freezed == country ? _self.country : country // ignore: cast_nullable_to_non_nullable
+as String?,city: freezed == city ? _self.city : city // ignore: cast_nullable_to_non_nullable
+as String?,
+  ));
+}
+
+
+}
+
+
 /// @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
@@ -322,11 +591,11 @@ class _$SnAuthChallengeCopyWithImpl<$Res>

 /// Create a copy of SnAuthChallenge
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? expiredAt = null,Object? stepRemain = null,Object? stepTotal = null,Object? failedAttempts = null,Object? type = null,Object? blacklistFactors = null,Object? audiences = null,Object? scopes = null,Object? ipAddress = null,Object? userAgent = null,Object? nonce = freezed,Object? location = freezed,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? expiredAt = freezed,Object? stepRemain = null,Object? stepTotal = null,Object? failedAttempts = null,Object? type = null,Object? blacklistFactors = null,Object? audiences = null,Object? scopes = null,Object? ipAddress = null,Object? userAgent = null,Object? nonce = freezed,Object? location = freezed,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
  return _then(_self.copyWith(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
-as String,expiredAt: null == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
-as DateTime,stepRemain: null == stepRemain ? _self.stepRemain : stepRemain // ignore: cast_nullable_to_non_nullable
+as String,expiredAt: freezed == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,stepRemain: null == stepRemain ? _self.stepRemain : stepRemain // ignore: cast_nullable_to_non_nullable
 as int,stepTotal: null == stepTotal ? _self.stepTotal : stepTotal // ignore: cast_nullable_to_non_nullable
 as int,failedAttempts: null == failedAttempts ? _self.failedAttempts : failedAttempts // ignore: cast_nullable_to_non_nullable
 as int,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
@@ -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 _:
@@ -480,7 +761,7 @@ class _SnAuthChallenge implements SnAuthChallenge {
  factory _SnAuthChallenge.fromJson(Map<String, dynamic> json) => _$SnAuthChallengeFromJson(json);

@override final  String id;
-@override final  DateTime expiredAt;
+@override final  DateTime? expiredAt;
@override final  int stepRemain;
@override final  int stepTotal;
@override final  int failedAttempts;
@@ -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
@@ -565,11 +846,11 @@ class __$SnAuthChallengeCopyWithImpl<$Res>

 /// Create a copy of SnAuthChallenge
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? expiredAt = null,Object? stepRemain = null,Object? stepTotal = null,Object? failedAttempts = null,Object? type = null,Object? blacklistFactors = null,Object? audiences = null,Object? scopes = null,Object? ipAddress = null,Object? userAgent = null,Object? nonce = freezed,Object? location = freezed,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? expiredAt = freezed,Object? stepRemain = null,Object? stepTotal = null,Object? failedAttempts = null,Object? type = null,Object? blacklistFactors = null,Object? audiences = null,Object? scopes = null,Object? ipAddress = null,Object? userAgent = null,Object? nonce = freezed,Object? location = freezed,Object? accountId = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
  return _then(_SnAuthChallenge(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
-as String,expiredAt: null == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
-as DateTime,stepRemain: null == stepRemain ? _self.stepRemain : stepRemain // ignore: cast_nullable_to_non_nullable
+as String,expiredAt: freezed == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,stepRemain: null == stepRemain ? _self.stepRemain : stepRemain // ignore: cast_nullable_to_non_nullable
 as int,stepTotal: null == stepTotal ? _self.stepTotal : stepTotal // ignore: cast_nullable_to_non_nullable
 as int,failedAttempts: null == failedAttempts ? _self.failedAttempts : failedAttempts // ignore: cast_nullable_to_non_nullable
 as int,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
@@ -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,14 +869,26 @@ 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));
+  });
+}
 }


 /// @nodoc
 mixin _$SnAuthSession {

- String get id; String? get label; DateTime get lastGrantedAt; DateTime get expiredAt; String get accountId; String get challengeId; SnAuthChallenge get challenge; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
+ String get id; String? get label; DateTime get lastGrantedAt; DateTime? get expiredAt; String get accountId; String get challengeId; SnAuthChallenge get challenge; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
 /// Create a copy of SnAuthSession
 /// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@@ -628,7 +921,7 @@ abstract mixin class $SnAuthSessionCopyWith<$Res>  {
  factory $SnAuthSessionCopyWith(SnAuthSession value, $Res Function(SnAuthSession) _then) = _$SnAuthSessionCopyWithImpl;
@useResult
 $Res call({
- String id, String? label, DateTime lastGrantedAt, DateTime expiredAt, String accountId, String challengeId, SnAuthChallenge challenge, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, String? label, DateTime lastGrantedAt, DateTime? expiredAt, String accountId, String challengeId, SnAuthChallenge challenge, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });


@@ -645,13 +938,13 @@ class _$SnAuthSessionCopyWithImpl<$Res>

 /// Create a copy of SnAuthSession
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? label = freezed,Object? lastGrantedAt = null,Object? expiredAt = null,Object? accountId = null,Object? challengeId = null,Object? challenge = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? label = freezed,Object? lastGrantedAt = null,Object? expiredAt = freezed,Object? accountId = null,Object? challengeId = null,Object? challenge = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
  return _then(_self.copyWith(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,label: freezed == label ? _self.label : label // ignore: cast_nullable_to_non_nullable
 as String?,lastGrantedAt: null == lastGrantedAt ? _self.lastGrantedAt : lastGrantedAt // ignore: cast_nullable_to_non_nullable
-as DateTime,expiredAt: null == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
-as DateTime,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as DateTime,expiredAt: freezed == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
 as String,challengeId: null == challengeId ? _self.challengeId : challengeId // ignore: cast_nullable_to_non_nullable
 as String,challenge: null == challenge ? _self.challenge : challenge // ignore: cast_nullable_to_non_nullable
 as SnAuthChallenge,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
@@ -748,7 +1041,7 @@ return $default(_that);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String? label,  DateTime lastGrantedAt,  DateTime expiredAt,  String accountId,  String challengeId,  SnAuthChallenge challenge,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String? label,  DateTime lastGrantedAt,  DateTime? expiredAt,  String accountId,  String challengeId,  SnAuthChallenge challenge,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _SnAuthSession() when $default != null:
 return $default(_that.id,_that.label,_that.lastGrantedAt,_that.expiredAt,_that.accountId,_that.challengeId,_that.challenge,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
@@ -769,7 +1062,7 @@ return $default(_that.id,_that.label,_that.lastGrantedAt,_that.expiredAt,_that.a
 /// }
 /// ```

-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String? label,  DateTime lastGrantedAt,  DateTime expiredAt,  String accountId,  String challengeId,  SnAuthChallenge challenge,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String? label,  DateTime lastGrantedAt,  DateTime? expiredAt,  String accountId,  String challengeId,  SnAuthChallenge challenge,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
 switch (_that) {
 case _SnAuthSession():
 return $default(_that.id,_that.label,_that.lastGrantedAt,_that.expiredAt,_that.accountId,_that.challengeId,_that.challenge,_that.createdAt,_that.updatedAt,_that.deletedAt);}
@@ -786,7 +1079,7 @@ return $default(_that.id,_that.label,_that.lastGrantedAt,_that.expiredAt,_that.a
 /// }
 /// ```

-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String? label,  DateTime lastGrantedAt,  DateTime expiredAt,  String accountId,  String challengeId,  SnAuthChallenge challenge,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String? label,  DateTime lastGrantedAt,  DateTime? expiredAt,  String accountId,  String challengeId,  SnAuthChallenge challenge,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
 switch (_that) {
 case _SnAuthSession() when $default != null:
 return $default(_that.id,_that.label,_that.lastGrantedAt,_that.expiredAt,_that.accountId,_that.challengeId,_that.challenge,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
@@ -807,7 +1100,7 @@ class _SnAuthSession implements SnAuthSession {
@override final  String id;
@override final  String? label;
@override final  DateTime lastGrantedAt;
-@override final  DateTime expiredAt;
+@override final  DateTime? expiredAt;
@override final  String accountId;
@override final  String challengeId;
@override final  SnAuthChallenge challenge;
@@ -848,7 +1141,7 @@ abstract mixin class _$SnAuthSessionCopyWith<$Res> implements $SnAuthSessionCopy
  factory _$SnAuthSessionCopyWith(_SnAuthSession value, $Res Function(_SnAuthSession) _then) = __$SnAuthSessionCopyWithImpl;
@override @useResult
 $Res call({
- String id, String? label, DateTime lastGrantedAt, DateTime expiredAt, String accountId, String challengeId, SnAuthChallenge challenge, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String id, String? label, DateTime lastGrantedAt, DateTime? expiredAt, String accountId, String challengeId, SnAuthChallenge challenge, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
 });


@@ -865,13 +1158,13 @@ class __$SnAuthSessionCopyWithImpl<$Res>

 /// Create a copy of SnAuthSession
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? label = freezed,Object? lastGrantedAt = null,Object? expiredAt = null,Object? accountId = null,Object? challengeId = null,Object? challenge = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? label = freezed,Object? lastGrantedAt = null,Object? expiredAt = freezed,Object? accountId = null,Object? challengeId = null,Object? challenge = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
  return _then(_SnAuthSession(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,label: freezed == label ? _self.label : label // ignore: cast_nullable_to_non_nullable
 as String?,lastGrantedAt: null == lastGrantedAt ? _self.lastGrantedAt : lastGrantedAt // ignore: cast_nullable_to_non_nullable
-as DateTime,expiredAt: null == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
-as DateTime,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as DateTime,expiredAt: freezed == expiredAt ? _self.expiredAt : expiredAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
 as String,challengeId: null == challengeId ? _self.challengeId : challengeId // ignore: cast_nullable_to_non_nullable
 as String,challenge: null == challenge ? _self.challenge : challenge // ignore: cast_nullable_to_non_nullable
 as SnAuthChallenge,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
--- a/lib/models/auth.g.dart
+++ b/lib/models/auth.g.dart
@@ -13,10 +13,31 @@ 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,
-      expiredAt: DateTime.parse(json['expired_at'] as String),
+      expiredAt:
+          json['expired_at'] == null
+              ? null
+              : DateTime.parse(json['expired_at'] as String),
      stepRemain: (json['step_remain'] as num).toInt(),
      stepTotal: (json['step_total'] as num).toInt(),
      failedAttempts: (json['failed_attempts'] as num).toInt(),
@@ -30,7 +51,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),
@@ -43,7 +69,7 @@ _SnAuthChallenge _$SnAuthChallengeFromJson(Map<String, dynamic> json) =>
 Map<String, dynamic> _$SnAuthChallengeToJson(_SnAuthChallenge instance) =>
    <String, dynamic>{
      'id': instance.id,
-      'expired_at': instance.expiredAt.toIso8601String(),
+      'expired_at': instance.expiredAt?.toIso8601String(),
      'step_remain': instance.stepRemain,
      'step_total': instance.stepTotal,
      'failed_attempts': instance.failedAttempts,
@@ -54,7 +80,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(),
@@ -66,7 +92,10 @@ _SnAuthSession _$SnAuthSessionFromJson(Map<String, dynamic> json) =>
      id: json['id'] as String,
      label: json['label'] as String?,
      lastGrantedAt: DateTime.parse(json['last_granted_at'] as String),
-      expiredAt: DateTime.parse(json['expired_at'] as String),
+      expiredAt:
+          json['expired_at'] == null
+              ? null
+              : DateTime.parse(json['expired_at'] as String),
      accountId: json['account_id'] as String,
      challengeId: json['challenge_id'] as String,
      challenge: SnAuthChallenge.fromJson(
@@ -85,7 +114,7 @@ Map<String, dynamic> _$SnAuthSessionToJson(_SnAuthSession instance) =>
      'id': instance.id,
      'label': instance.label,
      'last_granted_at': instance.lastGrantedAt.toIso8601String(),
-      'expired_at': instance.expiredAt.toIso8601String(),
+      'expired_at': instance.expiredAt?.toIso8601String(),
      'account_id': instance.accountId,
      'challenge_id': instance.challengeId,
      'challenge': instance.challenge.toJson(),
--- a/lib/models/bot.dart
+++ b/lib/models/bot.dart
@@ -0,0 +1,63 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:island/models/account.dart';
+import 'package:island/models/developer.dart';
+
+part 'bot.freezed.dart';
+part 'bot.g.dart';
+
+@freezed
+sealed class Bot with _$Bot {
+  const factory Bot({
+    required String id,
+    required String slug,
+    required bool isActive,
+    required String projectId,
+    required DateTime createdAt,
+    required DateTime updatedAt,
+    required SnAccount account,
+    SnDeveloper? developer,
+  }) = _Bot;
+
+  factory Bot.fromJson(Map<String, dynamic> json) => _$BotFromJson(json);
+}
+
+@freezed
+sealed class BotConfig with _$BotConfig {
+  const factory BotConfig({
+    @Default(false) bool isPublic,
+    @Default(false) bool isInteractive,
+    @Default([]) List<String> allowedRealms,
+    @Default([]) List<String> allowedChatTypes,
+    @Default({}) Map<String, dynamic> metadata,
+  }) = _BotConfig;
+
+  factory BotConfig.fromJson(Map<String, dynamic> json) =>
+      _$BotConfigFromJson(json);
+}
+
+@freezed
+sealed class BotLinks with _$BotLinks {
+  const factory BotLinks({
+    String? website,
+    String? documentation,
+    String? privacyPolicy,
+    String? termsOfService,
+  }) = _BotLinks;
+
+  factory BotLinks.fromJson(Map<String, dynamic> json) =>
+      _$BotLinksFromJson(json);
+}
+
+@freezed
+sealed class BotSecret with _$BotSecret {
+  const factory BotSecret({
+    @Default('') String id,
+    @Default('') String secret,
+    String? description,
+    DateTime? expiredAt,
+    @Default('') String botId,
+  }) = _BotSecret;
+
+  factory BotSecret.fromJson(Map<String, dynamic> json) =>
+      _$BotSecretFromJson(json);
+}
--- a/lib/models/bot.freezed.dart
+++ b/lib/models/bot.freezed.dart
--- a/lib/models/bot.g.dart
+++ b/lib/models/bot.g.dart
@@ -0,0 +1,91 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'bot.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_Bot _$BotFromJson(Map<String, dynamic> json) => _Bot(
+  id: json['id'] as String,
+  slug: json['slug'] as String,
+  isActive: json['is_active'] as bool,
+  projectId: json['project_id'] as String,
+  createdAt: DateTime.parse(json['created_at'] as String),
+  updatedAt: DateTime.parse(json['updated_at'] as String),
+  account: SnAccount.fromJson(json['account'] as Map<String, dynamic>),
+  developer:
+      json['developer'] == null
+          ? null
+          : SnDeveloper.fromJson(json['developer'] as Map<String, dynamic>),
+);
+
+Map<String, dynamic> _$BotToJson(_Bot instance) => <String, dynamic>{
+  'id': instance.id,
+  'slug': instance.slug,
+  'is_active': instance.isActive,
+  'project_id': instance.projectId,
+  'created_at': instance.createdAt.toIso8601String(),
+  'updated_at': instance.updatedAt.toIso8601String(),
+  'account': instance.account.toJson(),
+  'developer': instance.developer?.toJson(),
+};
+
+_BotConfig _$BotConfigFromJson(Map<String, dynamic> json) => _BotConfig(
+  isPublic: json['is_public'] as bool? ?? false,
+  isInteractive: json['is_interactive'] as bool? ?? false,
+  allowedRealms:
+      (json['allowed_realms'] as List<dynamic>?)
+          ?.map((e) => e as String)
+          .toList() ??
+      const [],
+  allowedChatTypes:
+      (json['allowed_chat_types'] as List<dynamic>?)
+          ?.map((e) => e as String)
+          .toList() ??
+      const [],
+  metadata: json['metadata'] as Map<String, dynamic>? ?? const {},
+);
+
+Map<String, dynamic> _$BotConfigToJson(_BotConfig instance) =>
+    <String, dynamic>{
+      'is_public': instance.isPublic,
+      'is_interactive': instance.isInteractive,
+      'allowed_realms': instance.allowedRealms,
+      'allowed_chat_types': instance.allowedChatTypes,
+      'metadata': instance.metadata,
+    };
+
+_BotLinks _$BotLinksFromJson(Map<String, dynamic> json) => _BotLinks(
+  website: json['website'] as String?,
+  documentation: json['documentation'] as String?,
+  privacyPolicy: json['privacy_policy'] as String?,
+  termsOfService: json['terms_of_service'] as String?,
+);
+
+Map<String, dynamic> _$BotLinksToJson(_BotLinks instance) => <String, dynamic>{
+  'website': instance.website,
+  'documentation': instance.documentation,
+  'privacy_policy': instance.privacyPolicy,
+  'terms_of_service': instance.termsOfService,
+};
+
+_BotSecret _$BotSecretFromJson(Map<String, dynamic> json) => _BotSecret(
+  id: json['id'] as String? ?? '',
+  secret: json['secret'] as String? ?? '',
+  description: json['description'] as String?,
+  expiredAt:
+      json['expired_at'] == null
+          ? null
+          : DateTime.parse(json['expired_at'] as String),
+  botId: json['bot_id'] as String? ?? '',
+);
+
+Map<String, dynamic> _$BotSecretToJson(_BotSecret instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'secret': instance.secret,
+      'description': instance.description,
+      'expired_at': instance.expiredAt?.toIso8601String(),
+      'bot_id': instance.botId,
+    };
--- a/lib/models/bot_key.dart
+++ b/lib/models/bot_key.dart
@@ -0,0 +1,20 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'bot_key.freezed.dart';
+part 'bot_key.g.dart';
+
+@freezed
+sealed class SnAccountApiKey with _$SnAccountApiKey {
+  const factory SnAccountApiKey({
+    required String id,
+    required String label,
+    required String accountId,
+    required String sessionId,
+    required DateTime createdAt,
+    required DateTime updatedAt,
+    String? key,
+  }) = _SnAccountApiKey;
+
+  factory SnAccountApiKey.fromJson(Map<String, dynamic> json) =>
+      _$SnAccountApiKeyFromJson(json);
+}
--- a/lib/models/bot_key.freezed.dart
+++ b/lib/models/bot_key.freezed.dart
@@ -0,0 +1,289 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'bot_key.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+
+/// @nodoc
+mixin _$SnAccountApiKey {
+
+ String get id; String get label; String get accountId; String get sessionId; DateTime get createdAt; DateTime get updatedAt; String? get key;
+/// Create a copy of SnAccountApiKey
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$SnAccountApiKeyCopyWith<SnAccountApiKey> get copyWith => _$SnAccountApiKeyCopyWithImpl<SnAccountApiKey>(this as SnAccountApiKey, _$identity);
+
+  /// Serializes this SnAccountApiKey to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnAccountApiKey&&(identical(other.id, id) || other.id == id)&&(identical(other.label, label) || other.label == label)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.sessionId, sessionId) || other.sessionId == sessionId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.key, key) || other.key == key));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,label,accountId,sessionId,createdAt,updatedAt,key);
+
+@override
+String toString() {
+  return 'SnAccountApiKey(id: $id, label: $label, accountId: $accountId, sessionId: $sessionId, createdAt: $createdAt, updatedAt: $updatedAt, key: $key)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $SnAccountApiKeyCopyWith<$Res>  {
+  factory $SnAccountApiKeyCopyWith(SnAccountApiKey value, $Res Function(SnAccountApiKey) _then) = _$SnAccountApiKeyCopyWithImpl;
+@useResult
+$Res call({
+ String id, String label, String accountId, String sessionId, DateTime createdAt, DateTime updatedAt, String? key
+});
+
+
+
+
+}
+/// @nodoc
+class _$SnAccountApiKeyCopyWithImpl<$Res>
+    implements $SnAccountApiKeyCopyWith<$Res> {
+  _$SnAccountApiKeyCopyWithImpl(this._self, this._then);
+
+  final SnAccountApiKey _self;
+  final $Res Function(SnAccountApiKey) _then;
+
+/// Create a copy of SnAccountApiKey
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? label = null,Object? accountId = null,Object? sessionId = null,Object? createdAt = null,Object? updatedAt = null,Object? key = freezed,}) {
+  return _then(_self.copyWith(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,label: null == label ? _self.label : label // ignore: cast_nullable_to_non_nullable
+as String,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as String,sessionId: null == sessionId ? _self.sessionId : sessionId // 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,key: freezed == key ? _self.key : key // ignore: cast_nullable_to_non_nullable
+as String?,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [SnAccountApiKey].
+extension SnAccountApiKeyPatterns on SnAccountApiKey {
+/// 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( _SnAccountApiKey value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _SnAccountApiKey() 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( _SnAccountApiKey value)  $default,){
+final _that = this;
+switch (_that) {
+case _SnAccountApiKey():
+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( _SnAccountApiKey value)?  $default,){
+final _that = this;
+switch (_that) {
+case _SnAccountApiKey() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String label,  String accountId,  String sessionId,  DateTime createdAt,  DateTime updatedAt,  String? key)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _SnAccountApiKey() when $default != null:
+return $default(_that.id,_that.label,_that.accountId,_that.sessionId,_that.createdAt,_that.updatedAt,_that.key);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String label,  String accountId,  String sessionId,  DateTime createdAt,  DateTime updatedAt,  String? key)  $default,) {final _that = this;
+switch (_that) {
+case _SnAccountApiKey():
+return $default(_that.id,_that.label,_that.accountId,_that.sessionId,_that.createdAt,_that.updatedAt,_that.key);}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String label,  String accountId,  String sessionId,  DateTime createdAt,  DateTime updatedAt,  String? key)?  $default,) {final _that = this;
+switch (_that) {
+case _SnAccountApiKey() when $default != null:
+return $default(_that.id,_that.label,_that.accountId,_that.sessionId,_that.createdAt,_that.updatedAt,_that.key);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _SnAccountApiKey implements SnAccountApiKey {
+  const _SnAccountApiKey({required this.id, required this.label, required this.accountId, required this.sessionId, required this.createdAt, required this.updatedAt, this.key});
+  factory _SnAccountApiKey.fromJson(Map<String, dynamic> json) => _$SnAccountApiKeyFromJson(json);
+
+@override final  String id;
+@override final  String label;
+@override final  String accountId;
+@override final  String sessionId;
+@override final  DateTime createdAt;
+@override final  DateTime updatedAt;
+@override final  String? key;
+
+/// Create a copy of SnAccountApiKey
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$SnAccountApiKeyCopyWith<_SnAccountApiKey> get copyWith => __$SnAccountApiKeyCopyWithImpl<_SnAccountApiKey>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$SnAccountApiKeyToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnAccountApiKey&&(identical(other.id, id) || other.id == id)&&(identical(other.label, label) || other.label == label)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.sessionId, sessionId) || other.sessionId == sessionId)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.key, key) || other.key == key));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,label,accountId,sessionId,createdAt,updatedAt,key);
+
+@override
+String toString() {
+  return 'SnAccountApiKey(id: $id, label: $label, accountId: $accountId, sessionId: $sessionId, createdAt: $createdAt, updatedAt: $updatedAt, key: $key)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$SnAccountApiKeyCopyWith<$Res> implements $SnAccountApiKeyCopyWith<$Res> {
+  factory _$SnAccountApiKeyCopyWith(_SnAccountApiKey value, $Res Function(_SnAccountApiKey) _then) = __$SnAccountApiKeyCopyWithImpl;
+@override @useResult
+$Res call({
+ String id, String label, String accountId, String sessionId, DateTime createdAt, DateTime updatedAt, String? key
+});
+
+
+
+
+}
+/// @nodoc
+class __$SnAccountApiKeyCopyWithImpl<$Res>
+    implements _$SnAccountApiKeyCopyWith<$Res> {
+  __$SnAccountApiKeyCopyWithImpl(this._self, this._then);
+
+  final _SnAccountApiKey _self;
+  final $Res Function(_SnAccountApiKey) _then;
+
+/// Create a copy of SnAccountApiKey
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? label = null,Object? accountId = null,Object? sessionId = null,Object? createdAt = null,Object? updatedAt = null,Object? key = freezed,}) {
+  return _then(_SnAccountApiKey(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,label: null == label ? _self.label : label // ignore: cast_nullable_to_non_nullable
+as String,accountId: null == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as String,sessionId: null == sessionId ? _self.sessionId : sessionId // 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,key: freezed == key ? _self.key : key // ignore: cast_nullable_to_non_nullable
+as String?,
+  ));
+}
+
+
+}
+
+// dart format on
--- a/lib/models/bot_key.g.dart
+++ b/lib/models/bot_key.g.dart
@@ -0,0 +1,29 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'bot_key.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_SnAccountApiKey _$SnAccountApiKeyFromJson(Map<String, dynamic> json) =>
+    _SnAccountApiKey(
+      id: json['id'] as String,
+      label: json['label'] as String,
+      accountId: json['account_id'] as String,
+      sessionId: json['session_id'] as String,
+      createdAt: DateTime.parse(json['created_at'] as String),
+      updatedAt: DateTime.parse(json['updated_at'] as String),
+      key: json['key'] as String?,
+    );
+
+Map<String, dynamic> _$SnAccountApiKeyToJson(_SnAccountApiKey instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'label': instance.label,
+      'account_id': instance.accountId,
+      'session_id': instance.sessionId,
+      'created_at': instance.createdAt.toIso8601String(),
+      'updated_at': instance.updatedAt.toIso8601String(),
+      'key': instance.key,
+    };
--- a/lib/models/chat.dart
+++ b/lib/models/chat.dart
@@ -40,7 +40,7 @@ sealed class SnChatMessage with _$SnChatMessage {
    String? content,
    String? nonce,
    @Default({}) Map<String, dynamic> meta,
-    @Default([]) List<String> membersMetioned,
+    @Default([]) List<String> membersMentioned,
    DateTime? editedAt,
    @Default([]) List<SnCloudFile> attachments,
    @Default([]) List<SnChatReaction> reactions,
@@ -91,6 +91,7 @@ sealed class SnChatMember with _$SnChatMember {
    required DateTime? breakUntil,
    required DateTime? timeoutUntil,
    required bool isBot,
+    required SnAccountStatus? status,
    // Frontend data
    DateTime? lastTyped,
  }) = _SnChatMember;
@@ -103,7 +104,7 @@ sealed class SnChatMember with _$SnChatMember {
 sealed class SnChatSummary with _$SnChatSummary {
  const factory SnChatSummary({
    required int unreadCount,
-    required SnChatMessage lastMessage,
+    required SnChatMessage? lastMessage,
  }) = _SnChatSummary;

  factory SnChatSummary.fromJson(Map<String, dynamic> json) =>
@@ -116,23 +117,10 @@ class MessageChangeAction {
  static const String delete = "delete";
 }

-@freezed
-sealed class MessageChange with _$MessageChange {
-  const factory MessageChange({
-    required String messageId,
-    required String action,
-    SnChatMessage? message,
-    required DateTime timestamp,
-  }) = _MessageChange;
-
-  factory MessageChange.fromJson(Map<String, dynamic> json) =>
-      _$MessageChangeFromJson(json);
-}
-
@freezed
 sealed class MessageSyncResponse with _$MessageSyncResponse {
  const factory MessageSyncResponse({
-    @Default([]) List<MessageChange> changes,
+    @Default([]) List<SnChatMessage> messages,
    required DateTime currentTimestamp,
  }) = _MessageSyncResponse;

--- a/lib/models/chat.freezed.dart
+++ b/lib/models/chat.freezed.dart
@@ -391,7 +391,7 @@ $SnRealmCopyWith<$Res>? get realm {
 /// @nodoc
 mixin _$SnChatMessage {

- DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt; String get id; String get type; String? get content; String? get nonce; Map<String, dynamic> get meta; List<String> get membersMetioned; DateTime? get editedAt; List<SnCloudFile> get attachments; List<SnChatReaction> get reactions; String? get repliedMessageId; String? get forwardedMessageId; String get senderId; SnChatMember get sender; String get chatRoomId;
+ DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt; String get id; String get type; String? get content; String? get nonce; Map<String, dynamic> get meta; List<String> get membersMentioned; DateTime? get editedAt; List<SnCloudFile> get attachments; List<SnChatReaction> get reactions; String? get repliedMessageId; String? get forwardedMessageId; String get senderId; SnChatMember get sender; String get chatRoomId;
 /// Create a copy of SnChatMessage
 /// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@@ -404,16 +404,16 @@ $SnChatMessageCopyWith<SnChatMessage> get copyWith => _$SnChatMessageCopyWithImp

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnChatMessage&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&(identical(other.id, id) || other.id == id)&&(identical(other.type, type) || other.type == type)&&(identical(other.content, content) || other.content == content)&&(identical(other.nonce, nonce) || other.nonce == nonce)&&const DeepCollectionEquality().equals(other.meta, meta)&&const DeepCollectionEquality().equals(other.membersMetioned, membersMetioned)&&(identical(other.editedAt, editedAt) || other.editedAt == editedAt)&&const DeepCollectionEquality().equals(other.attachments, attachments)&&const DeepCollectionEquality().equals(other.reactions, reactions)&&(identical(other.repliedMessageId, repliedMessageId) || other.repliedMessageId == repliedMessageId)&&(identical(other.forwardedMessageId, forwardedMessageId) || other.forwardedMessageId == forwardedMessageId)&&(identical(other.senderId, senderId) || other.senderId == senderId)&&(identical(other.sender, sender) || other.sender == sender)&&(identical(other.chatRoomId, chatRoomId) || other.chatRoomId == chatRoomId));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnChatMessage&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&(identical(other.id, id) || other.id == id)&&(identical(other.type, type) || other.type == type)&&(identical(other.content, content) || other.content == content)&&(identical(other.nonce, nonce) || other.nonce == nonce)&&const DeepCollectionEquality().equals(other.meta, meta)&&const DeepCollectionEquality().equals(other.membersMentioned, membersMentioned)&&(identical(other.editedAt, editedAt) || other.editedAt == editedAt)&&const DeepCollectionEquality().equals(other.attachments, attachments)&&const DeepCollectionEquality().equals(other.reactions, reactions)&&(identical(other.repliedMessageId, repliedMessageId) || other.repliedMessageId == repliedMessageId)&&(identical(other.forwardedMessageId, forwardedMessageId) || other.forwardedMessageId == forwardedMessageId)&&(identical(other.senderId, senderId) || other.senderId == senderId)&&(identical(other.sender, sender) || other.sender == sender)&&(identical(other.chatRoomId, chatRoomId) || other.chatRoomId == chatRoomId));
 }

@JsonKey(includeFromJson: false, includeToJson: false)
@override
-int get hashCode => Object.hash(runtimeType,createdAt,updatedAt,deletedAt,id,type,content,nonce,const DeepCollectionEquality().hash(meta),const DeepCollectionEquality().hash(membersMetioned),editedAt,const DeepCollectionEquality().hash(attachments),const DeepCollectionEquality().hash(reactions),repliedMessageId,forwardedMessageId,senderId,sender,chatRoomId);
+int get hashCode => Object.hash(runtimeType,createdAt,updatedAt,deletedAt,id,type,content,nonce,const DeepCollectionEquality().hash(meta),const DeepCollectionEquality().hash(membersMentioned),editedAt,const DeepCollectionEquality().hash(attachments),const DeepCollectionEquality().hash(reactions),repliedMessageId,forwardedMessageId,senderId,sender,chatRoomId);

@override
 String toString() {
-  return 'SnChatMessage(createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, id: $id, type: $type, content: $content, nonce: $nonce, meta: $meta, membersMetioned: $membersMetioned, editedAt: $editedAt, attachments: $attachments, reactions: $reactions, repliedMessageId: $repliedMessageId, forwardedMessageId: $forwardedMessageId, senderId: $senderId, sender: $sender, chatRoomId: $chatRoomId)';
+  return 'SnChatMessage(createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, id: $id, type: $type, content: $content, nonce: $nonce, meta: $meta, membersMentioned: $membersMentioned, editedAt: $editedAt, attachments: $attachments, reactions: $reactions, repliedMessageId: $repliedMessageId, forwardedMessageId: $forwardedMessageId, senderId: $senderId, sender: $sender, chatRoomId: $chatRoomId)';
 }


@@ -424,7 +424,7 @@ abstract mixin class $SnChatMessageCopyWith<$Res>  {
  factory $SnChatMessageCopyWith(SnChatMessage value, $Res Function(SnChatMessage) _then) = _$SnChatMessageCopyWithImpl;
@useResult
 $Res call({
- DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, String id, String type, String? content, String? nonce, Map<String, dynamic> meta, List<String> membersMetioned, DateTime? editedAt, List<SnCloudFile> attachments, List<SnChatReaction> reactions, String? repliedMessageId, String? forwardedMessageId, String senderId, SnChatMember sender, String chatRoomId
+ DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, String id, String type, String? content, String? nonce, Map<String, dynamic> meta, List<String> membersMentioned, DateTime? editedAt, List<SnCloudFile> attachments, List<SnChatReaction> reactions, String? repliedMessageId, String? forwardedMessageId, String senderId, SnChatMember sender, String chatRoomId
 });


@@ -441,7 +441,7 @@ class _$SnChatMessageCopyWithImpl<$Res>

 /// Create a copy of SnChatMessage
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? id = null,Object? type = null,Object? content = freezed,Object? nonce = freezed,Object? meta = null,Object? membersMetioned = null,Object? editedAt = freezed,Object? attachments = null,Object? reactions = null,Object? repliedMessageId = freezed,Object? forwardedMessageId = freezed,Object? senderId = null,Object? sender = null,Object? chatRoomId = null,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? id = null,Object? type = null,Object? content = freezed,Object? nonce = freezed,Object? meta = null,Object? membersMentioned = null,Object? editedAt = freezed,Object? attachments = null,Object? reactions = null,Object? repliedMessageId = freezed,Object? forwardedMessageId = freezed,Object? senderId = null,Object? sender = null,Object? chatRoomId = null,}) {
  return _then(_self.copyWith(
 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
@@ -451,7 +451,7 @@ as String,type: null == type ? _self.type : type // ignore: cast_nullable_to_non
 as String,content: freezed == content ? _self.content : content // ignore: cast_nullable_to_non_nullable
 as String?,nonce: freezed == nonce ? _self.nonce : nonce // ignore: cast_nullable_to_non_nullable
 as String?,meta: null == meta ? _self.meta : meta // ignore: cast_nullable_to_non_nullable
-as Map<String, dynamic>,membersMetioned: null == membersMetioned ? _self.membersMetioned : membersMetioned // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>,membersMentioned: null == membersMentioned ? _self.membersMentioned : membersMentioned // ignore: cast_nullable_to_non_nullable
 as List<String>,editedAt: freezed == editedAt ? _self.editedAt : editedAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,attachments: null == attachments ? _self.attachments : attachments // ignore: cast_nullable_to_non_nullable
 as List<SnCloudFile>,reactions: null == reactions ? _self.reactions : reactions // ignore: cast_nullable_to_non_nullable
@@ -551,10 +551,10 @@ return $default(_that);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt,  String id,  String type,  String? content,  String? nonce,  Map<String, dynamic> meta,  List<String> membersMetioned,  DateTime? editedAt,  List<SnCloudFile> attachments,  List<SnChatReaction> reactions,  String? repliedMessageId,  String? forwardedMessageId,  String senderId,  SnChatMember sender,  String chatRoomId)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt,  String id,  String type,  String? content,  String? nonce,  Map<String, dynamic> meta,  List<String> membersMentioned,  DateTime? editedAt,  List<SnCloudFile> attachments,  List<SnChatReaction> reactions,  String? repliedMessageId,  String? forwardedMessageId,  String senderId,  SnChatMember sender,  String chatRoomId)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _SnChatMessage() when $default != null:
-return $default(_that.createdAt,_that.updatedAt,_that.deletedAt,_that.id,_that.type,_that.content,_that.nonce,_that.meta,_that.membersMetioned,_that.editedAt,_that.attachments,_that.reactions,_that.repliedMessageId,_that.forwardedMessageId,_that.senderId,_that.sender,_that.chatRoomId);case _:
+return $default(_that.createdAt,_that.updatedAt,_that.deletedAt,_that.id,_that.type,_that.content,_that.nonce,_that.meta,_that.membersMentioned,_that.editedAt,_that.attachments,_that.reactions,_that.repliedMessageId,_that.forwardedMessageId,_that.senderId,_that.sender,_that.chatRoomId);case _:
  return orElse();

 }
@@ -572,10 +572,10 @@ return $default(_that.createdAt,_that.updatedAt,_that.deletedAt,_that.id,_that.t
 /// }
 /// ```

-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt,  String id,  String type,  String? content,  String? nonce,  Map<String, dynamic> meta,  List<String> membersMetioned,  DateTime? editedAt,  List<SnCloudFile> attachments,  List<SnChatReaction> reactions,  String? repliedMessageId,  String? forwardedMessageId,  String senderId,  SnChatMember sender,  String chatRoomId)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt,  String id,  String type,  String? content,  String? nonce,  Map<String, dynamic> meta,  List<String> membersMentioned,  DateTime? editedAt,  List<SnCloudFile> attachments,  List<SnChatReaction> reactions,  String? repliedMessageId,  String? forwardedMessageId,  String senderId,  SnChatMember sender,  String chatRoomId)  $default,) {final _that = this;
 switch (_that) {
 case _SnChatMessage():
-return $default(_that.createdAt,_that.updatedAt,_that.deletedAt,_that.id,_that.type,_that.content,_that.nonce,_that.meta,_that.membersMetioned,_that.editedAt,_that.attachments,_that.reactions,_that.repliedMessageId,_that.forwardedMessageId,_that.senderId,_that.sender,_that.chatRoomId);}
+return $default(_that.createdAt,_that.updatedAt,_that.deletedAt,_that.id,_that.type,_that.content,_that.nonce,_that.meta,_that.membersMentioned,_that.editedAt,_that.attachments,_that.reactions,_that.repliedMessageId,_that.forwardedMessageId,_that.senderId,_that.sender,_that.chatRoomId);}
 }
 /// A variant of `when` that fallback to returning `null`
 ///
@@ -589,10 +589,10 @@ return $default(_that.createdAt,_that.updatedAt,_that.deletedAt,_that.id,_that.t
 /// }
 /// ```

-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt,  String id,  String type,  String? content,  String? nonce,  Map<String, dynamic> meta,  List<String> membersMetioned,  DateTime? editedAt,  List<SnCloudFile> attachments,  List<SnChatReaction> reactions,  String? repliedMessageId,  String? forwardedMessageId,  String senderId,  SnChatMember sender,  String chatRoomId)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt,  String id,  String type,  String? content,  String? nonce,  Map<String, dynamic> meta,  List<String> membersMentioned,  DateTime? editedAt,  List<SnCloudFile> attachments,  List<SnChatReaction> reactions,  String? repliedMessageId,  String? forwardedMessageId,  String senderId,  SnChatMember sender,  String chatRoomId)?  $default,) {final _that = this;
 switch (_that) {
 case _SnChatMessage() when $default != null:
-return $default(_that.createdAt,_that.updatedAt,_that.deletedAt,_that.id,_that.type,_that.content,_that.nonce,_that.meta,_that.membersMetioned,_that.editedAt,_that.attachments,_that.reactions,_that.repliedMessageId,_that.forwardedMessageId,_that.senderId,_that.sender,_that.chatRoomId);case _:
+return $default(_that.createdAt,_that.updatedAt,_that.deletedAt,_that.id,_that.type,_that.content,_that.nonce,_that.meta,_that.membersMentioned,_that.editedAt,_that.attachments,_that.reactions,_that.repliedMessageId,_that.forwardedMessageId,_that.senderId,_that.sender,_that.chatRoomId);case _:
  return null;

 }
@@ -604,7 +604,7 @@ return $default(_that.createdAt,_that.updatedAt,_that.deletedAt,_that.id,_that.t
@JsonSerializable()

 class _SnChatMessage implements SnChatMessage {
-  const _SnChatMessage({required this.createdAt, required this.updatedAt, this.deletedAt, required this.id, this.type = 'text', this.content, this.nonce, final  Map<String, dynamic> meta = const {}, final  List<String> membersMetioned = const [], this.editedAt, final  List<SnCloudFile> attachments = const [], final  List<SnChatReaction> reactions = const [], this.repliedMessageId, this.forwardedMessageId, required this.senderId, required this.sender, required this.chatRoomId}): _meta = meta,_membersMetioned = membersMetioned,_attachments = attachments,_reactions = reactions;
+  const _SnChatMessage({required this.createdAt, required this.updatedAt, this.deletedAt, required this.id, this.type = 'text', this.content, this.nonce, final  Map<String, dynamic> meta = const {}, final  List<String> membersMentioned = const [], this.editedAt, final  List<SnCloudFile> attachments = const [], final  List<SnChatReaction> reactions = const [], this.repliedMessageId, this.forwardedMessageId, required this.senderId, required this.sender, required this.chatRoomId}): _meta = meta,_membersMentioned = membersMentioned,_attachments = attachments,_reactions = reactions;
  factory _SnChatMessage.fromJson(Map<String, dynamic> json) => _$SnChatMessageFromJson(json);

@override final  DateTime createdAt;
@@ -621,11 +621,11 @@ class _SnChatMessage implements SnChatMessage {
  return EqualUnmodifiableMapView(_meta);
 }

- final  List<String> _membersMetioned;
-@override@JsonKey() List<String> get membersMetioned {
-  if (_membersMetioned is EqualUnmodifiableListView) return _membersMetioned;
+ final  List<String> _membersMentioned;
+@override@JsonKey() List<String> get membersMentioned {
+  if (_membersMentioned is EqualUnmodifiableListView) return _membersMentioned;
  // ignore: implicit_dynamic_type
-  return EqualUnmodifiableListView(_membersMetioned);
+  return EqualUnmodifiableListView(_membersMentioned);
 }

@override final  DateTime? editedAt;
@@ -662,16 +662,16 @@ Map<String, dynamic> toJson() {

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnChatMessage&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&(identical(other.id, id) || other.id == id)&&(identical(other.type, type) || other.type == type)&&(identical(other.content, content) || other.content == content)&&(identical(other.nonce, nonce) || other.nonce == nonce)&&const DeepCollectionEquality().equals(other._meta, _meta)&&const DeepCollectionEquality().equals(other._membersMetioned, _membersMetioned)&&(identical(other.editedAt, editedAt) || other.editedAt == editedAt)&&const DeepCollectionEquality().equals(other._attachments, _attachments)&&const DeepCollectionEquality().equals(other._reactions, _reactions)&&(identical(other.repliedMessageId, repliedMessageId) || other.repliedMessageId == repliedMessageId)&&(identical(other.forwardedMessageId, forwardedMessageId) || other.forwardedMessageId == forwardedMessageId)&&(identical(other.senderId, senderId) || other.senderId == senderId)&&(identical(other.sender, sender) || other.sender == sender)&&(identical(other.chatRoomId, chatRoomId) || other.chatRoomId == chatRoomId));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnChatMessage&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&(identical(other.id, id) || other.id == id)&&(identical(other.type, type) || other.type == type)&&(identical(other.content, content) || other.content == content)&&(identical(other.nonce, nonce) || other.nonce == nonce)&&const DeepCollectionEquality().equals(other._meta, _meta)&&const DeepCollectionEquality().equals(other._membersMentioned, _membersMentioned)&&(identical(other.editedAt, editedAt) || other.editedAt == editedAt)&&const DeepCollectionEquality().equals(other._attachments, _attachments)&&const DeepCollectionEquality().equals(other._reactions, _reactions)&&(identical(other.repliedMessageId, repliedMessageId) || other.repliedMessageId == repliedMessageId)&&(identical(other.forwardedMessageId, forwardedMessageId) || other.forwardedMessageId == forwardedMessageId)&&(identical(other.senderId, senderId) || other.senderId == senderId)&&(identical(other.sender, sender) || other.sender == sender)&&(identical(other.chatRoomId, chatRoomId) || other.chatRoomId == chatRoomId));
 }

@JsonKey(includeFromJson: false, includeToJson: false)
@override
-int get hashCode => Object.hash(runtimeType,createdAt,updatedAt,deletedAt,id,type,content,nonce,const DeepCollectionEquality().hash(_meta),const DeepCollectionEquality().hash(_membersMetioned),editedAt,const DeepCollectionEquality().hash(_attachments),const DeepCollectionEquality().hash(_reactions),repliedMessageId,forwardedMessageId,senderId,sender,chatRoomId);
+int get hashCode => Object.hash(runtimeType,createdAt,updatedAt,deletedAt,id,type,content,nonce,const DeepCollectionEquality().hash(_meta),const DeepCollectionEquality().hash(_membersMentioned),editedAt,const DeepCollectionEquality().hash(_attachments),const DeepCollectionEquality().hash(_reactions),repliedMessageId,forwardedMessageId,senderId,sender,chatRoomId);

@override
 String toString() {
-  return 'SnChatMessage(createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, id: $id, type: $type, content: $content, nonce: $nonce, meta: $meta, membersMetioned: $membersMetioned, editedAt: $editedAt, attachments: $attachments, reactions: $reactions, repliedMessageId: $repliedMessageId, forwardedMessageId: $forwardedMessageId, senderId: $senderId, sender: $sender, chatRoomId: $chatRoomId)';
+  return 'SnChatMessage(createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, id: $id, type: $type, content: $content, nonce: $nonce, meta: $meta, membersMentioned: $membersMentioned, editedAt: $editedAt, attachments: $attachments, reactions: $reactions, repliedMessageId: $repliedMessageId, forwardedMessageId: $forwardedMessageId, senderId: $senderId, sender: $sender, chatRoomId: $chatRoomId)';
 }


@@ -682,7 +682,7 @@ abstract mixin class _$SnChatMessageCopyWith<$Res> implements $SnChatMessageCopy
  factory _$SnChatMessageCopyWith(_SnChatMessage value, $Res Function(_SnChatMessage) _then) = __$SnChatMessageCopyWithImpl;
@override @useResult
 $Res call({
- DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, String id, String type, String? content, String? nonce, Map<String, dynamic> meta, List<String> membersMetioned, DateTime? editedAt, List<SnCloudFile> attachments, List<SnChatReaction> reactions, String? repliedMessageId, String? forwardedMessageId, String senderId, SnChatMember sender, String chatRoomId
+ DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, String id, String type, String? content, String? nonce, Map<String, dynamic> meta, List<String> membersMentioned, DateTime? editedAt, List<SnCloudFile> attachments, List<SnChatReaction> reactions, String? repliedMessageId, String? forwardedMessageId, String senderId, SnChatMember sender, String chatRoomId
 });


@@ -699,7 +699,7 @@ class __$SnChatMessageCopyWithImpl<$Res>

 /// Create a copy of SnChatMessage
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? id = null,Object? type = null,Object? content = freezed,Object? nonce = freezed,Object? meta = null,Object? membersMetioned = null,Object? editedAt = freezed,Object? attachments = null,Object? reactions = null,Object? repliedMessageId = freezed,Object? forwardedMessageId = freezed,Object? senderId = null,Object? sender = null,Object? chatRoomId = null,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? id = null,Object? type = null,Object? content = freezed,Object? nonce = freezed,Object? meta = null,Object? membersMentioned = null,Object? editedAt = freezed,Object? attachments = null,Object? reactions = null,Object? repliedMessageId = freezed,Object? forwardedMessageId = freezed,Object? senderId = null,Object? sender = null,Object? chatRoomId = null,}) {
  return _then(_SnChatMessage(
 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
@@ -709,7 +709,7 @@ as String,type: null == type ? _self.type : type // ignore: cast_nullable_to_non
 as String,content: freezed == content ? _self.content : content // ignore: cast_nullable_to_non_nullable
 as String?,nonce: freezed == nonce ? _self.nonce : nonce // ignore: cast_nullable_to_non_nullable
 as String?,meta: null == meta ? _self._meta : meta // ignore: cast_nullable_to_non_nullable
-as Map<String, dynamic>,membersMetioned: null == membersMetioned ? _self._membersMetioned : membersMetioned // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>,membersMentioned: null == membersMentioned ? _self._membersMentioned : membersMentioned // ignore: cast_nullable_to_non_nullable
 as List<String>,editedAt: freezed == editedAt ? _self.editedAt : editedAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,attachments: null == attachments ? _self._attachments : attachments // ignore: cast_nullable_to_non_nullable
 as List<SnCloudFile>,reactions: null == reactions ? _self._reactions : reactions // ignore: cast_nullable_to_non_nullable
@@ -1037,7 +1037,7 @@ $SnChatMemberCopyWith<$Res> get sender {
 /// @nodoc
 mixin _$SnChatMember {

- DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt; String get id; String get chatRoomId; SnChatRoom? get chatRoom; String get accountId; SnAccount get account; String? get nick; int get role; int get notify; DateTime? get joinedAt; DateTime? get breakUntil; DateTime? get timeoutUntil; bool get isBot;// Frontend data
+ DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt; String get id; String get chatRoomId; SnChatRoom? get chatRoom; String get accountId; SnAccount get account; String? get nick; int get role; int get notify; DateTime? get joinedAt; DateTime? get breakUntil; DateTime? get timeoutUntil; bool get isBot; SnAccountStatus? get status;// Frontend data
 DateTime? get lastTyped;
 /// Create a copy of SnChatMember
 /// with the given fields replaced by the non-null parameter values.
@@ -1051,16 +1051,16 @@ $SnChatMemberCopyWith<SnChatMember> get copyWith => _$SnChatMemberCopyWithImpl<S

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnChatMember&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&(identical(other.id, id) || other.id == id)&&(identical(other.chatRoomId, chatRoomId) || other.chatRoomId == chatRoomId)&&(identical(other.chatRoom, chatRoom) || other.chatRoom == chatRoom)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.account, account) || other.account == account)&&(identical(other.nick, nick) || other.nick == nick)&&(identical(other.role, role) || other.role == role)&&(identical(other.notify, notify) || other.notify == notify)&&(identical(other.joinedAt, joinedAt) || other.joinedAt == joinedAt)&&(identical(other.breakUntil, breakUntil) || other.breakUntil == breakUntil)&&(identical(other.timeoutUntil, timeoutUntil) || other.timeoutUntil == timeoutUntil)&&(identical(other.isBot, isBot) || other.isBot == isBot)&&(identical(other.lastTyped, lastTyped) || other.lastTyped == lastTyped));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnChatMember&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&(identical(other.id, id) || other.id == id)&&(identical(other.chatRoomId, chatRoomId) || other.chatRoomId == chatRoomId)&&(identical(other.chatRoom, chatRoom) || other.chatRoom == chatRoom)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.account, account) || other.account == account)&&(identical(other.nick, nick) || other.nick == nick)&&(identical(other.role, role) || other.role == role)&&(identical(other.notify, notify) || other.notify == notify)&&(identical(other.joinedAt, joinedAt) || other.joinedAt == joinedAt)&&(identical(other.breakUntil, breakUntil) || other.breakUntil == breakUntil)&&(identical(other.timeoutUntil, timeoutUntil) || other.timeoutUntil == timeoutUntil)&&(identical(other.isBot, isBot) || other.isBot == isBot)&&(identical(other.status, status) || other.status == status)&&(identical(other.lastTyped, lastTyped) || other.lastTyped == lastTyped));
 }

@JsonKey(includeFromJson: false, includeToJson: false)
@override
-int get hashCode => Object.hash(runtimeType,createdAt,updatedAt,deletedAt,id,chatRoomId,chatRoom,accountId,account,nick,role,notify,joinedAt,breakUntil,timeoutUntil,isBot,lastTyped);
+int get hashCode => Object.hash(runtimeType,createdAt,updatedAt,deletedAt,id,chatRoomId,chatRoom,accountId,account,nick,role,notify,joinedAt,breakUntil,timeoutUntil,isBot,status,lastTyped);

@override
 String toString() {
-  return 'SnChatMember(createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, id: $id, chatRoomId: $chatRoomId, chatRoom: $chatRoom, accountId: $accountId, account: $account, nick: $nick, role: $role, notify: $notify, joinedAt: $joinedAt, breakUntil: $breakUntil, timeoutUntil: $timeoutUntil, isBot: $isBot, lastTyped: $lastTyped)';
+  return 'SnChatMember(createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, id: $id, chatRoomId: $chatRoomId, chatRoom: $chatRoom, accountId: $accountId, account: $account, nick: $nick, role: $role, notify: $notify, joinedAt: $joinedAt, breakUntil: $breakUntil, timeoutUntil: $timeoutUntil, isBot: $isBot, status: $status, lastTyped: $lastTyped)';
 }


@@ -1071,11 +1071,11 @@ abstract mixin class $SnChatMemberCopyWith<$Res>  {
  factory $SnChatMemberCopyWith(SnChatMember value, $Res Function(SnChatMember) _then) = _$SnChatMemberCopyWithImpl;
@useResult
 $Res call({
- DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, String id, String chatRoomId, SnChatRoom? chatRoom, String accountId, SnAccount account, String? nick, int role, int notify, DateTime? joinedAt, DateTime? breakUntil, DateTime? timeoutUntil, bool isBot, DateTime? lastTyped
+ DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, String id, String chatRoomId, SnChatRoom? chatRoom, String accountId, SnAccount account, String? nick, int role, int notify, DateTime? joinedAt, DateTime? breakUntil, DateTime? timeoutUntil, bool isBot, SnAccountStatus? status, DateTime? lastTyped
 });


-$SnChatRoomCopyWith<$Res>? get chatRoom;$SnAccountCopyWith<$Res> get account;
+$SnChatRoomCopyWith<$Res>? get chatRoom;$SnAccountCopyWith<$Res> get account;$SnAccountStatusCopyWith<$Res>? get status;

 }
 /// @nodoc
@@ -1088,7 +1088,7 @@ class _$SnChatMemberCopyWithImpl<$Res>

 /// Create a copy of SnChatMember
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? id = null,Object? chatRoomId = null,Object? chatRoom = freezed,Object? accountId = null,Object? account = null,Object? nick = freezed,Object? role = null,Object? notify = null,Object? joinedAt = freezed,Object? breakUntil = freezed,Object? timeoutUntil = freezed,Object? isBot = null,Object? lastTyped = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? id = null,Object? chatRoomId = null,Object? chatRoom = freezed,Object? accountId = null,Object? account = null,Object? nick = freezed,Object? role = null,Object? notify = null,Object? joinedAt = freezed,Object? breakUntil = freezed,Object? timeoutUntil = freezed,Object? isBot = null,Object? status = freezed,Object? lastTyped = freezed,}) {
  return _then(_self.copyWith(
 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
@@ -1105,7 +1105,8 @@ as int,joinedAt: freezed == joinedAt ? _self.joinedAt : joinedAt // ignore: cast
 as DateTime?,breakUntil: freezed == breakUntil ? _self.breakUntil : breakUntil // ignore: cast_nullable_to_non_nullable
 as DateTime?,timeoutUntil: freezed == timeoutUntil ? _self.timeoutUntil : timeoutUntil // ignore: cast_nullable_to_non_nullable
 as DateTime?,isBot: null == isBot ? _self.isBot : isBot // ignore: cast_nullable_to_non_nullable
-as bool,lastTyped: freezed == lastTyped ? _self.lastTyped : lastTyped // ignore: cast_nullable_to_non_nullable
+as bool,status: freezed == status ? _self.status : status // ignore: cast_nullable_to_non_nullable
+as SnAccountStatus?,lastTyped: freezed == lastTyped ? _self.lastTyped : lastTyped // ignore: cast_nullable_to_non_nullable
 as DateTime?,
  ));
 }
@@ -1130,6 +1131,18 @@ $SnAccountCopyWith<$Res> get account {
  return $SnAccountCopyWith<$Res>(_self.account, (value) {
    return _then(_self.copyWith(account: value));
  });
+}/// Create a copy of SnChatMember
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnAccountStatusCopyWith<$Res>? get status {
+    if (_self.status == null) {
+    return null;
+  }
+
+  return $SnAccountStatusCopyWith<$Res>(_self.status!, (value) {
+    return _then(_self.copyWith(status: value));
+  });
 }
 }

@@ -1209,10 +1222,10 @@ return $default(_that);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt,  String id,  String chatRoomId,  SnChatRoom? chatRoom,  String accountId,  SnAccount account,  String? nick,  int role,  int notify,  DateTime? joinedAt,  DateTime? breakUntil,  DateTime? timeoutUntil,  bool isBot,  DateTime? lastTyped)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt,  String id,  String chatRoomId,  SnChatRoom? chatRoom,  String accountId,  SnAccount account,  String? nick,  int role,  int notify,  DateTime? joinedAt,  DateTime? breakUntil,  DateTime? timeoutUntil,  bool isBot,  SnAccountStatus? status,  DateTime? lastTyped)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _SnChatMember() when $default != null:
-return $default(_that.createdAt,_that.updatedAt,_that.deletedAt,_that.id,_that.chatRoomId,_that.chatRoom,_that.accountId,_that.account,_that.nick,_that.role,_that.notify,_that.joinedAt,_that.breakUntil,_that.timeoutUntil,_that.isBot,_that.lastTyped);case _:
+return $default(_that.createdAt,_that.updatedAt,_that.deletedAt,_that.id,_that.chatRoomId,_that.chatRoom,_that.accountId,_that.account,_that.nick,_that.role,_that.notify,_that.joinedAt,_that.breakUntil,_that.timeoutUntil,_that.isBot,_that.status,_that.lastTyped);case _:
  return orElse();

 }
@@ -1230,10 +1243,10 @@ return $default(_that.createdAt,_that.updatedAt,_that.deletedAt,_that.id,_that.c
 /// }
 /// ```

-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt,  String id,  String chatRoomId,  SnChatRoom? chatRoom,  String accountId,  SnAccount account,  String? nick,  int role,  int notify,  DateTime? joinedAt,  DateTime? breakUntil,  DateTime? timeoutUntil,  bool isBot,  DateTime? lastTyped)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt,  String id,  String chatRoomId,  SnChatRoom? chatRoom,  String accountId,  SnAccount account,  String? nick,  int role,  int notify,  DateTime? joinedAt,  DateTime? breakUntil,  DateTime? timeoutUntil,  bool isBot,  SnAccountStatus? status,  DateTime? lastTyped)  $default,) {final _that = this;
 switch (_that) {
 case _SnChatMember():
-return $default(_that.createdAt,_that.updatedAt,_that.deletedAt,_that.id,_that.chatRoomId,_that.chatRoom,_that.accountId,_that.account,_that.nick,_that.role,_that.notify,_that.joinedAt,_that.breakUntil,_that.timeoutUntil,_that.isBot,_that.lastTyped);}
+return $default(_that.createdAt,_that.updatedAt,_that.deletedAt,_that.id,_that.chatRoomId,_that.chatRoom,_that.accountId,_that.account,_that.nick,_that.role,_that.notify,_that.joinedAt,_that.breakUntil,_that.timeoutUntil,_that.isBot,_that.status,_that.lastTyped);}
 }
 /// A variant of `when` that fallback to returning `null`
 ///
@@ -1247,10 +1260,10 @@ return $default(_that.createdAt,_that.updatedAt,_that.deletedAt,_that.id,_that.c
 /// }
 /// ```

-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt,  String id,  String chatRoomId,  SnChatRoom? chatRoom,  String accountId,  SnAccount account,  String? nick,  int role,  int notify,  DateTime? joinedAt,  DateTime? breakUntil,  DateTime? timeoutUntil,  bool isBot,  DateTime? lastTyped)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt,  String id,  String chatRoomId,  SnChatRoom? chatRoom,  String accountId,  SnAccount account,  String? nick,  int role,  int notify,  DateTime? joinedAt,  DateTime? breakUntil,  DateTime? timeoutUntil,  bool isBot,  SnAccountStatus? status,  DateTime? lastTyped)?  $default,) {final _that = this;
 switch (_that) {
 case _SnChatMember() when $default != null:
-return $default(_that.createdAt,_that.updatedAt,_that.deletedAt,_that.id,_that.chatRoomId,_that.chatRoom,_that.accountId,_that.account,_that.nick,_that.role,_that.notify,_that.joinedAt,_that.breakUntil,_that.timeoutUntil,_that.isBot,_that.lastTyped);case _:
+return $default(_that.createdAt,_that.updatedAt,_that.deletedAt,_that.id,_that.chatRoomId,_that.chatRoom,_that.accountId,_that.account,_that.nick,_that.role,_that.notify,_that.joinedAt,_that.breakUntil,_that.timeoutUntil,_that.isBot,_that.status,_that.lastTyped);case _:
  return null;

 }
@@ -1262,7 +1275,7 @@ return $default(_that.createdAt,_that.updatedAt,_that.deletedAt,_that.id,_that.c
@JsonSerializable()

 class _SnChatMember implements SnChatMember {
-  const _SnChatMember({required this.createdAt, required this.updatedAt, required this.deletedAt, required this.id, required this.chatRoomId, required this.chatRoom, required this.accountId, required this.account, required this.nick, required this.role, required this.notify, required this.joinedAt, required this.breakUntil, required this.timeoutUntil, required this.isBot, this.lastTyped});
+  const _SnChatMember({required this.createdAt, required this.updatedAt, required this.deletedAt, required this.id, required this.chatRoomId, required this.chatRoom, required this.accountId, required this.account, required this.nick, required this.role, required this.notify, required this.joinedAt, required this.breakUntil, required this.timeoutUntil, required this.isBot, required this.status, this.lastTyped});
  factory _SnChatMember.fromJson(Map<String, dynamic> json) => _$SnChatMemberFromJson(json);

@override final  DateTime createdAt;
@@ -1280,6 +1293,7 @@ class _SnChatMember implements SnChatMember {
@override final  DateTime? breakUntil;
@override final  DateTime? timeoutUntil;
@override final  bool isBot;
+@override final  SnAccountStatus? status;
 // Frontend data
@override final  DateTime? lastTyped;

@@ -1296,16 +1310,16 @@ Map<String, dynamic> toJson() {

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnChatMember&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&(identical(other.id, id) || other.id == id)&&(identical(other.chatRoomId, chatRoomId) || other.chatRoomId == chatRoomId)&&(identical(other.chatRoom, chatRoom) || other.chatRoom == chatRoom)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.account, account) || other.account == account)&&(identical(other.nick, nick) || other.nick == nick)&&(identical(other.role, role) || other.role == role)&&(identical(other.notify, notify) || other.notify == notify)&&(identical(other.joinedAt, joinedAt) || other.joinedAt == joinedAt)&&(identical(other.breakUntil, breakUntil) || other.breakUntil == breakUntil)&&(identical(other.timeoutUntil, timeoutUntil) || other.timeoutUntil == timeoutUntil)&&(identical(other.isBot, isBot) || other.isBot == isBot)&&(identical(other.lastTyped, lastTyped) || other.lastTyped == lastTyped));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnChatMember&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&(identical(other.id, id) || other.id == id)&&(identical(other.chatRoomId, chatRoomId) || other.chatRoomId == chatRoomId)&&(identical(other.chatRoom, chatRoom) || other.chatRoom == chatRoom)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.account, account) || other.account == account)&&(identical(other.nick, nick) || other.nick == nick)&&(identical(other.role, role) || other.role == role)&&(identical(other.notify, notify) || other.notify == notify)&&(identical(other.joinedAt, joinedAt) || other.joinedAt == joinedAt)&&(identical(other.breakUntil, breakUntil) || other.breakUntil == breakUntil)&&(identical(other.timeoutUntil, timeoutUntil) || other.timeoutUntil == timeoutUntil)&&(identical(other.isBot, isBot) || other.isBot == isBot)&&(identical(other.status, status) || other.status == status)&&(identical(other.lastTyped, lastTyped) || other.lastTyped == lastTyped));
 }

@JsonKey(includeFromJson: false, includeToJson: false)
@override
-int get hashCode => Object.hash(runtimeType,createdAt,updatedAt,deletedAt,id,chatRoomId,chatRoom,accountId,account,nick,role,notify,joinedAt,breakUntil,timeoutUntil,isBot,lastTyped);
+int get hashCode => Object.hash(runtimeType,createdAt,updatedAt,deletedAt,id,chatRoomId,chatRoom,accountId,account,nick,role,notify,joinedAt,breakUntil,timeoutUntil,isBot,status,lastTyped);

@override
 String toString() {
-  return 'SnChatMember(createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, id: $id, chatRoomId: $chatRoomId, chatRoom: $chatRoom, accountId: $accountId, account: $account, nick: $nick, role: $role, notify: $notify, joinedAt: $joinedAt, breakUntil: $breakUntil, timeoutUntil: $timeoutUntil, isBot: $isBot, lastTyped: $lastTyped)';
+  return 'SnChatMember(createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, id: $id, chatRoomId: $chatRoomId, chatRoom: $chatRoom, accountId: $accountId, account: $account, nick: $nick, role: $role, notify: $notify, joinedAt: $joinedAt, breakUntil: $breakUntil, timeoutUntil: $timeoutUntil, isBot: $isBot, status: $status, lastTyped: $lastTyped)';
 }


@@ -1316,11 +1330,11 @@ abstract mixin class _$SnChatMemberCopyWith<$Res> implements $SnChatMemberCopyWi
  factory _$SnChatMemberCopyWith(_SnChatMember value, $Res Function(_SnChatMember) _then) = __$SnChatMemberCopyWithImpl;
@override @useResult
 $Res call({
- DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, String id, String chatRoomId, SnChatRoom? chatRoom, String accountId, SnAccount account, String? nick, int role, int notify, DateTime? joinedAt, DateTime? breakUntil, DateTime? timeoutUntil, bool isBot, DateTime? lastTyped
+ DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, String id, String chatRoomId, SnChatRoom? chatRoom, String accountId, SnAccount account, String? nick, int role, int notify, DateTime? joinedAt, DateTime? breakUntil, DateTime? timeoutUntil, bool isBot, SnAccountStatus? status, DateTime? lastTyped
 });


-@override $SnChatRoomCopyWith<$Res>? get chatRoom;@override $SnAccountCopyWith<$Res> get account;
+@override $SnChatRoomCopyWith<$Res>? get chatRoom;@override $SnAccountCopyWith<$Res> get account;@override $SnAccountStatusCopyWith<$Res>? get status;

 }
 /// @nodoc
@@ -1333,7 +1347,7 @@ class __$SnChatMemberCopyWithImpl<$Res>

 /// Create a copy of SnChatMember
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? id = null,Object? chatRoomId = null,Object? chatRoom = freezed,Object? accountId = null,Object? account = null,Object? nick = freezed,Object? role = null,Object? notify = null,Object? joinedAt = freezed,Object? breakUntil = freezed,Object? timeoutUntil = freezed,Object? isBot = null,Object? lastTyped = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? id = null,Object? chatRoomId = null,Object? chatRoom = freezed,Object? accountId = null,Object? account = null,Object? nick = freezed,Object? role = null,Object? notify = null,Object? joinedAt = freezed,Object? breakUntil = freezed,Object? timeoutUntil = freezed,Object? isBot = null,Object? status = freezed,Object? lastTyped = freezed,}) {
  return _then(_SnChatMember(
 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
@@ -1350,7 +1364,8 @@ as int,joinedAt: freezed == joinedAt ? _self.joinedAt : joinedAt // ignore: cast
 as DateTime?,breakUntil: freezed == breakUntil ? _self.breakUntil : breakUntil // ignore: cast_nullable_to_non_nullable
 as DateTime?,timeoutUntil: freezed == timeoutUntil ? _self.timeoutUntil : timeoutUntil // ignore: cast_nullable_to_non_nullable
 as DateTime?,isBot: null == isBot ? _self.isBot : isBot // ignore: cast_nullable_to_non_nullable
-as bool,lastTyped: freezed == lastTyped ? _self.lastTyped : lastTyped // ignore: cast_nullable_to_non_nullable
+as bool,status: freezed == status ? _self.status : status // ignore: cast_nullable_to_non_nullable
+as SnAccountStatus?,lastTyped: freezed == lastTyped ? _self.lastTyped : lastTyped // ignore: cast_nullable_to_non_nullable
 as DateTime?,
  ));
 }
@@ -1376,6 +1391,18 @@ $SnAccountCopyWith<$Res> get account {
  return $SnAccountCopyWith<$Res>(_self.account, (value) {
    return _then(_self.copyWith(account: value));
  });
+}/// Create a copy of SnChatMember
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnAccountStatusCopyWith<$Res>? get status {
+    if (_self.status == null) {
+    return null;
+  }
+
+  return $SnAccountStatusCopyWith<$Res>(_self.status!, (value) {
+    return _then(_self.copyWith(status: value));
+  });
 }
 }

@@ -1383,7 +1410,7 @@ $SnAccountCopyWith<$Res> get account {
 /// @nodoc
 mixin _$SnChatSummary {

- int get unreadCount; SnChatMessage get lastMessage;
+ int get unreadCount; SnChatMessage? get lastMessage;
 /// Create a copy of SnChatSummary
 /// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@@ -1416,11 +1443,11 @@ abstract mixin class $SnChatSummaryCopyWith<$Res>  {
  factory $SnChatSummaryCopyWith(SnChatSummary value, $Res Function(SnChatSummary) _then) = _$SnChatSummaryCopyWithImpl;
@useResult
 $Res call({
- int unreadCount, SnChatMessage lastMessage
+ int unreadCount, SnChatMessage? lastMessage
 });


-$SnChatMessageCopyWith<$Res> get lastMessage;
+$SnChatMessageCopyWith<$Res>? get lastMessage;

 }
 /// @nodoc
@@ -1433,20 +1460,23 @@ class _$SnChatSummaryCopyWithImpl<$Res>

 /// Create a copy of SnChatSummary
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? unreadCount = null,Object? lastMessage = null,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? unreadCount = null,Object? lastMessage = freezed,}) {
  return _then(_self.copyWith(
 unreadCount: null == unreadCount ? _self.unreadCount : unreadCount // ignore: cast_nullable_to_non_nullable
-as int,lastMessage: null == lastMessage ? _self.lastMessage : lastMessage // ignore: cast_nullable_to_non_nullable
-as SnChatMessage,
+as int,lastMessage: freezed == lastMessage ? _self.lastMessage : lastMessage // ignore: cast_nullable_to_non_nullable
+as SnChatMessage?,
  ));
 }
 /// Create a copy of SnChatSummary
 /// with the given fields replaced by the non-null parameter values.
@override
@pragma('vm:prefer-inline')
-$SnChatMessageCopyWith<$Res> get lastMessage {
+$SnChatMessageCopyWith<$Res>? get lastMessage {
+    if (_self.lastMessage == null) {
+    return null;
+  }

-  return $SnChatMessageCopyWith<$Res>(_self.lastMessage, (value) {
+  return $SnChatMessageCopyWith<$Res>(_self.lastMessage!, (value) {
    return _then(_self.copyWith(lastMessage: value));
  });
 }
@@ -1528,7 +1558,7 @@ return $default(_that);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( int unreadCount,  SnChatMessage lastMessage)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( int unreadCount,  SnChatMessage? lastMessage)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _SnChatSummary() when $default != null:
 return $default(_that.unreadCount,_that.lastMessage);case _:
@@ -1549,7 +1579,7 @@ return $default(_that.unreadCount,_that.lastMessage);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( int unreadCount,  SnChatMessage lastMessage)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( int unreadCount,  SnChatMessage? lastMessage)  $default,) {final _that = this;
 switch (_that) {
 case _SnChatSummary():
 return $default(_that.unreadCount,_that.lastMessage);}
@@ -1566,7 +1596,7 @@ return $default(_that.unreadCount,_that.lastMessage);}
 /// }
 /// ```

-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( int unreadCount,  SnChatMessage lastMessage)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( int unreadCount,  SnChatMessage? lastMessage)?  $default,) {final _that = this;
 switch (_that) {
 case _SnChatSummary() when $default != null:
 return $default(_that.unreadCount,_that.lastMessage);case _:
@@ -1585,7 +1615,7 @@ class _SnChatSummary implements SnChatSummary {
  factory _SnChatSummary.fromJson(Map<String, dynamic> json) => _$SnChatSummaryFromJson(json);

@override final  int unreadCount;
-@override final  SnChatMessage lastMessage;
+@override final  SnChatMessage? lastMessage;

 /// Create a copy of SnChatSummary
 /// with the given fields replaced by the non-null parameter values.
@@ -1620,11 +1650,11 @@ abstract mixin class _$SnChatSummaryCopyWith<$Res> implements $SnChatSummaryCopy
  factory _$SnChatSummaryCopyWith(_SnChatSummary value, $Res Function(_SnChatSummary) _then) = __$SnChatSummaryCopyWithImpl;
@override @useResult
 $Res call({
- int unreadCount, SnChatMessage lastMessage
+ int unreadCount, SnChatMessage? lastMessage
 });


-@override $SnChatMessageCopyWith<$Res> get lastMessage;
+@override $SnChatMessageCopyWith<$Res>? get lastMessage;

 }
 /// @nodoc
@@ -1637,11 +1667,11 @@ class __$SnChatSummaryCopyWithImpl<$Res>

 /// Create a copy of SnChatSummary
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? unreadCount = null,Object? lastMessage = null,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? unreadCount = null,Object? lastMessage = freezed,}) {
  return _then(_SnChatSummary(
 unreadCount: null == unreadCount ? _self.unreadCount : unreadCount // ignore: cast_nullable_to_non_nullable
-as int,lastMessage: null == lastMessage ? _self.lastMessage : lastMessage // ignore: cast_nullable_to_non_nullable
-as SnChatMessage,
+as int,lastMessage: freezed == lastMessage ? _self.lastMessage : lastMessage // ignore: cast_nullable_to_non_nullable
+as SnChatMessage?,
  ));
 }

@@ -1649,309 +1679,22 @@ as SnChatMessage,
 /// with the given fields replaced by the non-null parameter values.
@override
@pragma('vm:prefer-inline')
-$SnChatMessageCopyWith<$Res> get lastMessage {
+$SnChatMessageCopyWith<$Res>? get lastMessage {
+    if (_self.lastMessage == null) {
+    return null;
+  }

-  return $SnChatMessageCopyWith<$Res>(_self.lastMessage, (value) {
+  return $SnChatMessageCopyWith<$Res>(_self.lastMessage!, (value) {
    return _then(_self.copyWith(lastMessage: value));
  });
 }
 }


-/// @nodoc
-mixin _$MessageChange {
-
- String get messageId; String get action; SnChatMessage? get message; DateTime get timestamp;
-/// Create a copy of MessageChange
-/// with the given fields replaced by the non-null parameter values.
-@JsonKey(includeFromJson: false, includeToJson: false)
-@pragma('vm:prefer-inline')
-$MessageChangeCopyWith<MessageChange> get copyWith => _$MessageChangeCopyWithImpl<MessageChange>(this as MessageChange, _$identity);
-
-  /// Serializes this MessageChange to a JSON map.
-  Map<String, dynamic> toJson();
-
-
-@override
-bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is MessageChange&&(identical(other.messageId, messageId) || other.messageId == messageId)&&(identical(other.action, action) || other.action == action)&&(identical(other.message, message) || other.message == message)&&(identical(other.timestamp, timestamp) || other.timestamp == timestamp));
-}
-
-@JsonKey(includeFromJson: false, includeToJson: false)
-@override
-int get hashCode => Object.hash(runtimeType,messageId,action,message,timestamp);
-
-@override
-String toString() {
-  return 'MessageChange(messageId: $messageId, action: $action, message: $message, timestamp: $timestamp)';
-}
-
-
-}
-
-/// @nodoc
-abstract mixin class $MessageChangeCopyWith<$Res>  {
-  factory $MessageChangeCopyWith(MessageChange value, $Res Function(MessageChange) _then) = _$MessageChangeCopyWithImpl;
-@useResult
-$Res call({
- String messageId, String action, SnChatMessage? message, DateTime timestamp
-});
-
-
-$SnChatMessageCopyWith<$Res>? get message;
-
-}
-/// @nodoc
-class _$MessageChangeCopyWithImpl<$Res>
-    implements $MessageChangeCopyWith<$Res> {
-  _$MessageChangeCopyWithImpl(this._self, this._then);
-
-  final MessageChange _self;
-  final $Res Function(MessageChange) _then;
-
-/// Create a copy of MessageChange
-/// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? messageId = null,Object? action = null,Object? message = freezed,Object? timestamp = null,}) {
-  return _then(_self.copyWith(
-messageId: null == messageId ? _self.messageId : messageId // ignore: cast_nullable_to_non_nullable
-as String,action: null == action ? _self.action : action // ignore: cast_nullable_to_non_nullable
-as String,message: freezed == message ? _self.message : message // ignore: cast_nullable_to_non_nullable
-as SnChatMessage?,timestamp: null == timestamp ? _self.timestamp : timestamp // ignore: cast_nullable_to_non_nullable
-as DateTime,
-  ));
-}
-/// Create a copy of MessageChange
-/// with the given fields replaced by the non-null parameter values.
-@override
-@pragma('vm:prefer-inline')
-$SnChatMessageCopyWith<$Res>? get message {
-    if (_self.message == null) {
-    return null;
-  }
-
-  return $SnChatMessageCopyWith<$Res>(_self.message!, (value) {
-    return _then(_self.copyWith(message: value));
-  });
-}
-}
-
-
-/// Adds pattern-matching-related methods to [MessageChange].
-extension MessageChangePatterns on MessageChange {
-/// 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( _MessageChange value)?  $default,{required TResult orElse(),}){
-final _that = this;
-switch (_that) {
-case _MessageChange() 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( _MessageChange value)  $default,){
-final _that = this;
-switch (_that) {
-case _MessageChange():
-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( _MessageChange value)?  $default,){
-final _that = this;
-switch (_that) {
-case _MessageChange() 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 messageId,  String action,  SnChatMessage? message,  DateTime timestamp)?  $default,{required TResult orElse(),}) {final _that = this;
-switch (_that) {
-case _MessageChange() when $default != null:
-return $default(_that.messageId,_that.action,_that.message,_that.timestamp);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 messageId,  String action,  SnChatMessage? message,  DateTime timestamp)  $default,) {final _that = this;
-switch (_that) {
-case _MessageChange():
-return $default(_that.messageId,_that.action,_that.message,_that.timestamp);}
-}
-/// 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 messageId,  String action,  SnChatMessage? message,  DateTime timestamp)?  $default,) {final _that = this;
-switch (_that) {
-case _MessageChange() when $default != null:
-return $default(_that.messageId,_that.action,_that.message,_that.timestamp);case _:
-  return null;
-
-}
-}
-
-}
-
-/// @nodoc
-@JsonSerializable()
-
-class _MessageChange implements MessageChange {
-  const _MessageChange({required this.messageId, required this.action, this.message, required this.timestamp});
-  factory _MessageChange.fromJson(Map<String, dynamic> json) => _$MessageChangeFromJson(json);
-
-@override final  String messageId;
-@override final  String action;
-@override final  SnChatMessage? message;
-@override final  DateTime timestamp;
-
-/// Create a copy of MessageChange
-/// with the given fields replaced by the non-null parameter values.
-@override @JsonKey(includeFromJson: false, includeToJson: false)
-@pragma('vm:prefer-inline')
-_$MessageChangeCopyWith<_MessageChange> get copyWith => __$MessageChangeCopyWithImpl<_MessageChange>(this, _$identity);
-
-@override
-Map<String, dynamic> toJson() {
-  return _$MessageChangeToJson(this, );
-}
-
-@override
-bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _MessageChange&&(identical(other.messageId, messageId) || other.messageId == messageId)&&(identical(other.action, action) || other.action == action)&&(identical(other.message, message) || other.message == message)&&(identical(other.timestamp, timestamp) || other.timestamp == timestamp));
-}
-
-@JsonKey(includeFromJson: false, includeToJson: false)
-@override
-int get hashCode => Object.hash(runtimeType,messageId,action,message,timestamp);
-
-@override
-String toString() {
-  return 'MessageChange(messageId: $messageId, action: $action, message: $message, timestamp: $timestamp)';
-}
-
-
-}
-
-/// @nodoc
-abstract mixin class _$MessageChangeCopyWith<$Res> implements $MessageChangeCopyWith<$Res> {
-  factory _$MessageChangeCopyWith(_MessageChange value, $Res Function(_MessageChange) _then) = __$MessageChangeCopyWithImpl;
-@override @useResult
-$Res call({
- String messageId, String action, SnChatMessage? message, DateTime timestamp
-});
-
-
-@override $SnChatMessageCopyWith<$Res>? get message;
-
-}
-/// @nodoc
-class __$MessageChangeCopyWithImpl<$Res>
-    implements _$MessageChangeCopyWith<$Res> {
-  __$MessageChangeCopyWithImpl(this._self, this._then);
-
-  final _MessageChange _self;
-  final $Res Function(_MessageChange) _then;
-
-/// Create a copy of MessageChange
-/// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? messageId = null,Object? action = null,Object? message = freezed,Object? timestamp = null,}) {
-  return _then(_MessageChange(
-messageId: null == messageId ? _self.messageId : messageId // ignore: cast_nullable_to_non_nullable
-as String,action: null == action ? _self.action : action // ignore: cast_nullable_to_non_nullable
-as String,message: freezed == message ? _self.message : message // ignore: cast_nullable_to_non_nullable
-as SnChatMessage?,timestamp: null == timestamp ? _self.timestamp : timestamp // ignore: cast_nullable_to_non_nullable
-as DateTime,
-  ));
-}
-
-/// Create a copy of MessageChange
-/// with the given fields replaced by the non-null parameter values.
-@override
-@pragma('vm:prefer-inline')
-$SnChatMessageCopyWith<$Res>? get message {
-    if (_self.message == null) {
-    return null;
-  }
-
-  return $SnChatMessageCopyWith<$Res>(_self.message!, (value) {
-    return _then(_self.copyWith(message: value));
-  });
-}
-}
-
-
 /// @nodoc
 mixin _$MessageSyncResponse {

- List<MessageChange> get changes; DateTime get currentTimestamp;
+ List<SnChatMessage> get messages; DateTime get currentTimestamp;
 /// Create a copy of MessageSyncResponse
 /// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@@ -1964,16 +1707,16 @@ $MessageSyncResponseCopyWith<MessageSyncResponse> get copyWith => _$MessageSyncR

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is MessageSyncResponse&&const DeepCollectionEquality().equals(other.changes, changes)&&(identical(other.currentTimestamp, currentTimestamp) || other.currentTimestamp == currentTimestamp));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is MessageSyncResponse&&const DeepCollectionEquality().equals(other.messages, messages)&&(identical(other.currentTimestamp, currentTimestamp) || other.currentTimestamp == currentTimestamp));
 }

@JsonKey(includeFromJson: false, includeToJson: false)
@override
-int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(changes),currentTimestamp);
+int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(messages),currentTimestamp);

@override
 String toString() {
-  return 'MessageSyncResponse(changes: $changes, currentTimestamp: $currentTimestamp)';
+  return 'MessageSyncResponse(messages: $messages, currentTimestamp: $currentTimestamp)';
 }


@@ -1984,7 +1727,7 @@ abstract mixin class $MessageSyncResponseCopyWith<$Res>  {
  factory $MessageSyncResponseCopyWith(MessageSyncResponse value, $Res Function(MessageSyncResponse) _then) = _$MessageSyncResponseCopyWithImpl;
@useResult
 $Res call({
- List<MessageChange> changes, DateTime currentTimestamp
+ List<SnChatMessage> messages, DateTime currentTimestamp
 });


@@ -2001,10 +1744,10 @@ class _$MessageSyncResponseCopyWithImpl<$Res>

 /// Create a copy of MessageSyncResponse
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? changes = null,Object? currentTimestamp = null,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? messages = null,Object? currentTimestamp = null,}) {
  return _then(_self.copyWith(
-changes: null == changes ? _self.changes : changes // ignore: cast_nullable_to_non_nullable
-as List<MessageChange>,currentTimestamp: null == currentTimestamp ? _self.currentTimestamp : currentTimestamp // ignore: cast_nullable_to_non_nullable
+messages: null == messages ? _self.messages : messages // ignore: cast_nullable_to_non_nullable
+as List<SnChatMessage>,currentTimestamp: null == currentTimestamp ? _self.currentTimestamp : currentTimestamp // ignore: cast_nullable_to_non_nullable
 as DateTime,
  ));
 }
@@ -2087,10 +1830,10 @@ return $default(_that);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( List<MessageChange> changes,  DateTime currentTimestamp)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( List<SnChatMessage> messages,  DateTime currentTimestamp)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _MessageSyncResponse() when $default != null:
-return $default(_that.changes,_that.currentTimestamp);case _:
+return $default(_that.messages,_that.currentTimestamp);case _:
  return orElse();

 }
@@ -2108,10 +1851,10 @@ return $default(_that.changes,_that.currentTimestamp);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( List<MessageChange> changes,  DateTime currentTimestamp)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( List<SnChatMessage> messages,  DateTime currentTimestamp)  $default,) {final _that = this;
 switch (_that) {
 case _MessageSyncResponse():
-return $default(_that.changes,_that.currentTimestamp);}
+return $default(_that.messages,_that.currentTimestamp);}
 }
 /// A variant of `when` that fallback to returning `null`
 ///
@@ -2125,10 +1868,10 @@ return $default(_that.changes,_that.currentTimestamp);}
 /// }
 /// ```

-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( List<MessageChange> changes,  DateTime currentTimestamp)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( List<SnChatMessage> messages,  DateTime currentTimestamp)?  $default,) {final _that = this;
 switch (_that) {
 case _MessageSyncResponse() when $default != null:
-return $default(_that.changes,_that.currentTimestamp);case _:
+return $default(_that.messages,_that.currentTimestamp);case _:
  return null;

 }
@@ -2140,14 +1883,14 @@ return $default(_that.changes,_that.currentTimestamp);case _:
@JsonSerializable()

 class _MessageSyncResponse implements MessageSyncResponse {
-  const _MessageSyncResponse({final  List<MessageChange> changes = const [], required this.currentTimestamp}): _changes = changes;
+  const _MessageSyncResponse({final  List<SnChatMessage> messages = const [], required this.currentTimestamp}): _messages = messages;
  factory _MessageSyncResponse.fromJson(Map<String, dynamic> json) => _$MessageSyncResponseFromJson(json);

- final  List<MessageChange> _changes;
-@override@JsonKey() List<MessageChange> get changes {
-  if (_changes is EqualUnmodifiableListView) return _changes;
+ final  List<SnChatMessage> _messages;
+@override@JsonKey() List<SnChatMessage> get messages {
+  if (_messages is EqualUnmodifiableListView) return _messages;
  // ignore: implicit_dynamic_type
-  return EqualUnmodifiableListView(_changes);
+  return EqualUnmodifiableListView(_messages);
 }

@override final  DateTime currentTimestamp;
@@ -2165,16 +1908,16 @@ Map<String, dynamic> toJson() {

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _MessageSyncResponse&&const DeepCollectionEquality().equals(other._changes, _changes)&&(identical(other.currentTimestamp, currentTimestamp) || other.currentTimestamp == currentTimestamp));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _MessageSyncResponse&&const DeepCollectionEquality().equals(other._messages, _messages)&&(identical(other.currentTimestamp, currentTimestamp) || other.currentTimestamp == currentTimestamp));
 }

@JsonKey(includeFromJson: false, includeToJson: false)
@override
-int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(_changes),currentTimestamp);
+int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(_messages),currentTimestamp);

@override
 String toString() {
-  return 'MessageSyncResponse(changes: $changes, currentTimestamp: $currentTimestamp)';
+  return 'MessageSyncResponse(messages: $messages, currentTimestamp: $currentTimestamp)';
 }


@@ -2185,7 +1928,7 @@ abstract mixin class _$MessageSyncResponseCopyWith<$Res> implements $MessageSync
  factory _$MessageSyncResponseCopyWith(_MessageSyncResponse value, $Res Function(_MessageSyncResponse) _then) = __$MessageSyncResponseCopyWithImpl;
@override @useResult
 $Res call({
- List<MessageChange> changes, DateTime currentTimestamp
+ List<SnChatMessage> messages, DateTime currentTimestamp
 });


@@ -2202,10 +1945,10 @@ class __$MessageSyncResponseCopyWithImpl<$Res>

 /// Create a copy of MessageSyncResponse
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? changes = null,Object? currentTimestamp = null,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? messages = null,Object? currentTimestamp = null,}) {
  return _then(_MessageSyncResponse(
-changes: null == changes ? _self._changes : changes // ignore: cast_nullable_to_non_nullable
-as List<MessageChange>,currentTimestamp: null == currentTimestamp ? _self.currentTimestamp : currentTimestamp // ignore: cast_nullable_to_non_nullable
+messages: null == messages ? _self._messages : messages // ignore: cast_nullable_to_non_nullable
+as List<SnChatMessage>,currentTimestamp: null == currentTimestamp ? _self.currentTimestamp : currentTimestamp // ignore: cast_nullable_to_non_nullable
 as DateTime,
  ));
 }
--- a/lib/models/chat.g.dart
+++ b/lib/models/chat.g.dart
@@ -69,8 +69,8 @@ _SnChatMessage _$SnChatMessageFromJson(Map<String, dynamic> json) =>
      content: json['content'] as String?,
      nonce: json['nonce'] as String?,
      meta: json['meta'] as Map<String, dynamic>? ?? const {},
-      membersMetioned:
-          (json['members_metioned'] as List<dynamic>?)
+      membersMentioned:
+          (json['members_mentioned'] as List<dynamic>?)
              ?.map((e) => e as String)
              .toList() ??
          const [],
@@ -105,7 +105,7 @@ Map<String, dynamic> _$SnChatMessageToJson(_SnChatMessage instance) =>
      'content': instance.content,
      'nonce': instance.nonce,
      'meta': instance.meta,
-      'members_metioned': instance.membersMetioned,
+      'members_mentioned': instance.membersMentioned,
      'edited_at': instance.editedAt?.toIso8601String(),
      'attachments': instance.attachments.map((e) => e.toJson()).toList(),
      'reactions': instance.reactions.map((e) => e.toJson()).toList(),
@@ -177,6 +177,12 @@ _SnChatMember _$SnChatMemberFromJson(Map<String, dynamic> json) =>
              ? null
              : DateTime.parse(json['timeout_until'] as String),
      isBot: json['is_bot'] as bool,
+      status:
+          json['status'] == null
+              ? null
+              : SnAccountStatus.fromJson(
+                json['status'] as Map<String, dynamic>,
+              ),
      lastTyped:
          json['last_typed'] == null
              ? null
@@ -200,13 +206,17 @@ Map<String, dynamic> _$SnChatMemberToJson(_SnChatMember instance) =>
      'break_until': instance.breakUntil?.toIso8601String(),
      'timeout_until': instance.timeoutUntil?.toIso8601String(),
      'is_bot': instance.isBot,
+      'status': instance.status?.toJson(),
      'last_typed': instance.lastTyped?.toIso8601String(),
    };

 _SnChatSummary _$SnChatSummaryFromJson(Map<String, dynamic> json) =>
    _SnChatSummary(
      unreadCount: (json['unread_count'] as num).toInt(),
-      lastMessage: SnChatMessage.fromJson(
+      lastMessage:
+          json['last_message'] == null
+              ? null
+              : SnChatMessage.fromJson(
                json['last_message'] as Map<String, dynamic>,
              ),
    );
@@ -214,33 +224,14 @@ _SnChatSummary _$SnChatSummaryFromJson(Map<String, dynamic> json) =>
 Map<String, dynamic> _$SnChatSummaryToJson(_SnChatSummary instance) =>
    <String, dynamic>{
      'unread_count': instance.unreadCount,
-      'last_message': instance.lastMessage.toJson(),
-    };
-
-_MessageChange _$MessageChangeFromJson(Map<String, dynamic> json) =>
-    _MessageChange(
-      messageId: json['message_id'] as String,
-      action: json['action'] as String,
-      message:
-          json['message'] == null
-              ? null
-              : SnChatMessage.fromJson(json['message'] as Map<String, dynamic>),
-      timestamp: DateTime.parse(json['timestamp'] as String),
-    );
-
-Map<String, dynamic> _$MessageChangeToJson(_MessageChange instance) =>
-    <String, dynamic>{
-      'message_id': instance.messageId,
-      'action': instance.action,
-      'message': instance.message?.toJson(),
-      'timestamp': instance.timestamp.toIso8601String(),
+      'last_message': instance.lastMessage?.toJson(),
    };

 _MessageSyncResponse _$MessageSyncResponseFromJson(Map<String, dynamic> json) =>
    _MessageSyncResponse(
-      changes:
-          (json['changes'] as List<dynamic>?)
-              ?.map((e) => MessageChange.fromJson(e as Map<String, dynamic>))
+      messages:
+          (json['messages'] as List<dynamic>?)
+              ?.map((e) => SnChatMessage.fromJson(e as Map<String, dynamic>))
              .toList() ??
          const [],
      currentTimestamp: DateTime.parse(json['current_timestamp'] as String),
@@ -249,7 +240,7 @@ _MessageSyncResponse _$MessageSyncResponseFromJson(Map<String, dynamic> json) =>
 Map<String, dynamic> _$MessageSyncResponseToJson(
  _MessageSyncResponse instance,
 ) => <String, dynamic>{
-  'changes': instance.changes.map((e) => e.toJson()).toList(),
+  'messages': instance.messages.map((e) => e.toJson()).toList(),
  'current_timestamp': instance.currentTimestamp.toIso8601String(),
 };

--- a/lib/models/custom_app_secret.dart
+++ b/lib/models/custom_app_secret.dart
@@ -0,0 +1,19 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'custom_app_secret.freezed.dart';
+part 'custom_app_secret.g.dart';
+
+@freezed
+sealed class CustomAppSecret with _$CustomAppSecret {
+  const factory CustomAppSecret({
+    required String id,
+    required String? secret,
+    required DateTime createdAt,
+    String? description,
+    int? expiresIn,
+    bool? isOidc,
+  }) = _CustomAppSecret;
+
+  factory CustomAppSecret.fromJson(Map<String, dynamic> json) =>
+      _$CustomAppSecretFromJson(json);
+}
--- a/lib/models/custom_app_secret.freezed.dart
+++ b/lib/models/custom_app_secret.freezed.dart
@@ -0,0 +1,286 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'custom_app_secret.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+
+/// @nodoc
+mixin _$CustomAppSecret {
+
+ String get id; String? get secret; DateTime get createdAt; String? get description; int? get expiresIn; bool? get isOidc;
+/// Create a copy of CustomAppSecret
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$CustomAppSecretCopyWith<CustomAppSecret> get copyWith => _$CustomAppSecretCopyWithImpl<CustomAppSecret>(this as CustomAppSecret, _$identity);
+
+  /// Serializes this CustomAppSecret to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is CustomAppSecret&&(identical(other.id, id) || other.id == id)&&(identical(other.secret, secret) || other.secret == secret)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.description, description) || other.description == description)&&(identical(other.expiresIn, expiresIn) || other.expiresIn == expiresIn)&&(identical(other.isOidc, isOidc) || other.isOidc == isOidc));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,secret,createdAt,description,expiresIn,isOidc);
+
+@override
+String toString() {
+  return 'CustomAppSecret(id: $id, secret: $secret, createdAt: $createdAt, description: $description, expiresIn: $expiresIn, isOidc: $isOidc)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $CustomAppSecretCopyWith<$Res>  {
+  factory $CustomAppSecretCopyWith(CustomAppSecret value, $Res Function(CustomAppSecret) _then) = _$CustomAppSecretCopyWithImpl;
+@useResult
+$Res call({
+ String id, String? secret, DateTime createdAt, String? description, int? expiresIn, bool? isOidc
+});
+
+
+
+
+}
+/// @nodoc
+class _$CustomAppSecretCopyWithImpl<$Res>
+    implements $CustomAppSecretCopyWith<$Res> {
+  _$CustomAppSecretCopyWithImpl(this._self, this._then);
+
+  final CustomAppSecret _self;
+  final $Res Function(CustomAppSecret) _then;
+
+/// Create a copy of CustomAppSecret
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? secret = freezed,Object? createdAt = null,Object? description = freezed,Object? expiresIn = freezed,Object? isOidc = freezed,}) {
+  return _then(_self.copyWith(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,secret: freezed == secret ? _self.secret : secret // ignore: cast_nullable_to_non_nullable
+as String?,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
+as String?,expiresIn: freezed == expiresIn ? _self.expiresIn : expiresIn // ignore: cast_nullable_to_non_nullable
+as int?,isOidc: freezed == isOidc ? _self.isOidc : isOidc // ignore: cast_nullable_to_non_nullable
+as bool?,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [CustomAppSecret].
+extension CustomAppSecretPatterns on CustomAppSecret {
+/// 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( _CustomAppSecret value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _CustomAppSecret() 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( _CustomAppSecret value)  $default,){
+final _that = this;
+switch (_that) {
+case _CustomAppSecret():
+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( _CustomAppSecret value)?  $default,){
+final _that = this;
+switch (_that) {
+case _CustomAppSecret() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String? secret,  DateTime createdAt,  String? description,  int? expiresIn,  bool? isOidc)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _CustomAppSecret() when $default != null:
+return $default(_that.id,_that.secret,_that.createdAt,_that.description,_that.expiresIn,_that.isOidc);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String? secret,  DateTime createdAt,  String? description,  int? expiresIn,  bool? isOidc)  $default,) {final _that = this;
+switch (_that) {
+case _CustomAppSecret():
+return $default(_that.id,_that.secret,_that.createdAt,_that.description,_that.expiresIn,_that.isOidc);}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String? secret,  DateTime createdAt,  String? description,  int? expiresIn,  bool? isOidc)?  $default,) {final _that = this;
+switch (_that) {
+case _CustomAppSecret() when $default != null:
+return $default(_that.id,_that.secret,_that.createdAt,_that.description,_that.expiresIn,_that.isOidc);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _CustomAppSecret implements CustomAppSecret {
+  const _CustomAppSecret({required this.id, required this.secret, required this.createdAt, this.description, this.expiresIn, this.isOidc});
+  factory _CustomAppSecret.fromJson(Map<String, dynamic> json) => _$CustomAppSecretFromJson(json);
+
+@override final  String id;
+@override final  String? secret;
+@override final  DateTime createdAt;
+@override final  String? description;
+@override final  int? expiresIn;
+@override final  bool? isOidc;
+
+/// Create a copy of CustomAppSecret
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$CustomAppSecretCopyWith<_CustomAppSecret> get copyWith => __$CustomAppSecretCopyWithImpl<_CustomAppSecret>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$CustomAppSecretToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _CustomAppSecret&&(identical(other.id, id) || other.id == id)&&(identical(other.secret, secret) || other.secret == secret)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.description, description) || other.description == description)&&(identical(other.expiresIn, expiresIn) || other.expiresIn == expiresIn)&&(identical(other.isOidc, isOidc) || other.isOidc == isOidc));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,secret,createdAt,description,expiresIn,isOidc);
+
+@override
+String toString() {
+  return 'CustomAppSecret(id: $id, secret: $secret, createdAt: $createdAt, description: $description, expiresIn: $expiresIn, isOidc: $isOidc)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$CustomAppSecretCopyWith<$Res> implements $CustomAppSecretCopyWith<$Res> {
+  factory _$CustomAppSecretCopyWith(_CustomAppSecret value, $Res Function(_CustomAppSecret) _then) = __$CustomAppSecretCopyWithImpl;
+@override @useResult
+$Res call({
+ String id, String? secret, DateTime createdAt, String? description, int? expiresIn, bool? isOidc
+});
+
+
+
+
+}
+/// @nodoc
+class __$CustomAppSecretCopyWithImpl<$Res>
+    implements _$CustomAppSecretCopyWith<$Res> {
+  __$CustomAppSecretCopyWithImpl(this._self, this._then);
+
+  final _CustomAppSecret _self;
+  final $Res Function(_CustomAppSecret) _then;
+
+/// Create a copy of CustomAppSecret
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? secret = freezed,Object? createdAt = null,Object? description = freezed,Object? expiresIn = freezed,Object? isOidc = freezed,}) {
+  return _then(_CustomAppSecret(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,secret: freezed == secret ? _self.secret : secret // ignore: cast_nullable_to_non_nullable
+as String?,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
+as String?,expiresIn: freezed == expiresIn ? _self.expiresIn : expiresIn // ignore: cast_nullable_to_non_nullable
+as int?,isOidc: freezed == isOidc ? _self.isOidc : isOidc // ignore: cast_nullable_to_non_nullable
+as bool?,
+  ));
+}
+
+
+}
+
+// dart format on
--- a/lib/models/custom_app_secret.g.dart
+++ b/lib/models/custom_app_secret.g.dart
@@ -0,0 +1,27 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'custom_app_secret.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_CustomAppSecret _$CustomAppSecretFromJson(Map<String, dynamic> json) =>
+    _CustomAppSecret(
+      id: json['id'] as String,
+      secret: json['secret'] as String?,
+      createdAt: DateTime.parse(json['created_at'] as String),
+      description: json['description'] as String?,
+      expiresIn: (json['expires_in'] as num?)?.toInt(),
+      isOidc: json['is_oidc'] as bool?,
+    );
+
+Map<String, dynamic> _$CustomAppSecretToJson(_CustomAppSecret instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'secret': instance.secret,
+      'created_at': instance.createdAt.toIso8601String(),
+      'description': instance.description,
+      'expires_in': instance.expiresIn,
+      'is_oidc': instance.isOidc,
+    };
--- a/lib/models/dev_project.dart
+++ b/lib/models/dev_project.dart
@@ -0,0 +1,23 @@
+
+class DevProject {
+  final String id;
+  final String slug;
+  final String name;
+  final String? description;
+
+  DevProject({
+    required this.id,
+    required this.slug,
+    required this.name,
+    this.description,
+  });
+
+  factory DevProject.fromJson(Map<String, dynamic> json) {
+    return DevProject(
+      id: json['id'],
+      slug: json['slug'],
+      name: json['name'],
+      description: json['description'],
+    );
+  }
+}
--- a/lib/models/embed.dart
+++ b/lib/models/embed.dart
@@ -11,8 +11,8 @@ sealed class SnScrappedLink with _$SnScrappedLink {
    required String title,
    required String? description,
    required String? imageUrl,
-    required String faviconUrl,
-    required String siteName,
+    required String? faviconUrl,
+    required String? siteName,
    required String? contentType,
    required String? author,
    required DateTime? publishedDate,
--- a/lib/models/embed.freezed.dart
+++ b/lib/models/embed.freezed.dart
@@ -15,7 +15,7 @@ T _$identity<T>(T value) => value;
 /// @nodoc
 mixin _$SnScrappedLink {

- String get type; String get url; String get title; String? get description; String? get imageUrl; String get faviconUrl; String get siteName; String? get contentType; String? get author; DateTime? get publishedDate;
+ String get type; String get url; String get title; String? get description; String? get imageUrl; String? get faviconUrl; String? get siteName; String? get contentType; String? get author; DateTime? get publishedDate;
 /// Create a copy of SnScrappedLink
 /// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@@ -48,7 +48,7 @@ abstract mixin class $SnScrappedLinkCopyWith<$Res>  {
  factory $SnScrappedLinkCopyWith(SnScrappedLink value, $Res Function(SnScrappedLink) _then) = _$SnScrappedLinkCopyWithImpl;
@useResult
 $Res call({
- String type, String url, String title, String? description, String? imageUrl, String faviconUrl, String siteName, String? contentType, String? author, DateTime? publishedDate
+ String type, String url, String title, String? description, String? imageUrl, String? faviconUrl, String? siteName, String? contentType, String? author, DateTime? publishedDate
 });


@@ -65,16 +65,16 @@ class _$SnScrappedLinkCopyWithImpl<$Res>

 /// Create a copy of SnScrappedLink
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? type = null,Object? url = null,Object? title = null,Object? description = freezed,Object? imageUrl = freezed,Object? faviconUrl = null,Object? siteName = null,Object? contentType = freezed,Object? author = freezed,Object? publishedDate = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? type = null,Object? url = null,Object? title = null,Object? description = freezed,Object? imageUrl = freezed,Object? faviconUrl = freezed,Object? siteName = freezed,Object? contentType = freezed,Object? author = freezed,Object? publishedDate = freezed,}) {
  return _then(_self.copyWith(
 type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
 as String,url: null == url ? _self.url : url // ignore: cast_nullable_to_non_nullable
 as String,title: null == title ? _self.title : title // ignore: cast_nullable_to_non_nullable
 as String,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
 as String?,imageUrl: freezed == imageUrl ? _self.imageUrl : imageUrl // ignore: cast_nullable_to_non_nullable
-as String?,faviconUrl: null == faviconUrl ? _self.faviconUrl : faviconUrl // ignore: cast_nullable_to_non_nullable
-as String,siteName: null == siteName ? _self.siteName : siteName // ignore: cast_nullable_to_non_nullable
-as String,contentType: freezed == contentType ? _self.contentType : contentType // ignore: cast_nullable_to_non_nullable
+as String?,faviconUrl: freezed == faviconUrl ? _self.faviconUrl : faviconUrl // ignore: cast_nullable_to_non_nullable
+as String?,siteName: freezed == siteName ? _self.siteName : siteName // ignore: cast_nullable_to_non_nullable
+as String?,contentType: freezed == contentType ? _self.contentType : contentType // ignore: cast_nullable_to_non_nullable
 as String?,author: freezed == author ? _self.author : author // ignore: cast_nullable_to_non_nullable
 as String?,publishedDate: freezed == publishedDate ? _self.publishedDate : publishedDate // ignore: cast_nullable_to_non_nullable
 as DateTime?,
@@ -159,7 +159,7 @@ return $default(_that);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String type,  String url,  String title,  String? description,  String? imageUrl,  String faviconUrl,  String siteName,  String? contentType,  String? author,  DateTime? publishedDate)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String type,  String url,  String title,  String? description,  String? imageUrl,  String? faviconUrl,  String? siteName,  String? contentType,  String? author,  DateTime? publishedDate)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _SnScrappedLink() when $default != null:
 return $default(_that.type,_that.url,_that.title,_that.description,_that.imageUrl,_that.faviconUrl,_that.siteName,_that.contentType,_that.author,_that.publishedDate);case _:
@@ -180,7 +180,7 @@ return $default(_that.type,_that.url,_that.title,_that.description,_that.imageUr
 /// }
 /// ```

-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String type,  String url,  String title,  String? description,  String? imageUrl,  String faviconUrl,  String siteName,  String? contentType,  String? author,  DateTime? publishedDate)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String type,  String url,  String title,  String? description,  String? imageUrl,  String? faviconUrl,  String? siteName,  String? contentType,  String? author,  DateTime? publishedDate)  $default,) {final _that = this;
 switch (_that) {
 case _SnScrappedLink():
 return $default(_that.type,_that.url,_that.title,_that.description,_that.imageUrl,_that.faviconUrl,_that.siteName,_that.contentType,_that.author,_that.publishedDate);}
@@ -197,7 +197,7 @@ return $default(_that.type,_that.url,_that.title,_that.description,_that.imageUr
 /// }
 /// ```

-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String type,  String url,  String title,  String? description,  String? imageUrl,  String faviconUrl,  String siteName,  String? contentType,  String? author,  DateTime? publishedDate)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String type,  String url,  String title,  String? description,  String? imageUrl,  String? faviconUrl,  String? siteName,  String? contentType,  String? author,  DateTime? publishedDate)?  $default,) {final _that = this;
 switch (_that) {
 case _SnScrappedLink() when $default != null:
 return $default(_that.type,_that.url,_that.title,_that.description,_that.imageUrl,_that.faviconUrl,_that.siteName,_that.contentType,_that.author,_that.publishedDate);case _:
@@ -220,8 +220,8 @@ class _SnScrappedLink implements SnScrappedLink {
@override final  String title;
@override final  String? description;
@override final  String? imageUrl;
-@override final  String faviconUrl;
-@override final  String siteName;
+@override final  String? faviconUrl;
+@override final  String? siteName;
@override final  String? contentType;
@override final  String? author;
@override final  DateTime? publishedDate;
@@ -259,7 +259,7 @@ abstract mixin class _$SnScrappedLinkCopyWith<$Res> implements $SnScrappedLinkCo
  factory _$SnScrappedLinkCopyWith(_SnScrappedLink value, $Res Function(_SnScrappedLink) _then) = __$SnScrappedLinkCopyWithImpl;
@override @useResult
 $Res call({
- String type, String url, String title, String? description, String? imageUrl, String faviconUrl, String siteName, String? contentType, String? author, DateTime? publishedDate
+ String type, String url, String title, String? description, String? imageUrl, String? faviconUrl, String? siteName, String? contentType, String? author, DateTime? publishedDate
 });


@@ -276,16 +276,16 @@ class __$SnScrappedLinkCopyWithImpl<$Res>

 /// Create a copy of SnScrappedLink
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? type = null,Object? url = null,Object? title = null,Object? description = freezed,Object? imageUrl = freezed,Object? faviconUrl = null,Object? siteName = null,Object? contentType = freezed,Object? author = freezed,Object? publishedDate = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? type = null,Object? url = null,Object? title = null,Object? description = freezed,Object? imageUrl = freezed,Object? faviconUrl = freezed,Object? siteName = freezed,Object? contentType = freezed,Object? author = freezed,Object? publishedDate = freezed,}) {
  return _then(_SnScrappedLink(
 type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
 as String,url: null == url ? _self.url : url // ignore: cast_nullable_to_non_nullable
 as String,title: null == title ? _self.title : title // ignore: cast_nullable_to_non_nullable
 as String,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
 as String?,imageUrl: freezed == imageUrl ? _self.imageUrl : imageUrl // ignore: cast_nullable_to_non_nullable
-as String?,faviconUrl: null == faviconUrl ? _self.faviconUrl : faviconUrl // ignore: cast_nullable_to_non_nullable
-as String,siteName: null == siteName ? _self.siteName : siteName // ignore: cast_nullable_to_non_nullable
-as String,contentType: freezed == contentType ? _self.contentType : contentType // ignore: cast_nullable_to_non_nullable
+as String?,faviconUrl: freezed == faviconUrl ? _self.faviconUrl : faviconUrl // ignore: cast_nullable_to_non_nullable
+as String?,siteName: freezed == siteName ? _self.siteName : siteName // ignore: cast_nullable_to_non_nullable
+as String?,contentType: freezed == contentType ? _self.contentType : contentType // ignore: cast_nullable_to_non_nullable
 as String?,author: freezed == author ? _self.author : author // ignore: cast_nullable_to_non_nullable
 as String?,publishedDate: freezed == publishedDate ? _self.publishedDate : publishedDate // ignore: cast_nullable_to_non_nullable
 as DateTime?,
--- a/lib/models/embed.g.dart
+++ b/lib/models/embed.g.dart
@@ -13,8 +13,8 @@ _SnScrappedLink _$SnScrappedLinkFromJson(Map<String, dynamic> json) =>
      title: json['title'] as String,
      description: json['description'] as String?,
      imageUrl: json['image_url'] as String?,
-      faviconUrl: json['favicon_url'] as String,
-      siteName: json['site_name'] as String,
+      faviconUrl: json['favicon_url'] as String?,
+      siteName: json['site_name'] as String?,
      contentType: json['content_type'] as String?,
      author: json['author'] as String?,
      publishedDate:
--- a/lib/models/file_pool.dart
+++ b/lib/models/file_pool.dart
@@ -0,0 +1,53 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'file_pool.freezed.dart';
+part 'file_pool.g.dart';
+
+@freezed
+sealed class SnFilePool with _$SnFilePool {
+  const factory SnFilePool({
+    required String id,
+    required String name,
+    String? description,
+    Map<String, dynamic>? storageConfig,
+    Map<String, dynamic>? billingConfig,
+    Map<String, dynamic>? policyConfig,
+    bool? isHidden,
+    String? accountId,
+    String? resourceIdentifier,
+    DateTime? createdAt,
+    DateTime? updatedAt,
+    DateTime? deletedAt,
+  }) = _SnFilePool;
+
+  factory SnFilePool.fromJson(Map<String, dynamic> json) =>
+      _$SnFilePoolFromJson(json);
+}
+
+extension SnFilePoolList on List<SnFilePool> {
+  static List<SnFilePool> listFromResponse(dynamic data) {
+    if (data is List) {
+      return data
+          .whereType<Map<String, dynamic>>()
+          .map(SnFilePool.fromJson)
+          .toList();
+    }
+    throw ArgumentError('Unexpected response format: $data');
+  }
+
+  List<SnFilePool> filterValid() {
+    return where((p) {
+      final accept = p.policyConfig?['accept_types'];
+
+      if (accept is List) {
+        final acceptsOnlyMedia = accept.every((t) =>
+            t is String &&
+            (t.startsWith('image/') ||
+                t.startsWith('video/') ||
+                t.startsWith('audio/')));
+        if (acceptsOnlyMedia) return false;
+      }
+      return true;
+    }).toList();
+  }
+}
--- a/lib/models/file_pool.freezed.dart
+++ b/lib/models/file_pool.freezed.dart
@@ -0,0 +1,328 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'file_pool.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+
+/// @nodoc
+mixin _$SnFilePool {
+
+ String get id; String get name; String? get description; Map<String, dynamic>? get storageConfig; Map<String, dynamic>? get billingConfig; Map<String, dynamic>? get policyConfig; bool? get isHidden; String? get accountId; String? get resourceIdentifier; DateTime? get createdAt; DateTime? get updatedAt; DateTime? get deletedAt;
+/// Create a copy of SnFilePool
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$SnFilePoolCopyWith<SnFilePool> get copyWith => _$SnFilePoolCopyWithImpl<SnFilePool>(this as SnFilePool, _$identity);
+
+  /// Serializes this SnFilePool to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnFilePool&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.description, description) || other.description == description)&&const DeepCollectionEquality().equals(other.storageConfig, storageConfig)&&const DeepCollectionEquality().equals(other.billingConfig, billingConfig)&&const DeepCollectionEquality().equals(other.policyConfig, policyConfig)&&(identical(other.isHidden, isHidden) || other.isHidden == isHidden)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.resourceIdentifier, resourceIdentifier) || other.resourceIdentifier == resourceIdentifier)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,name,description,const DeepCollectionEquality().hash(storageConfig),const DeepCollectionEquality().hash(billingConfig),const DeepCollectionEquality().hash(policyConfig),isHidden,accountId,resourceIdentifier,createdAt,updatedAt,deletedAt);
+
+@override
+String toString() {
+  return 'SnFilePool(id: $id, name: $name, description: $description, storageConfig: $storageConfig, billingConfig: $billingConfig, policyConfig: $policyConfig, isHidden: $isHidden, accountId: $accountId, resourceIdentifier: $resourceIdentifier, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $SnFilePoolCopyWith<$Res>  {
+  factory $SnFilePoolCopyWith(SnFilePool value, $Res Function(SnFilePool) _then) = _$SnFilePoolCopyWithImpl;
+@useResult
+$Res call({
+ String id, String name, String? description, Map<String, dynamic>? storageConfig, Map<String, dynamic>? billingConfig, Map<String, dynamic>? policyConfig, bool? isHidden, String? accountId, String? resourceIdentifier, DateTime? createdAt, DateTime? updatedAt, DateTime? deletedAt
+});
+
+
+
+
+}
+/// @nodoc
+class _$SnFilePoolCopyWithImpl<$Res>
+    implements $SnFilePoolCopyWith<$Res> {
+  _$SnFilePoolCopyWithImpl(this._self, this._then);
+
+  final SnFilePool _self;
+  final $Res Function(SnFilePool) _then;
+
+/// Create a copy of SnFilePool
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? name = null,Object? description = freezed,Object? storageConfig = freezed,Object? billingConfig = freezed,Object? policyConfig = freezed,Object? isHidden = freezed,Object? accountId = freezed,Object? resourceIdentifier = freezed,Object? createdAt = freezed,Object? updatedAt = freezed,Object? deletedAt = freezed,}) {
+  return _then(_self.copyWith(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
+as String,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
+as String?,storageConfig: freezed == storageConfig ? _self.storageConfig : storageConfig // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,billingConfig: freezed == billingConfig ? _self.billingConfig : billingConfig // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,policyConfig: freezed == policyConfig ? _self.policyConfig : policyConfig // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,isHidden: freezed == isHidden ? _self.isHidden : isHidden // ignore: cast_nullable_to_non_nullable
+as bool?,accountId: freezed == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as String?,resourceIdentifier: freezed == resourceIdentifier ? _self.resourceIdentifier : resourceIdentifier // ignore: cast_nullable_to_non_nullable
+as String?,createdAt: freezed == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,updatedAt: freezed == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [SnFilePool].
+extension SnFilePoolPatterns on SnFilePool {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _SnFilePool value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _SnFilePool() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _SnFilePool value)  $default,){
+final _that = this;
+switch (_that) {
+case _SnFilePool():
+return $default(_that);}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _SnFilePool value)?  $default,){
+final _that = this;
+switch (_that) {
+case _SnFilePool() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String name,  String? description,  Map<String, dynamic>? storageConfig,  Map<String, dynamic>? billingConfig,  Map<String, dynamic>? policyConfig,  bool? isHidden,  String? accountId,  String? resourceIdentifier,  DateTime? createdAt,  DateTime? updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _SnFilePool() when $default != null:
+return $default(_that.id,_that.name,_that.description,_that.storageConfig,_that.billingConfig,_that.policyConfig,_that.isHidden,_that.accountId,_that.resourceIdentifier,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String name,  String? description,  Map<String, dynamic>? storageConfig,  Map<String, dynamic>? billingConfig,  Map<String, dynamic>? policyConfig,  bool? isHidden,  String? accountId,  String? resourceIdentifier,  DateTime? createdAt,  DateTime? updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
+switch (_that) {
+case _SnFilePool():
+return $default(_that.id,_that.name,_that.description,_that.storageConfig,_that.billingConfig,_that.policyConfig,_that.isHidden,_that.accountId,_that.resourceIdentifier,_that.createdAt,_that.updatedAt,_that.deletedAt);}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String name,  String? description,  Map<String, dynamic>? storageConfig,  Map<String, dynamic>? billingConfig,  Map<String, dynamic>? policyConfig,  bool? isHidden,  String? accountId,  String? resourceIdentifier,  DateTime? createdAt,  DateTime? updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
+switch (_that) {
+case _SnFilePool() when $default != null:
+return $default(_that.id,_that.name,_that.description,_that.storageConfig,_that.billingConfig,_that.policyConfig,_that.isHidden,_that.accountId,_that.resourceIdentifier,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _SnFilePool implements SnFilePool {
+  const _SnFilePool({required this.id, required this.name, this.description, final  Map<String, dynamic>? storageConfig, final  Map<String, dynamic>? billingConfig, final  Map<String, dynamic>? policyConfig, this.isHidden, this.accountId, this.resourceIdentifier, this.createdAt, this.updatedAt, this.deletedAt}): _storageConfig = storageConfig,_billingConfig = billingConfig,_policyConfig = policyConfig;
+  factory _SnFilePool.fromJson(Map<String, dynamic> json) => _$SnFilePoolFromJson(json);
+
+@override final  String id;
+@override final  String name;
+@override final  String? description;
+ final  Map<String, dynamic>? _storageConfig;
+@override Map<String, dynamic>? get storageConfig {
+  final value = _storageConfig;
+  if (value == null) return null;
+  if (_storageConfig is EqualUnmodifiableMapView) return _storageConfig;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableMapView(value);
+}
+
+ final  Map<String, dynamic>? _billingConfig;
+@override Map<String, dynamic>? get billingConfig {
+  final value = _billingConfig;
+  if (value == null) return null;
+  if (_billingConfig is EqualUnmodifiableMapView) return _billingConfig;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableMapView(value);
+}
+
+ final  Map<String, dynamic>? _policyConfig;
+@override Map<String, dynamic>? get policyConfig {
+  final value = _policyConfig;
+  if (value == null) return null;
+  if (_policyConfig is EqualUnmodifiableMapView) return _policyConfig;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableMapView(value);
+}
+
+@override final  bool? isHidden;
+@override final  String? accountId;
+@override final  String? resourceIdentifier;
+@override final  DateTime? createdAt;
+@override final  DateTime? updatedAt;
+@override final  DateTime? deletedAt;
+
+/// Create a copy of SnFilePool
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$SnFilePoolCopyWith<_SnFilePool> get copyWith => __$SnFilePoolCopyWithImpl<_SnFilePool>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$SnFilePoolToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnFilePool&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.description, description) || other.description == description)&&const DeepCollectionEquality().equals(other._storageConfig, _storageConfig)&&const DeepCollectionEquality().equals(other._billingConfig, _billingConfig)&&const DeepCollectionEquality().equals(other._policyConfig, _policyConfig)&&(identical(other.isHidden, isHidden) || other.isHidden == isHidden)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.resourceIdentifier, resourceIdentifier) || other.resourceIdentifier == resourceIdentifier)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,name,description,const DeepCollectionEquality().hash(_storageConfig),const DeepCollectionEquality().hash(_billingConfig),const DeepCollectionEquality().hash(_policyConfig),isHidden,accountId,resourceIdentifier,createdAt,updatedAt,deletedAt);
+
+@override
+String toString() {
+  return 'SnFilePool(id: $id, name: $name, description: $description, storageConfig: $storageConfig, billingConfig: $billingConfig, policyConfig: $policyConfig, isHidden: $isHidden, accountId: $accountId, resourceIdentifier: $resourceIdentifier, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$SnFilePoolCopyWith<$Res> implements $SnFilePoolCopyWith<$Res> {
+  factory _$SnFilePoolCopyWith(_SnFilePool value, $Res Function(_SnFilePool) _then) = __$SnFilePoolCopyWithImpl;
+@override @useResult
+$Res call({
+ String id, String name, String? description, Map<String, dynamic>? storageConfig, Map<String, dynamic>? billingConfig, Map<String, dynamic>? policyConfig, bool? isHidden, String? accountId, String? resourceIdentifier, DateTime? createdAt, DateTime? updatedAt, DateTime? deletedAt
+});
+
+
+
+
+}
+/// @nodoc
+class __$SnFilePoolCopyWithImpl<$Res>
+    implements _$SnFilePoolCopyWith<$Res> {
+  __$SnFilePoolCopyWithImpl(this._self, this._then);
+
+  final _SnFilePool _self;
+  final $Res Function(_SnFilePool) _then;
+
+/// Create a copy of SnFilePool
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? name = null,Object? description = freezed,Object? storageConfig = freezed,Object? billingConfig = freezed,Object? policyConfig = freezed,Object? isHidden = freezed,Object? accountId = freezed,Object? resourceIdentifier = freezed,Object? createdAt = freezed,Object? updatedAt = freezed,Object? deletedAt = freezed,}) {
+  return _then(_SnFilePool(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,name: null == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
+as String,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
+as String?,storageConfig: freezed == storageConfig ? _self._storageConfig : storageConfig // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,billingConfig: freezed == billingConfig ? _self._billingConfig : billingConfig // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,policyConfig: freezed == policyConfig ? _self._policyConfig : policyConfig // ignore: cast_nullable_to_non_nullable
+as Map<String, dynamic>?,isHidden: freezed == isHidden ? _self.isHidden : isHidden // ignore: cast_nullable_to_non_nullable
+as bool?,accountId: freezed == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
+as String?,resourceIdentifier: freezed == resourceIdentifier ? _self.resourceIdentifier : resourceIdentifier // ignore: cast_nullable_to_non_nullable
+as String?,createdAt: freezed == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,updatedAt: freezed == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,
+  ));
+}
+
+
+}
+
+// dart format on
--- a/lib/models/file_pool.g.dart
+++ b/lib/models/file_pool.g.dart
@@ -0,0 +1,47 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'file_pool.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_SnFilePool _$SnFilePoolFromJson(Map<String, dynamic> json) => _SnFilePool(
+  id: json['id'] as String,
+  name: json['name'] as String,
+  description: json['description'] as String?,
+  storageConfig: json['storage_config'] as Map<String, dynamic>?,
+  billingConfig: json['billing_config'] as Map<String, dynamic>?,
+  policyConfig: json['policy_config'] as Map<String, dynamic>?,
+  isHidden: json['is_hidden'] as bool?,
+  accountId: json['account_id'] as String?,
+  resourceIdentifier: json['resource_identifier'] as String?,
+  createdAt:
+      json['created_at'] == null
+          ? null
+          : DateTime.parse(json['created_at'] as String),
+  updatedAt:
+      json['updated_at'] == null
+          ? null
+          : DateTime.parse(json['updated_at'] as String),
+  deletedAt:
+      json['deleted_at'] == null
+          ? null
+          : DateTime.parse(json['deleted_at'] as String),
+);
+
+Map<String, dynamic> _$SnFilePoolToJson(_SnFilePool instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'name': instance.name,
+      'description': instance.description,
+      'storage_config': instance.storageConfig,
+      'billing_config': instance.billingConfig,
+      'policy_config': instance.policyConfig,
+      'is_hidden': instance.isHidden,
+      'account_id': instance.accountId,
+      'resource_identifier': instance.resourceIdentifier,
+      'created_at': instance.createdAt?.toIso8601String(),
+      'updated_at': instance.updatedAt?.toIso8601String(),
+      'deleted_at': instance.deletedAt?.toIso8601String(),
+    };
--- a/lib/models/poll.dart
+++ b/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) =>
--- a/lib/models/poll.freezed.dart
+++ b/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
--- a/lib/models/poll.g.dart
+++ b/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(),
    };
--- a/lib/models/post.dart
+++ b/lib/models/post.dart
@@ -3,6 +3,7 @@ import 'package:island/models/file.dart';
 import 'package:island/models/post_category.dart';
 import 'package:island/models/post_tag.dart';
 import 'package:island/models/publisher.dart';
+import 'package:island/models/realm.dart';

 part 'post.freezed.dart';
 part 'post.g.dart';
@@ -18,19 +19,25 @@ sealed class SnPost with _$SnPost {
    @Default(null) DateTime? publishedAt,
    @Default(0) int visibility,
    String? content,
+    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,
    String? repliedPostId,
    SnPost? repliedPost,
    String? forwardedPostId,
    SnPost? forwardedPost,
+    String? realmId,
+    SnRealm? realm,
    @Default([]) List<SnCloudFile> attachments,
    required SnPublisher publisher,
    @Default({}) Map<String, int> reactionsCount,
@@ -100,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);
+}
--- a/lib/models/post.freezed.dart
+++ b/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; int get type; Map<String, dynamic>? get meta; int get viewsUnique; int get viewsTotal; int get upvotes; int get downvotes; int get repliesCount; String? get threadedPostId; SnPost? get threadedPost; String? get repliedPostId; SnPost? get repliedPost; String? get forwardedPostId; SnPost? get forwardedPost; 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.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.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)&&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,type,const DeepCollectionEquality().hash(meta),viewsUnique,viewsTotal,upvotes,downvotes,repliesCount,threadedPostId,threadedPost,repliedPostId,repliedPost,forwardedPostId,forwardedPost,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, type: $type, meta: $meta, viewsUnique: $viewsUnique, viewsTotal: $viewsTotal, upvotes: $upvotes, downvotes: $downvotes, repliesCount: $repliesCount, threadedPostId: $threadedPostId, threadedPost: $threadedPost, repliedPostId: $repliedPostId, repliedPost: $repliedPost, forwardedPostId: $forwardedPostId, forwardedPost: $forwardedPost, 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, int type, Map<String, dynamic>? meta, int viewsUnique, int viewsTotal, int upvotes, int downvotes, int repliesCount, String? threadedPostId, SnPost? threadedPost, String? repliedPostId, SnPost? repliedPost, String? forwardedPostId, SnPost? forwardedPost, 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;$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? type = null,Object? meta = freezed,Object? viewsUnique = null,Object? viewsTotal = null,Object? upvotes = null,Object? downvotes = null,Object? repliesCount = null,Object? threadedPostId = freezed,Object? threadedPost = freezed,Object? repliedPostId = freezed,Object? repliedPost = freezed,Object? forwardedPostId = freezed,Object? forwardedPost = 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
@@ -75,20 +75,26 @@ as String?,editedAt: freezed == editedAt ? _self.editedAt : editedAt // ignore:
 as DateTime?,publishedAt: freezed == publishedAt ? _self.publishedAt : publishedAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,visibility: null == visibility ? _self.visibility : visibility // ignore: cast_nullable_to_non_nullable
 as int,content: freezed == content ? _self.content : content // ignore: cast_nullable_to_non_nullable
+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,threadedPostId: freezed == threadedPostId ? _self.threadedPostId : threadedPostId // 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
 as SnPost?,repliedPostId: freezed == repliedPostId ? _self.repliedPostId : repliedPostId // ignore: cast_nullable_to_non_nullable
 as String?,repliedPost: freezed == repliedPost ? _self.repliedPost : repliedPost // ignore: cast_nullable_to_non_nullable
 as SnPost?,forwardedPostId: freezed == forwardedPostId ? _self.forwardedPostId : forwardedPostId // ignore: cast_nullable_to_non_nullable
 as String?,forwardedPost: freezed == forwardedPost ? _self.forwardedPost : forwardedPost // ignore: cast_nullable_to_non_nullable
-as SnPost?,attachments: null == attachments ? _self.attachments : attachments // ignore: cast_nullable_to_non_nullable
+as SnPost?,realmId: freezed == realmId ? _self.realmId : realmId // ignore: cast_nullable_to_non_nullable
+as String?,realm: freezed == realm ? _self.realm : realm // ignore: cast_nullable_to_non_nullable
+as SnRealm?,attachments: null == attachments ? _self.attachments : attachments // ignore: cast_nullable_to_non_nullable
 as List<SnCloudFile>,publisher: null == publisher ? _self.publisher : publisher // ignore: cast_nullable_to_non_nullable
 as SnPublisher,reactionsCount: null == reactionsCount ? _self.reactionsCount : reactionsCount // ignore: cast_nullable_to_non_nullable
 as Map<String, int>,reactionsMade: null == reactionsMade ? _self.reactionsMade : reactionsMade // ignore: cast_nullable_to_non_nullable
@@ -107,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;
@@ -143,6 +161,18 @@ $SnPostCopyWith<$Res>? get forwardedPost {
 /// with the given fields replaced by the non-null parameter values.
@override
@pragma('vm:prefer-inline')
+$SnRealmCopyWith<$Res>? get realm {
+    if (_self.realm == null) {
+    return null;
+  }
+
+  return $SnRealmCopyWith<$Res>(_self.realm!, (value) {
+    return _then(_self.copyWith(realm: value));
+  });
+}/// Create a copy of SnPost
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
 $SnPublisherCopyWith<$Res> get publisher {
  
  return $SnPublisherCopyWith<$Res>(_self.publisher, (value) {
@@ -227,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,  int type,  Map<String, dynamic>? meta,  int viewsUnique,  int viewsTotal,  int upvotes,  int downvotes,  int repliesCount,  String? threadedPostId,  SnPost? threadedPost,  String? repliedPostId,  SnPost? repliedPost,  String? forwardedPostId,  SnPost? forwardedPost,  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.type,_that.meta,_that.viewsUnique,_that.viewsTotal,_that.upvotes,_that.downvotes,_that.repliesCount,_that.threadedPostId,_that.threadedPost,_that.repliedPostId,_that.repliedPost,_that.forwardedPostId,_that.forwardedPost,_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();

 }
@@ -248,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,  int type,  Map<String, dynamic>? meta,  int viewsUnique,  int viewsTotal,  int upvotes,  int downvotes,  int repliesCount,  String? threadedPostId,  SnPost? threadedPost,  String? repliedPostId,  SnPost? repliedPost,  String? forwardedPostId,  SnPost? forwardedPost,  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.type,_that.meta,_that.viewsUnique,_that.viewsTotal,_that.upvotes,_that.downvotes,_that.repliesCount,_that.threadedPostId,_that.threadedPost,_that.repliedPostId,_that.repliedPost,_that.forwardedPostId,_that.forwardedPost,_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`
 ///
@@ -265,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,  int type,  Map<String, dynamic>? meta,  int viewsUnique,  int viewsTotal,  int upvotes,  int downvotes,  int repliesCount,  String? threadedPostId,  SnPost? threadedPost,  String? repliedPostId,  SnPost? repliedPost,  String? forwardedPostId,  SnPost? forwardedPost,  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.type,_that.meta,_that.viewsUnique,_that.viewsTotal,_that.upvotes,_that.downvotes,_that.repliesCount,_that.threadedPostId,_that.threadedPost,_that.repliedPostId,_that.repliedPost,_that.forwardedPostId,_that.forwardedPost,_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;

 }
@@ -280,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.type = 0, final  Map<String, dynamic>? meta, this.viewsUnique = 0, this.viewsTotal = 0, this.upvotes = 0, this.downvotes = 0, this.repliesCount = 0, this.threadedPostId, this.threadedPost, this.repliedPostId, this.repliedPost, this.forwardedPostId, this.forwardedPost, 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;
@@ -291,6 +321,7 @@ class _SnPost implements SnPost {
@override@JsonKey() final  DateTime? publishedAt;
@override@JsonKey() final  int visibility;
@override final  String? content;
+@override final  String? slug;
@override@JsonKey() final  int type;
 final  Map<String, dynamic>? _meta;
@override Map<String, dynamic>? get meta {
@@ -301,17 +332,22 @@ 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;
@override final  String? repliedPostId;
@override final  SnPost? repliedPost;
@override final  String? forwardedPostId;
@override final  SnPost? forwardedPost;
+@override final  String? realmId;
+@override final  SnRealm? realm;
 final  List<SnCloudFile> _attachments;
@override@JsonKey() List<SnCloudFile> get attachments {
  if (_attachments is EqualUnmodifiableListView) return _attachments;
@@ -380,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.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.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)&&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,type,const DeepCollectionEquality().hash(_meta),viewsUnique,viewsTotal,upvotes,downvotes,repliesCount,threadedPostId,threadedPost,repliedPostId,repliedPost,forwardedPostId,forwardedPost,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, type: $type, meta: $meta, viewsUnique: $viewsUnique, viewsTotal: $viewsTotal, upvotes: $upvotes, downvotes: $downvotes, repliesCount: $repliesCount, threadedPostId: $threadedPostId, threadedPost: $threadedPost, repliedPostId: $repliedPostId, repliedPost: $repliedPost, forwardedPostId: $forwardedPostId, forwardedPost: $forwardedPost, 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)';
 }


@@ -400,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, int type, Map<String, dynamic>? meta, int viewsUnique, int viewsTotal, int upvotes, int downvotes, int repliesCount, String? threadedPostId, SnPost? threadedPost, String? repliedPostId, SnPost? repliedPost, String? forwardedPostId, SnPost? forwardedPost, 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 $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
@@ -417,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? type = null,Object? meta = freezed,Object? viewsUnique = null,Object? viewsTotal = null,Object? upvotes = null,Object? downvotes = null,Object? repliesCount = null,Object? threadedPostId = freezed,Object? threadedPost = freezed,Object? repliedPostId = freezed,Object? repliedPost = freezed,Object? forwardedPostId = freezed,Object? forwardedPost = 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
@@ -427,20 +463,26 @@ as String?,editedAt: freezed == editedAt ? _self.editedAt : editedAt // ignore:
 as DateTime?,publishedAt: freezed == publishedAt ? _self.publishedAt : publishedAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,visibility: null == visibility ? _self.visibility : visibility // ignore: cast_nullable_to_non_nullable
 as int,content: freezed == content ? _self.content : content // ignore: cast_nullable_to_non_nullable
+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,threadedPostId: freezed == threadedPostId ? _self.threadedPostId : threadedPostId // 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
 as SnPost?,repliedPostId: freezed == repliedPostId ? _self.repliedPostId : repliedPostId // ignore: cast_nullable_to_non_nullable
 as String?,repliedPost: freezed == repliedPost ? _self.repliedPost : repliedPost // ignore: cast_nullable_to_non_nullable
 as SnPost?,forwardedPostId: freezed == forwardedPostId ? _self.forwardedPostId : forwardedPostId // ignore: cast_nullable_to_non_nullable
 as String?,forwardedPost: freezed == forwardedPost ? _self.forwardedPost : forwardedPost // ignore: cast_nullable_to_non_nullable
-as SnPost?,attachments: null == attachments ? _self._attachments : attachments // ignore: cast_nullable_to_non_nullable
+as SnPost?,realmId: freezed == realmId ? _self.realmId : realmId // ignore: cast_nullable_to_non_nullable
+as String?,realm: freezed == realm ? _self.realm : realm // ignore: cast_nullable_to_non_nullable
+as SnRealm?,attachments: null == attachments ? _self._attachments : attachments // ignore: cast_nullable_to_non_nullable
 as List<SnCloudFile>,publisher: null == publisher ? _self.publisher : publisher // ignore: cast_nullable_to_non_nullable
 as SnPublisher,reactionsCount: null == reactionsCount ? _self._reactionsCount : reactionsCount // ignore: cast_nullable_to_non_nullable
 as Map<String, int>,reactionsMade: null == reactionsMade ? _self._reactionsMade : reactionsMade // ignore: cast_nullable_to_non_nullable
@@ -460,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;
@@ -496,6 +550,18 @@ $SnPostCopyWith<$Res>? get forwardedPost {
 /// with the given fields replaced by the non-null parameter values.
@override
@pragma('vm:prefer-inline')
+$SnRealmCopyWith<$Res>? get realm {
+    if (_self.realm == null) {
+    return null;
+  }
+
+  return $SnRealmCopyWith<$Res>(_self.realm!, (value) {
+    return _then(_self.copyWith(realm: value));
+  });
+}/// Create a copy of SnPost
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
 $SnPublisherCopyWith<$Res> get publisher {
  
  return $SnPublisherCopyWith<$Res>(_self.publisher, (value) {
@@ -1288,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
--- a/lib/models/post.g.dart
+++ b/lib/models/post.g.dart
@@ -21,13 +21,22 @@ _SnPost _$SnPostFromJson(Map<String, dynamic> json) => _SnPost(
          : DateTime.parse(json['published_at'] as String),
  visibility: (json['visibility'] as num?)?.toInt() ?? 0,
  content: json['content'] as String?,
+  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:
      json['threaded_post'] == null
@@ -43,6 +52,11 @@ _SnPost _$SnPostFromJson(Map<String, dynamic> json) => _SnPost(
      json['forwarded_post'] == null
          ? null
          : SnPost.fromJson(json['forwarded_post'] as Map<String, dynamic>),
+  realmId: json['realm_id'] as String?,
+  realm:
+      json['realm'] == null
+          ? null
+          : SnRealm.fromJson(json['realm'] as Map<String, dynamic>),
  attachments:
      (json['attachments'] as List<dynamic>?)
          ?.map((e) => SnCloudFile.fromJson(e as Map<String, dynamic>))
@@ -95,19 +109,25 @@ Map<String, dynamic> _$SnPostToJson(_SnPost instance) => <String, dynamic>{
  'published_at': instance.publishedAt?.toIso8601String(),
  'visibility': instance.visibility,
  'content': instance.content,
+  '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(),
  'replied_post_id': instance.repliedPostId,
  'replied_post': instance.repliedPost?.toJson(),
  'forwarded_post_id': instance.forwardedPostId,
  'forwarded_post': instance.forwardedPost?.toJson(),
+  'realm_id': instance.realmId,
+  'realm': instance.realm?.toJson(),
  'attachments': instance.attachments.map((e) => e.toJson()).toList(),
  'publisher': instance.publisher.toJson(),
  'reactions_count': instance.reactionsCount,
@@ -155,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(),
+    };
--- a/lib/models/post_category.dart
+++ b/lib/models/post_category.dart
@@ -1,7 +1,7 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:island/models/post.dart';
-import 'package:island/services/text.dart';
+import 'package:island/utils/text.dart';

 part 'post_category.freezed.dart';
 part 'post_category.g.dart';
@@ -15,6 +15,7 @@ sealed class SnPostCategory with _$SnPostCategory {
    required String slug,
    String? name,
    @Default([]) List<SnPost> posts,
+    @Default(0) int usage,
  }) = _SnPostCategory;

  factory SnPostCategory.fromJson(Map<String, dynamic> json) =>
--- a/lib/models/post_category.freezed.dart
+++ b/lib/models/post_category.freezed.dart
@@ -15,7 +15,7 @@ T _$identity<T>(T value) => value;
 /// @nodoc
 mixin _$SnPostCategory {

- String get id; String get slug; String? get name; List<SnPost> get posts;
+ String get id; String get slug; String? get name; List<SnPost> get posts; int get usage;
 /// Create a copy of SnPostCategory
 /// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@@ -28,16 +28,16 @@ $SnPostCategoryCopyWith<SnPostCategory> get copyWith => _$SnPostCategoryCopyWith

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnPostCategory&&(identical(other.id, id) || other.id == id)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.name, name) || other.name == name)&&const DeepCollectionEquality().equals(other.posts, posts));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnPostCategory&&(identical(other.id, id) || other.id == id)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.name, name) || other.name == name)&&const DeepCollectionEquality().equals(other.posts, posts)&&(identical(other.usage, usage) || other.usage == usage));
 }

@JsonKey(includeFromJson: false, includeToJson: false)
@override
-int get hashCode => Object.hash(runtimeType,id,slug,name,const DeepCollectionEquality().hash(posts));
+int get hashCode => Object.hash(runtimeType,id,slug,name,const DeepCollectionEquality().hash(posts),usage);

@override
 String toString() {
-  return 'SnPostCategory(id: $id, slug: $slug, name: $name, posts: $posts)';
+  return 'SnPostCategory(id: $id, slug: $slug, name: $name, posts: $posts, usage: $usage)';
 }


@@ -48,7 +48,7 @@ abstract mixin class $SnPostCategoryCopyWith<$Res>  {
  factory $SnPostCategoryCopyWith(SnPostCategory value, $Res Function(SnPostCategory) _then) = _$SnPostCategoryCopyWithImpl;
@useResult
 $Res call({
- String id, String slug, String? name, List<SnPost> posts
+ String id, String slug, String? name, List<SnPost> posts, int usage
 });


@@ -65,13 +65,14 @@ class _$SnPostCategoryCopyWithImpl<$Res>

 /// Create a copy of SnPostCategory
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? slug = null,Object? name = freezed,Object? posts = null,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? slug = null,Object? name = freezed,Object? posts = null,Object? usage = null,}) {
  return _then(_self.copyWith(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,slug: null == slug ? _self.slug : slug // ignore: cast_nullable_to_non_nullable
 as String,name: freezed == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
 as String?,posts: null == posts ? _self.posts : posts // ignore: cast_nullable_to_non_nullable
-as List<SnPost>,
+as List<SnPost>,usage: null == usage ? _self.usage : usage // ignore: cast_nullable_to_non_nullable
+as int,
  ));
 }

@@ -153,10 +154,10 @@ return $default(_that);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String slug,  String? name,  List<SnPost> posts)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String slug,  String? name,  List<SnPost> posts,  int usage)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _SnPostCategory() when $default != null:
-return $default(_that.id,_that.slug,_that.name,_that.posts);case _:
+return $default(_that.id,_that.slug,_that.name,_that.posts,_that.usage);case _:
  return orElse();

 }
@@ -174,10 +175,10 @@ return $default(_that.id,_that.slug,_that.name,_that.posts);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String slug,  String? name,  List<SnPost> posts)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String slug,  String? name,  List<SnPost> posts,  int usage)  $default,) {final _that = this;
 switch (_that) {
 case _SnPostCategory():
-return $default(_that.id,_that.slug,_that.name,_that.posts);}
+return $default(_that.id,_that.slug,_that.name,_that.posts,_that.usage);}
 }
 /// A variant of `when` that fallback to returning `null`
 ///
@@ -191,10 +192,10 @@ return $default(_that.id,_that.slug,_that.name,_that.posts);}
 /// }
 /// ```

-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String slug,  String? name,  List<SnPost> posts)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String slug,  String? name,  List<SnPost> posts,  int usage)?  $default,) {final _that = this;
 switch (_that) {
 case _SnPostCategory() when $default != null:
-return $default(_that.id,_that.slug,_that.name,_that.posts);case _:
+return $default(_that.id,_that.slug,_that.name,_that.posts,_that.usage);case _:
  return null;

 }
@@ -206,7 +207,7 @@ return $default(_that.id,_that.slug,_that.name,_that.posts);case _:
@JsonSerializable()

 class _SnPostCategory extends SnPostCategory {
-  const _SnPostCategory({required this.id, required this.slug, this.name, final  List<SnPost> posts = const []}): _posts = posts,super._();
+  const _SnPostCategory({required this.id, required this.slug, this.name, final  List<SnPost> posts = const [], this.usage = 0}): _posts = posts,super._();
  factory _SnPostCategory.fromJson(Map<String, dynamic> json) => _$SnPostCategoryFromJson(json);

@override final  String id;
@@ -219,6 +220,7 @@ class _SnPostCategory extends SnPostCategory {
  return EqualUnmodifiableListView(_posts);
 }

+@override@JsonKey() final  int usage;

 /// Create a copy of SnPostCategory
 /// with the given fields replaced by the non-null parameter values.
@@ -233,16 +235,16 @@ Map<String, dynamic> toJson() {

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnPostCategory&&(identical(other.id, id) || other.id == id)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.name, name) || other.name == name)&&const DeepCollectionEquality().equals(other._posts, _posts));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnPostCategory&&(identical(other.id, id) || other.id == id)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.name, name) || other.name == name)&&const DeepCollectionEquality().equals(other._posts, _posts)&&(identical(other.usage, usage) || other.usage == usage));
 }

@JsonKey(includeFromJson: false, includeToJson: false)
@override
-int get hashCode => Object.hash(runtimeType,id,slug,name,const DeepCollectionEquality().hash(_posts));
+int get hashCode => Object.hash(runtimeType,id,slug,name,const DeepCollectionEquality().hash(_posts),usage);

@override
 String toString() {
-  return 'SnPostCategory(id: $id, slug: $slug, name: $name, posts: $posts)';
+  return 'SnPostCategory(id: $id, slug: $slug, name: $name, posts: $posts, usage: $usage)';
 }


@@ -253,7 +255,7 @@ abstract mixin class _$SnPostCategoryCopyWith<$Res> implements $SnPostCategoryCo
  factory _$SnPostCategoryCopyWith(_SnPostCategory value, $Res Function(_SnPostCategory) _then) = __$SnPostCategoryCopyWithImpl;
@override @useResult
 $Res call({
- String id, String slug, String? name, List<SnPost> posts
+ String id, String slug, String? name, List<SnPost> posts, int usage
 });


@@ -270,13 +272,14 @@ class __$SnPostCategoryCopyWithImpl<$Res>

 /// Create a copy of SnPostCategory
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? slug = null,Object? name = freezed,Object? posts = null,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? slug = null,Object? name = freezed,Object? posts = null,Object? usage = null,}) {
  return _then(_SnPostCategory(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,slug: null == slug ? _self.slug : slug // ignore: cast_nullable_to_non_nullable
 as String,name: freezed == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
 as String?,posts: null == posts ? _self._posts : posts // ignore: cast_nullable_to_non_nullable
-as List<SnPost>,
+as List<SnPost>,usage: null == usage ? _self.usage : usage // ignore: cast_nullable_to_non_nullable
+as int,
  ));
 }

--- a/lib/models/post_category.g.dart
+++ b/lib/models/post_category.g.dart
@@ -16,6 +16,7 @@ _SnPostCategory _$SnPostCategoryFromJson(Map<String, dynamic> json) =>
              ?.map((e) => SnPost.fromJson(e as Map<String, dynamic>))
              .toList() ??
          const [],
+      usage: (json['usage'] as num?)?.toInt() ?? 0,
    );

 Map<String, dynamic> _$SnPostCategoryToJson(_SnPostCategory instance) =>
@@ -24,4 +25,5 @@ Map<String, dynamic> _$SnPostCategoryToJson(_SnPostCategory instance) =>
      'slug': instance.slug,
      'name': instance.name,
      'posts': instance.posts.map((e) => e.toJson()).toList(),
+      'usage': instance.usage,
    };
--- a/lib/models/post_tag.dart
+++ b/lib/models/post_tag.dart
@@ -11,6 +11,7 @@ sealed class SnPostTag with _$SnPostTag {
    required String slug,
    String? name,
    @Default([]) List<SnPost> posts,
+    @Default(0) int usage,
  }) = _SnPostTag;

  factory SnPostTag.fromJson(Map<String, dynamic> json) =>
--- a/lib/models/post_tag.freezed.dart
+++ b/lib/models/post_tag.freezed.dart
@@ -15,7 +15,7 @@ T _$identity<T>(T value) => value;
 /// @nodoc
 mixin _$SnPostTag {

- String get id; String get slug; String? get name; List<SnPost> get posts;
+ String get id; String get slug; String? get name; List<SnPost> get posts; int get usage;
 /// Create a copy of SnPostTag
 /// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@@ -28,16 +28,16 @@ $SnPostTagCopyWith<SnPostTag> get copyWith => _$SnPostTagCopyWithImpl<SnPostTag>

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnPostTag&&(identical(other.id, id) || other.id == id)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.name, name) || other.name == name)&&const DeepCollectionEquality().equals(other.posts, posts));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnPostTag&&(identical(other.id, id) || other.id == id)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.name, name) || other.name == name)&&const DeepCollectionEquality().equals(other.posts, posts)&&(identical(other.usage, usage) || other.usage == usage));
 }

@JsonKey(includeFromJson: false, includeToJson: false)
@override
-int get hashCode => Object.hash(runtimeType,id,slug,name,const DeepCollectionEquality().hash(posts));
+int get hashCode => Object.hash(runtimeType,id,slug,name,const DeepCollectionEquality().hash(posts),usage);

@override
 String toString() {
-  return 'SnPostTag(id: $id, slug: $slug, name: $name, posts: $posts)';
+  return 'SnPostTag(id: $id, slug: $slug, name: $name, posts: $posts, usage: $usage)';
 }


@@ -48,7 +48,7 @@ abstract mixin class $SnPostTagCopyWith<$Res>  {
  factory $SnPostTagCopyWith(SnPostTag value, $Res Function(SnPostTag) _then) = _$SnPostTagCopyWithImpl;
@useResult
 $Res call({
- String id, String slug, String? name, List<SnPost> posts
+ String id, String slug, String? name, List<SnPost> posts, int usage
 });


@@ -65,13 +65,14 @@ class _$SnPostTagCopyWithImpl<$Res>

 /// Create a copy of SnPostTag
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? slug = null,Object? name = freezed,Object? posts = null,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? slug = null,Object? name = freezed,Object? posts = null,Object? usage = null,}) {
  return _then(_self.copyWith(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,slug: null == slug ? _self.slug : slug // ignore: cast_nullable_to_non_nullable
 as String,name: freezed == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
 as String?,posts: null == posts ? _self.posts : posts // ignore: cast_nullable_to_non_nullable
-as List<SnPost>,
+as List<SnPost>,usage: null == usage ? _self.usage : usage // ignore: cast_nullable_to_non_nullable
+as int,
  ));
 }

@@ -153,10 +154,10 @@ return $default(_that);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String slug,  String? name,  List<SnPost> posts)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String slug,  String? name,  List<SnPost> posts,  int usage)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _SnPostTag() when $default != null:
-return $default(_that.id,_that.slug,_that.name,_that.posts);case _:
+return $default(_that.id,_that.slug,_that.name,_that.posts,_that.usage);case _:
  return orElse();

 }
@@ -174,10 +175,10 @@ return $default(_that.id,_that.slug,_that.name,_that.posts);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String slug,  String? name,  List<SnPost> posts)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String slug,  String? name,  List<SnPost> posts,  int usage)  $default,) {final _that = this;
 switch (_that) {
 case _SnPostTag():
-return $default(_that.id,_that.slug,_that.name,_that.posts);}
+return $default(_that.id,_that.slug,_that.name,_that.posts,_that.usage);}
 }
 /// A variant of `when` that fallback to returning `null`
 ///
@@ -191,10 +192,10 @@ return $default(_that.id,_that.slug,_that.name,_that.posts);}
 /// }
 /// ```

-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String slug,  String? name,  List<SnPost> posts)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String slug,  String? name,  List<SnPost> posts,  int usage)?  $default,) {final _that = this;
 switch (_that) {
 case _SnPostTag() when $default != null:
-return $default(_that.id,_that.slug,_that.name,_that.posts);case _:
+return $default(_that.id,_that.slug,_that.name,_that.posts,_that.usage);case _:
  return null;

 }
@@ -206,7 +207,7 @@ return $default(_that.id,_that.slug,_that.name,_that.posts);case _:
@JsonSerializable()

 class _SnPostTag implements SnPostTag {
-  const _SnPostTag({required this.id, required this.slug, this.name, final  List<SnPost> posts = const []}): _posts = posts;
+  const _SnPostTag({required this.id, required this.slug, this.name, final  List<SnPost> posts = const [], this.usage = 0}): _posts = posts;
  factory _SnPostTag.fromJson(Map<String, dynamic> json) => _$SnPostTagFromJson(json);

@override final  String id;
@@ -219,6 +220,7 @@ class _SnPostTag implements SnPostTag {
  return EqualUnmodifiableListView(_posts);
 }

+@override@JsonKey() final  int usage;

 /// Create a copy of SnPostTag
 /// with the given fields replaced by the non-null parameter values.
@@ -233,16 +235,16 @@ Map<String, dynamic> toJson() {

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnPostTag&&(identical(other.id, id) || other.id == id)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.name, name) || other.name == name)&&const DeepCollectionEquality().equals(other._posts, _posts));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnPostTag&&(identical(other.id, id) || other.id == id)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.name, name) || other.name == name)&&const DeepCollectionEquality().equals(other._posts, _posts)&&(identical(other.usage, usage) || other.usage == usage));
 }

@JsonKey(includeFromJson: false, includeToJson: false)
@override
-int get hashCode => Object.hash(runtimeType,id,slug,name,const DeepCollectionEquality().hash(_posts));
+int get hashCode => Object.hash(runtimeType,id,slug,name,const DeepCollectionEquality().hash(_posts),usage);

@override
 String toString() {
-  return 'SnPostTag(id: $id, slug: $slug, name: $name, posts: $posts)';
+  return 'SnPostTag(id: $id, slug: $slug, name: $name, posts: $posts, usage: $usage)';
 }


@@ -253,7 +255,7 @@ abstract mixin class _$SnPostTagCopyWith<$Res> implements $SnPostTagCopyWith<$Re
  factory _$SnPostTagCopyWith(_SnPostTag value, $Res Function(_SnPostTag) _then) = __$SnPostTagCopyWithImpl;
@override @useResult
 $Res call({
- String id, String slug, String? name, List<SnPost> posts
+ String id, String slug, String? name, List<SnPost> posts, int usage
 });


@@ -270,13 +272,14 @@ class __$SnPostTagCopyWithImpl<$Res>

 /// Create a copy of SnPostTag
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? slug = null,Object? name = freezed,Object? posts = null,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? slug = null,Object? name = freezed,Object? posts = null,Object? usage = null,}) {
  return _then(_SnPostTag(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,slug: null == slug ? _self.slug : slug // ignore: cast_nullable_to_non_nullable
 as String,name: freezed == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
 as String?,posts: null == posts ? _self._posts : posts // ignore: cast_nullable_to_non_nullable
-as List<SnPost>,
+as List<SnPost>,usage: null == usage ? _self.usage : usage // ignore: cast_nullable_to_non_nullable
+as int,
  ));
 }

--- a/lib/models/post_tag.g.dart
+++ b/lib/models/post_tag.g.dart
@@ -15,6 +15,7 @@ _SnPostTag _$SnPostTagFromJson(Map<String, dynamic> json) => _SnPostTag(
          ?.map((e) => SnPost.fromJson(e as Map<String, dynamic>))
          .toList() ??
      const [],
+  usage: (json['usage'] as num?)?.toInt() ?? 0,
 );

 Map<String, dynamic> _$SnPostTagToJson(_SnPostTag instance) =>
@@ -23,4 +24,5 @@ Map<String, dynamic> _$SnPostTagToJson(_SnPostTag instance) =>
      'slug': instance.slug,
      'name': instance.name,
      'posts': instance.posts.map((e) => e.toJson()).toList(),
+      'usage': instance.usage,
    };
--- a/lib/models/realm.dart
+++ b/lib/models/realm.dart
@@ -40,6 +40,7 @@ sealed class SnRealmMember with _$SnRealmMember {
    required DateTime createdAt,
    required DateTime updatedAt,
    required DateTime? deletedAt,
+    required SnAccountStatus? status,
  }) = _SnRealmMember;

  factory SnRealmMember.fromJson(Map<String, dynamic> json) =>
--- a/lib/models/realm.freezed.dart
+++ b/lib/models/realm.freezed.dart
@@ -359,7 +359,7 @@ $SnCloudFileCopyWith<$Res>? get background {
 /// @nodoc
 mixin _$SnRealmMember {

- String get realmId; SnRealm? get realm; String get accountId; SnAccount? get account; int get role; DateTime? get joinedAt; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt;
+ String get realmId; SnRealm? get realm; String get accountId; SnAccount? get account; int get role; DateTime? get joinedAt; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt; SnAccountStatus? get status;
 /// Create a copy of SnRealmMember
 /// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@@ -372,16 +372,16 @@ $SnRealmMemberCopyWith<SnRealmMember> get copyWith => _$SnRealmMemberCopyWithImp

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnRealmMember&&(identical(other.realmId, realmId) || other.realmId == realmId)&&(identical(other.realm, realm) || other.realm == realm)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.account, account) || other.account == account)&&(identical(other.role, role) || other.role == role)&&(identical(other.joinedAt, joinedAt) || other.joinedAt == joinedAt)&&(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 SnRealmMember&&(identical(other.realmId, realmId) || other.realmId == realmId)&&(identical(other.realm, realm) || other.realm == realm)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.account, account) || other.account == account)&&(identical(other.role, role) || other.role == role)&&(identical(other.joinedAt, joinedAt) || other.joinedAt == joinedAt)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&(identical(other.status, status) || other.status == status));
 }

@JsonKey(includeFromJson: false, includeToJson: false)
@override
-int get hashCode => Object.hash(runtimeType,realmId,realm,accountId,account,role,joinedAt,createdAt,updatedAt,deletedAt);
+int get hashCode => Object.hash(runtimeType,realmId,realm,accountId,account,role,joinedAt,createdAt,updatedAt,deletedAt,status);

@override
 String toString() {
-  return 'SnRealmMember(realmId: $realmId, realm: $realm, accountId: $accountId, account: $account, role: $role, joinedAt: $joinedAt, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+  return 'SnRealmMember(realmId: $realmId, realm: $realm, accountId: $accountId, account: $account, role: $role, joinedAt: $joinedAt, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, status: $status)';
 }


@@ -392,11 +392,11 @@ abstract mixin class $SnRealmMemberCopyWith<$Res>  {
  factory $SnRealmMemberCopyWith(SnRealmMember value, $Res Function(SnRealmMember) _then) = _$SnRealmMemberCopyWithImpl;
@useResult
 $Res call({
- String realmId, SnRealm? realm, String accountId, SnAccount? account, int role, DateTime? joinedAt, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String realmId, SnRealm? realm, String accountId, SnAccount? account, int role, DateTime? joinedAt, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, SnAccountStatus? status
 });


-$SnRealmCopyWith<$Res>? get realm;$SnAccountCopyWith<$Res>? get account;
+$SnRealmCopyWith<$Res>? get realm;$SnAccountCopyWith<$Res>? get account;$SnAccountStatusCopyWith<$Res>? get status;

 }
 /// @nodoc
@@ -409,7 +409,7 @@ class _$SnRealmMemberCopyWithImpl<$Res>

 /// Create a copy of SnRealmMember
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? realmId = null,Object? realm = freezed,Object? accountId = null,Object? account = freezed,Object? role = null,Object? joinedAt = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? realmId = null,Object? realm = freezed,Object? accountId = null,Object? account = freezed,Object? role = null,Object? joinedAt = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? status = freezed,}) {
  return _then(_self.copyWith(
 realmId: null == realmId ? _self.realmId : realmId // ignore: cast_nullable_to_non_nullable
 as String,realm: freezed == realm ? _self.realm : realm // ignore: cast_nullable_to_non_nullable
@@ -420,7 +420,8 @@ as int,joinedAt: freezed == joinedAt ? _self.joinedAt : joinedAt // ignore: cast
 as DateTime?,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?,status: freezed == status ? _self.status : status // ignore: cast_nullable_to_non_nullable
+as SnAccountStatus?,
  ));
 }
 /// Create a copy of SnRealmMember
@@ -447,6 +448,18 @@ $SnAccountCopyWith<$Res>? get account {
  return $SnAccountCopyWith<$Res>(_self.account!, (value) {
    return _then(_self.copyWith(account: value));
  });
+}/// Create a copy of SnRealmMember
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnAccountStatusCopyWith<$Res>? get status {
+    if (_self.status == null) {
+    return null;
+  }
+
+  return $SnAccountStatusCopyWith<$Res>(_self.status!, (value) {
+    return _then(_self.copyWith(status: value));
+  });
 }
 }

@@ -526,10 +539,10 @@ return $default(_that);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String realmId,  SnRealm? realm,  String accountId,  SnAccount? account,  int role,  DateTime? joinedAt,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String realmId,  SnRealm? realm,  String accountId,  SnAccount? account,  int role,  DateTime? joinedAt,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt,  SnAccountStatus? status)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _SnRealmMember() when $default != null:
-return $default(_that.realmId,_that.realm,_that.accountId,_that.account,_that.role,_that.joinedAt,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+return $default(_that.realmId,_that.realm,_that.accountId,_that.account,_that.role,_that.joinedAt,_that.createdAt,_that.updatedAt,_that.deletedAt,_that.status);case _:
  return orElse();

 }
@@ -547,10 +560,10 @@ return $default(_that.realmId,_that.realm,_that.accountId,_that.account,_that.ro
 /// }
 /// ```

-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String realmId,  SnRealm? realm,  String accountId,  SnAccount? account,  int role,  DateTime? joinedAt,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String realmId,  SnRealm? realm,  String accountId,  SnAccount? account,  int role,  DateTime? joinedAt,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt,  SnAccountStatus? status)  $default,) {final _that = this;
 switch (_that) {
 case _SnRealmMember():
-return $default(_that.realmId,_that.realm,_that.accountId,_that.account,_that.role,_that.joinedAt,_that.createdAt,_that.updatedAt,_that.deletedAt);}
+return $default(_that.realmId,_that.realm,_that.accountId,_that.account,_that.role,_that.joinedAt,_that.createdAt,_that.updatedAt,_that.deletedAt,_that.status);}
 }
 /// A variant of `when` that fallback to returning `null`
 ///
@@ -564,10 +577,10 @@ return $default(_that.realmId,_that.realm,_that.accountId,_that.account,_that.ro
 /// }
 /// ```

-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String realmId,  SnRealm? realm,  String accountId,  SnAccount? account,  int role,  DateTime? joinedAt,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String realmId,  SnRealm? realm,  String accountId,  SnAccount? account,  int role,  DateTime? joinedAt,  DateTime createdAt,  DateTime updatedAt,  DateTime? deletedAt,  SnAccountStatus? status)?  $default,) {final _that = this;
 switch (_that) {
 case _SnRealmMember() when $default != null:
-return $default(_that.realmId,_that.realm,_that.accountId,_that.account,_that.role,_that.joinedAt,_that.createdAt,_that.updatedAt,_that.deletedAt);case _:
+return $default(_that.realmId,_that.realm,_that.accountId,_that.account,_that.role,_that.joinedAt,_that.createdAt,_that.updatedAt,_that.deletedAt,_that.status);case _:
  return null;

 }
@@ -579,7 +592,7 @@ return $default(_that.realmId,_that.realm,_that.accountId,_that.account,_that.ro
@JsonSerializable()

 class _SnRealmMember implements SnRealmMember {
-  const _SnRealmMember({required this.realmId, required this.realm, required this.accountId, required this.account, required this.role, required this.joinedAt, required this.createdAt, required this.updatedAt, required this.deletedAt});
+  const _SnRealmMember({required this.realmId, required this.realm, required this.accountId, required this.account, required this.role, required this.joinedAt, required this.createdAt, required this.updatedAt, required this.deletedAt, required this.status});
  factory _SnRealmMember.fromJson(Map<String, dynamic> json) => _$SnRealmMemberFromJson(json);

@override final  String realmId;
@@ -591,6 +604,7 @@ class _SnRealmMember implements SnRealmMember {
@override final  DateTime createdAt;
@override final  DateTime updatedAt;
@override final  DateTime? deletedAt;
+@override final  SnAccountStatus? status;

 /// Create a copy of SnRealmMember
 /// with the given fields replaced by the non-null parameter values.
@@ -605,16 +619,16 @@ Map<String, dynamic> toJson() {

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnRealmMember&&(identical(other.realmId, realmId) || other.realmId == realmId)&&(identical(other.realm, realm) || other.realm == realm)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.account, account) || other.account == account)&&(identical(other.role, role) || other.role == role)&&(identical(other.joinedAt, joinedAt) || other.joinedAt == joinedAt)&&(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 _SnRealmMember&&(identical(other.realmId, realmId) || other.realmId == realmId)&&(identical(other.realm, realm) || other.realm == realm)&&(identical(other.accountId, accountId) || other.accountId == accountId)&&(identical(other.account, account) || other.account == account)&&(identical(other.role, role) || other.role == role)&&(identical(other.joinedAt, joinedAt) || other.joinedAt == joinedAt)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&(identical(other.status, status) || other.status == status));
 }

@JsonKey(includeFromJson: false, includeToJson: false)
@override
-int get hashCode => Object.hash(runtimeType,realmId,realm,accountId,account,role,joinedAt,createdAt,updatedAt,deletedAt);
+int get hashCode => Object.hash(runtimeType,realmId,realm,accountId,account,role,joinedAt,createdAt,updatedAt,deletedAt,status);

@override
 String toString() {
-  return 'SnRealmMember(realmId: $realmId, realm: $realm, accountId: $accountId, account: $account, role: $role, joinedAt: $joinedAt, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt)';
+  return 'SnRealmMember(realmId: $realmId, realm: $realm, accountId: $accountId, account: $account, role: $role, joinedAt: $joinedAt, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, status: $status)';
 }


@@ -625,11 +639,11 @@ abstract mixin class _$SnRealmMemberCopyWith<$Res> implements $SnRealmMemberCopy
  factory _$SnRealmMemberCopyWith(_SnRealmMember value, $Res Function(_SnRealmMember) _then) = __$SnRealmMemberCopyWithImpl;
@override @useResult
 $Res call({
- String realmId, SnRealm? realm, String accountId, SnAccount? account, int role, DateTime? joinedAt, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt
+ String realmId, SnRealm? realm, String accountId, SnAccount? account, int role, DateTime? joinedAt, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, SnAccountStatus? status
 });


-@override $SnRealmCopyWith<$Res>? get realm;@override $SnAccountCopyWith<$Res>? get account;
+@override $SnRealmCopyWith<$Res>? get realm;@override $SnAccountCopyWith<$Res>? get account;@override $SnAccountStatusCopyWith<$Res>? get status;

 }
 /// @nodoc
@@ -642,7 +656,7 @@ class __$SnRealmMemberCopyWithImpl<$Res>

 /// Create a copy of SnRealmMember
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? realmId = null,Object? realm = freezed,Object? accountId = null,Object? account = freezed,Object? role = null,Object? joinedAt = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? realmId = null,Object? realm = freezed,Object? accountId = null,Object? account = freezed,Object? role = null,Object? joinedAt = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? status = freezed,}) {
  return _then(_SnRealmMember(
 realmId: null == realmId ? _self.realmId : realmId // ignore: cast_nullable_to_non_nullable
 as String,realm: freezed == realm ? _self.realm : realm // ignore: cast_nullable_to_non_nullable
@@ -653,7 +667,8 @@ as int,joinedAt: freezed == joinedAt ? _self.joinedAt : joinedAt // ignore: cast
 as DateTime?,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?,status: freezed == status ? _self.status : status // ignore: cast_nullable_to_non_nullable
+as SnAccountStatus?,
  ));
 }

@@ -681,6 +696,18 @@ $SnAccountCopyWith<$Res>? get account {
  return $SnAccountCopyWith<$Res>(_self.account!, (value) {
    return _then(_self.copyWith(account: value));
  });
+}/// Create a copy of SnRealmMember
+/// with the given fields replaced by the non-null parameter values.
+@override
+@pragma('vm:prefer-inline')
+$SnAccountStatusCopyWith<$Res>? get status {
+    if (_self.status == null) {
+    return null;
+  }
+
+  return $SnAccountStatusCopyWith<$Res>(_self.status!, (value) {
+    return _then(_self.copyWith(status: value));
+  });
 }
 }

--- a/lib/models/realm.g.dart
+++ b/lib/models/realm.g.dart
@@ -75,6 +75,12 @@ _SnRealmMember _$SnRealmMemberFromJson(Map<String, dynamic> json) =>
          json['deleted_at'] == null
              ? null
              : DateTime.parse(json['deleted_at'] as String),
+      status:
+          json['status'] == null
+              ? null
+              : SnAccountStatus.fromJson(
+                json['status'] as Map<String, dynamic>,
+              ),
    );

 Map<String, dynamic> _$SnRealmMemberToJson(_SnRealmMember instance) =>
@@ -88,4 +94,5 @@ Map<String, dynamic> _$SnRealmMemberToJson(_SnRealmMember instance) =>
      'created_at': instance.createdAt.toIso8601String(),
      'updated_at': instance.updatedAt.toIso8601String(),
      'deleted_at': instance.deletedAt?.toIso8601String(),
+      'status': instance.status?.toJson(),
    };
--- a/lib/models/wallet.dart
+++ b/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,
--- a/lib/models/wallet.freezed.dart
+++ b/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
--- a/lib/models/wallet.g.dart
+++ b/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(),
--- a/lib/pods/activity/activity_rpc.dart
+++ b/lib/pods/activity/activity_rpc.dart
@@ -0,0 +1,465 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:developer' as developer;
+import 'dart:io';
+import 'package:flutter/foundation.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/pods/network.dart';
+import 'package:shelf/shelf.dart';
+import 'package:shelf/shelf_io.dart' as shelf_io;
+import 'package:shelf_web_socket/shelf_web_socket.dart';
+import 'package:web_socket_channel/web_socket_channel.dart';
+
+// Conditional imports for IPC server - use web stubs on web platform
+import 'ipc_server.dart' if (dart.library.html) 'ipc_server.web.dart';
+
+const String kRpcLogPrefix = 'arRPC.websocket';
+const String kRpcIpcLogPrefix = 'arRPC.ipc';
+
+// IPC Constants
+const String kIpcBasePath = 'discord-ipc';
+
+// IPC Packet Types
+class IpcTypes {
+  static const int handshake = 0;
+  static const int frame = 1;
+  static const int close = 2;
+  static const int ping = 3;
+  static const int pong = 4;
+}
+
+// IPC Close Codes
+class IpcCloseCodes {
+  static const int closeNormal = 1000;
+  static const int closeUnsupported = 1003;
+  static const int closeAbnormal = 1006;
+}
+
+// IPC Error Codes
+class IpcErrorCodes {
+  static const int invalidClientId = 4000;
+  static const int invalidOrigin = 4001;
+  static const int rateLimited = 4002;
+  static const int tokenRevoked = 4003;
+  static const int invalidVersion = 4004;
+  static const int invalidEncoding = 4005;
+}
+
+// Reference https://github.com/OpenAsar/arrpc/blob/main/src/transports/ipc.js
+class ActivityRpcServer {
+  static const List<int> portRange = [6463, 6472]; // Ports 6463–6472
+  Map<String, Function>
+  handlers; // {connection: (socket), message: (socket, data), close: (socket)}
+  HttpServer? _httpServer;
+  IpcServer? _ipcServer;
+  final List<WebSocketChannel> _wsSockets = [];
+
+  ActivityRpcServer(this.handlers);
+
+  void updateHandlers(Map<String, Function> newHandlers) {
+    handlers = newHandlers;
+  }
+
+  // Start the server
+  Future<void> start() async {
+    int port = portRange[0];
+    bool wsSuccess = false;
+
+    // Start WebSocket server
+    while (port <= portRange[1]) {
+      developer.log('Trying port $port', name: kRpcLogPrefix);
+      try {
+        _httpServer = await HttpServer.bind(InternetAddress.loopbackIPv4, port);
+        developer.log('Listening on $port', name: kRpcLogPrefix);
+
+        shelf_io.serveRequests(_httpServer!, (Request request) async {
+          developer.log('New request', name: kRpcLogPrefix);
+          if (request.headers['upgrade']?.toLowerCase() == 'websocket') {
+            final handler = webSocketHandler((WebSocketChannel channel, _) {
+              _wsSockets.add(channel);
+              _onWsConnection(channel, request);
+            });
+            return handler(request);
+          }
+          developer.log(
+            'New request disposed due to not websocket',
+            name: kRpcLogPrefix,
+          );
+          return Response.notFound('Not a WebSocket request');
+        });
+        wsSuccess = true;
+        break;
+      } catch (e) {
+        if (e is SocketException && e.osError?.errorCode == 98) {
+          developer.log('$port in use!', name: kRpcLogPrefix);
+        } else {
+          developer.log('HTTP error: $e', name: kRpcLogPrefix);
+        }
+        port++;
+        await Future.delayed(Duration(milliseconds: 100)); // Add delay
+      }
+    }
+
+    if (!wsSuccess) {
+      throw Exception(
+        'Failed to bind to any port in range ${portRange[0]}–${portRange[1]}',
+      );
+    }
+
+    // Start IPC server
+    final shouldStartIpc = !Platform.isMacOS && !kIsWeb;
+    if (shouldStartIpc) {
+      try {
+        _ipcServer = MultiPlatformIpcServer();
+
+        // Set up IPC handlers
+        _ipcServer!.handlePacket = (socket, packet, _) {
+          _handleIpcPacket(socket, packet);
+        };
+
+        await _ipcServer!.start();
+      } catch (e) {
+        developer.log('IPC server error: $e', name: kRpcIpcLogPrefix);
+      }
+    } else {
+      developer.log(
+        'IPC server disabled on macOS or web in production mode',
+        name: kRpcIpcLogPrefix,
+      );
+    }
+  }
+
+  // Stop the server
+  Future<void> stop() async {
+    // Stop WebSocket server
+    for (var socket in _wsSockets) {
+      try {
+        await socket.sink.close();
+      } catch (e) {
+        developer.log('Error closing WebSocket: $e', name: kRpcLogPrefix);
+      }
+    }
+    _wsSockets.clear();
+    await _httpServer?.close(force: true);
+
+    // Stop IPC server
+    await _ipcServer?.stop();
+
+    developer.log('Servers stopped', name: kRpcLogPrefix);
+  }
+
+  // Handle new WebSocket connection
+  void _onWsConnection(WebSocketChannel socket, Request request) {
+    final uri = request.url;
+    final params = uri.queryParameters;
+    final ver = int.tryParse(params['v'] ?? '1') ?? 1;
+    final encoding = params['encoding'] ?? 'json';
+    final clientId = params['client_id'] ?? '';
+    final origin = request.headers['origin'] ?? '';
+
+    developer.log(
+      'New WS connection! origin: $origin, params: $params',
+      name: kRpcLogPrefix,
+    );
+
+    if (origin.isNotEmpty &&
+        ![
+          'https://discord.com',
+          'https://ptb.discord.com',
+          'https://canary.discord.com',
+        ].contains(origin)) {
+      developer.log('Disallowed origin: $origin', name: kRpcLogPrefix);
+      socket.sink.close();
+      return;
+    }
+
+    if (encoding != 'json') {
+      developer.log(
+        'Unsupported encoding requested: $encoding',
+        name: kRpcLogPrefix,
+      );
+      socket.sink.close();
+      return;
+    }
+
+    if (ver != 1) {
+      developer.log('Unsupported version requested: $ver', name: kRpcLogPrefix);
+      socket.sink.close();
+      return;
+    }
+
+    final socketWithMeta = _WsSocketWrapper(socket, clientId, encoding);
+
+    socket.stream.listen(
+      (data) => _onWsMessage(socketWithMeta, data),
+      onError: (e) {
+        developer.log('WS socket error: $e', name: kRpcLogPrefix);
+      },
+      onDone: () {
+        developer.log('WS socket closed', name: kRpcLogPrefix);
+        handlers['close']?.call(socketWithMeta);
+        _wsSockets.remove(socket);
+      },
+    );
+
+    handlers['connection']?.call(socketWithMeta);
+  }
+
+  // Handle incoming WebSocket message
+  Future<void> _onWsMessage(_WsSocketWrapper socket, dynamic data) async {
+    if (data is! String) {
+      developer.log(
+        'Invalid WebSocket message: not a string',
+        name: kRpcLogPrefix,
+      );
+      return;
+    }
+    try {
+      final jsonData = await compute(jsonDecode, data);
+      if (jsonData is! Map<String, dynamic>) {
+        developer.log(
+          'Invalid WebSocket message: not a JSON object',
+          name: kRpcLogPrefix,
+        );
+        return;
+      }
+      developer.log('WS message: $jsonData', name: kRpcLogPrefix);
+      handlers['message']?.call(socket, jsonData);
+    } catch (e) {
+      developer.log('WS message parse error: $e', name: kRpcLogPrefix);
+    }
+  }
+
+  // Handle IPC packet
+  void _handleIpcPacket(IpcSocketWrapper socket, IpcPacket packet) {
+    switch (packet.type) {
+      case IpcTypes.ping:
+        developer.log('IPC ping received', name: kRpcIpcLogPrefix);
+        socket.sendPong(packet.data);
+        break;
+
+      case IpcTypes.pong:
+        developer.log('IPC pong received', name: kRpcIpcLogPrefix);
+        break;
+
+      case IpcTypes.handshake:
+        if (socket.handshook) {
+          throw Exception('Already handshook');
+        }
+        socket.handshook = true;
+        _onIpcHandshake(socket, packet.data);
+        break;
+
+      case IpcTypes.frame:
+        if (!socket.handshook) {
+          throw Exception('Need to handshake first');
+        }
+        developer.log('IPC frame: ${packet.data}', name: kRpcIpcLogPrefix);
+        handlers['message']?.call(socket, packet.data);
+        break;
+
+      case IpcTypes.close:
+        socket.close();
+        break;
+
+      default:
+        throw Exception('Invalid packet type: ${packet.type}');
+    }
+  }
+
+  // Handle IPC handshake
+  void _onIpcHandshake(IpcSocketWrapper socket, Map<String, dynamic> params) {
+    developer.log('IPC handshake: $params', name: kRpcIpcLogPrefix);
+
+    final ver = int.tryParse(params['v']?.toString() ?? '1') ?? 1;
+    final clientId = params['client_id']?.toString() ?? '';
+
+    if (ver != 1) {
+      developer.log(
+        'IPC unsupported version requested: $ver',
+        name: kRpcIpcLogPrefix,
+      );
+      socket.closeWithCode(IpcErrorCodes.invalidVersion);
+      return;
+    }
+
+    if (clientId.isEmpty) {
+      developer.log('IPC client ID required', name: kRpcIpcLogPrefix);
+      socket.closeWithCode(IpcErrorCodes.invalidClientId);
+      return;
+    }
+
+    socket.clientId = clientId;
+
+    handlers['connection']?.call(socket);
+  }
+}
+
+// WebSocket wrapper
+class _WsSocketWrapper {
+  final WebSocketChannel channel;
+  final String clientId;
+  final String encoding;
+
+  _WsSocketWrapper(this.channel, this.clientId, this.encoding);
+
+  void send(Map<String, dynamic> msg) {
+    developer.log('WS sending: $msg', name: kRpcLogPrefix);
+    channel.sink.add(jsonEncode(msg));
+  }
+}
+
+// State management for server status and activities
+class ServerState {
+  final String status;
+  final List<String> activities;
+
+  ServerState({required this.status, this.activities = const []});
+
+  ServerState copyWith({String? status, List<String>? activities}) {
+    return ServerState(
+      status: status ?? this.status,
+      activities: activities ?? this.activities,
+    );
+  }
+}
+
+class ServerStateNotifier extends StateNotifier<ServerState> {
+  final ActivityRpcServer server;
+
+  ServerStateNotifier(this.server)
+    : super(ServerState(status: 'Server not started'));
+
+  Future<void> start() async {
+    if (!Platform.isAndroid && !Platform.isIOS && !kIsWeb) {
+      try {
+        await server.start();
+        state = state.copyWith(status: 'Server running');
+      } catch (e) {
+        state = state.copyWith(status: 'Server failed: $e');
+      }
+    } else {
+      Future(() {
+        state = state.copyWith(status: 'Server disabled on mobile/web');
+      });
+    }
+  }
+
+  void updateStatus(String status) {
+    state = state.copyWith(status: status);
+  }
+
+  void addActivity(String activity) {
+    state = state.copyWith(activities: [...state.activities, activity]);
+  }
+}
+
+// Providers
+final rpcServerStateProvider =
+    StateNotifierProvider<ServerStateNotifier, ServerState>((ref) {
+      final server = ActivityRpcServer({});
+      final notifier = ServerStateNotifier(server);
+      server.updateHandlers({
+        'connection': (socket) {
+          final clientId =
+              socket is _WsSocketWrapper
+                  ? socket.clientId
+                  : (socket as IpcSocketWrapper).clientId;
+          notifier.updateStatus('Client connected (ID: $clientId)');
+          socket.send({
+            'cmd': 'DISPATCH',
+            'data': {
+              'v': 1,
+              'config': {
+                'cdn_host': 'fake.cdn',
+                'api_endpoint': '//fake.api',
+                'environment': 'dev',
+              },
+              'user': {
+                'id': 'fake_user_id',
+                'username': 'FakeUser',
+                'discriminator': '0001',
+                'avatar': null,
+                'bot': false,
+              },
+            },
+            'evt': 'READY',
+            'nonce': '12345',
+          });
+        },
+        'message': (socket, dynamic data) async {
+          if (data['cmd'] == 'SET_ACTIVITY') {
+            notifier.addActivity(
+              'Activity: ${data['args']['activity']['details'] ?? 'Unknown'}',
+            );
+            final label = data['args']['activity']['details'] ?? 'Unknown';
+            final appId = socket.clientId;
+            try {
+              await setRemoteActivityStatus(
+                ref,
+                label,
+                appId,
+                data['args']['activity'],
+              );
+            } catch (e) {
+              developer.log(
+                'Failed to set remote activity status: $e',
+                name: kRpcLogPrefix,
+              );
+            }
+            socket.send({
+              'cmd': 'SET_ACTIVITY',
+              'data': data['args']['activity'],
+              'evt': null,
+              'nonce': data['nonce'],
+            });
+          }
+        },
+        'close': (socket) async {
+          notifier.updateStatus('Client disconnected');
+          final appId = socket.clientId;
+          try {
+            await unsetRemoteActivityStatus(ref, appId);
+          } catch (e) {
+            developer.log(
+              'Failed to unset remote activity status: $e',
+              name: kRpcLogPrefix,
+            );
+          }
+        },
+      });
+      return notifier;
+    });
+
+final rpcServerProvider = Provider<ActivityRpcServer>((ref) {
+  final notifier = ref.watch(rpcServerStateProvider.notifier);
+  return notifier.server;
+});
+
+Future<void> setRemoteActivityStatus(
+  Ref ref,
+  String label,
+  String appId,
+  Map<String, dynamic> meta,
+) 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,
+      'meta': meta,
+    },
+  );
+}
+
+Future<void> unsetRemoteActivityStatus(Ref ref, String appId) async {
+  final apiClient = ref.read(apiClientProvider);
+  await apiClient.delete(
+    '/id/accounts/me/statuses',
+    queryParameters: {'app': appId},
+  );
+}
--- a/lib/pods/activity/ipc_server.dart
+++ b/lib/pods/activity/ipc_server.dart
@@ -0,0 +1,297 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:developer' as developer;
+import 'dart:io';
+import 'dart:typed_data';
+import 'package:dart_ipc/dart_ipc.dart';
+import 'package:path/path.dart' as path;
+
+const String kRpcIpcLogPrefix = 'arRPC.ipc';
+
+// IPC Packet Types
+class IpcTypes {
+  static const int handshake = 0;
+  static const int frame = 1;
+  static const int close = 2;
+  static const int ping = 3;
+  static const int pong = 4;
+}
+
+// IPC Close Codes
+class IpcCloseCodes {
+  static const int closeNormal = 1000;
+  static const int closeUnsupported = 1003;
+  static const int closeAbnormal = 1006;
+}
+
+// IPC Error Codes
+class IpcErrorCodes {
+  static const int invalidClientId = 4000;
+  static const int invalidOrigin = 4001;
+  static const int rateLimited = 4002;
+  static const int tokenRevoked = 4003;
+  static const int invalidVersion = 4004;
+  static const int invalidEncoding = 4005;
+}
+
+// IPC Packet structure
+class IpcPacket {
+  final int type;
+  final Map<String, dynamic> data;
+
+  IpcPacket(this.type, this.data);
+}
+
+// Abstract base class for IPC server
+abstract class IpcServer {
+  final List<IpcSocketWrapper> _sockets = [];
+
+  // Encode IPC packet
+  static Uint8List encodeIpcPacket(int type, Map<String, dynamic> data) {
+    final jsonData = jsonEncode(data);
+    final dataBytes = utf8.encode(jsonData);
+    final dataSize = dataBytes.length;
+
+    final buffer = ByteData(8 + dataSize);
+    buffer.setInt32(0, type, Endian.little);
+    buffer.setInt32(4, dataSize, Endian.little);
+    buffer.buffer.asUint8List().setRange(8, 8 + dataSize, dataBytes);
+
+    return buffer.buffer.asUint8List();
+  }
+
+  Future<void> start();
+  Future<void> stop();
+
+  void addSocket(IpcSocketWrapper socket) {
+    _sockets.add(socket);
+  }
+
+  void removeSocket(IpcSocketWrapper socket) {
+    _sockets.remove(socket);
+  }
+
+  List<IpcSocketWrapper> get sockets => _sockets;
+
+  void Function(
+    IpcSocketWrapper socket,
+    IpcPacket packet,
+    Map<String, Function> handlers,
+  )?
+  handlePacket;
+}
+
+// Abstract base class for IPC socket wrapper
+abstract class IpcSocketWrapper {
+  String clientId = '';
+  bool handshook = false;
+  final List<int> _buffer = [];
+
+  void addData(List<int> data) {
+    _buffer.addAll(data);
+  }
+
+  void send(Map<String, dynamic> msg);
+  void sendPong(dynamic data);
+  void close();
+  void closeWithCode(int code, [String message = '']);
+
+  List<IpcPacket> readPackets() {
+    final packets = <IpcPacket>[];
+
+    while (_buffer.length >= 8) {
+      final buffer = Uint8List.fromList(_buffer);
+      final byteData = ByteData.view(buffer.buffer);
+
+      final type = byteData.getInt32(0, Endian.little);
+      final dataSize = byteData.getInt32(4, Endian.little);
+
+      if (_buffer.length < 8 + dataSize) break;
+
+      final dataBytes = _buffer.sublist(8, 8 + dataSize);
+      final jsonStr = utf8.decode(dataBytes);
+      final jsonData = jsonDecode(jsonStr);
+
+      packets.add(IpcPacket(type, jsonData));
+
+      _buffer.removeRange(0, 8 + dataSize);
+    }
+
+    return packets;
+  }
+}
+
+// Multiplatform IPC Server implementation using dart_ipc
+class MultiPlatformIpcServer extends IpcServer {
+  StreamSubscription? _serverSubscription;
+
+  @override
+  Future<void> start() async {
+    try {
+      final ipcPath = Platform.isWindows
+          ? r'\\.\pipe\discord-ipc-0'
+          : await _findAvailableUnixIpcPath();
+
+      final serverSocket = await bind(ipcPath);
+      developer.log(
+        'IPC listening at $ipcPath',
+        name: kRpcIpcLogPrefix,
+      );
+
+      _serverSubscription = serverSocket.listen((socket) {
+        final socketWrapper = MultiPlatformIpcSocketWrapper(socket);
+        addSocket(socketWrapper);
+        developer.log(
+          'New IPC connection!',
+          name: kRpcIpcLogPrefix,
+        );
+        _handleIpcData(socketWrapper);
+      });
+    } catch (e) {
+      throw Exception('Failed to start IPC server: $e');
+    }
+  }
+
+  @override
+  Future<void> stop() async {
+    for (var socket in sockets) {
+      try {
+        socket.close();
+      } catch (e) {
+        developer.log('Error closing IPC socket: $e', name: kRpcIpcLogPrefix);
+      }
+    }
+    sockets.clear();
+    _serverSubscription?.cancel();
+  }
+
+  // Handle incoming IPC data
+  void _handleIpcData(MultiPlatformIpcSocketWrapper socket) {
+    final startTime = DateTime.now();
+    socket.socket.listen((data) {
+      final readStart = DateTime.now();
+      socket.addData(data);
+      final readDuration = DateTime.now().difference(readStart).inMicroseconds;
+      developer.log(
+        'Read data took $readDuration microseconds',
+        name: kRpcIpcLogPrefix,
+      );
+
+      final packets = socket.readPackets();
+      for (final packet in packets) {
+        handlePacket?.call(socket, packet, {});
+      }
+    }, onDone: () {
+      developer.log('IPC connection closed', name: kRpcIpcLogPrefix);
+      socket.close();
+    }, onError: (e) {
+      developer.log('IPC data error: $e', name: kRpcIpcLogPrefix);
+      socket.closeWithCode(IpcCloseCodes.closeUnsupported, e.toString());
+    });
+    final totalDuration = DateTime.now().difference(startTime).inMicroseconds;
+    developer.log(
+      '_handleIpcData took $totalDuration microseconds',
+      name: kRpcIpcLogPrefix,
+    );
+  }
+
+  Future<String> _getMacOsSystemTmpDir() async {
+    final result = await Process.run('getconf', ['DARWIN_USER_TEMP_DIR']);
+    return (result.stdout as String).trim();
+  }
+
+  // Find available IPC socket path for Unix-like systems
+  Future<String> _findAvailableUnixIpcPath() async {
+    // Build list of directories to try, with macOS-specific handling
+    final baseDirs = <String>[];
+
+    if (Platform.isMacOS) {
+      try {
+        final macTempDir = await _getMacOsSystemTmpDir();
+        if (macTempDir.isNotEmpty) {
+          baseDirs.add(macTempDir);
+        }
+      } catch (e) {
+        developer.log(
+          'Failed to get macOS system temp dir: $e',
+          name: kRpcIpcLogPrefix,
+        );
+      }
+    }
+
+    // Add other standard directories
+    final otherDirs = [
+      Platform.environment['XDG_RUNTIME_DIR'],
+      Platform.environment['TMPDIR'],
+      Platform.environment['TMP'],
+      Platform.environment['TEMP'],
+      '/tmp',
+    ];
+
+    baseDirs.addAll(
+      otherDirs.where((dir) => dir != null && dir.isNotEmpty).cast<String>(),
+    );
+
+    for (final baseDir in baseDirs) {
+      for (int i = 0; i < 10; i++) {
+        final socketPath = path.join(baseDir, 'discord-ipc-$i');
+        try {
+          final socket = await bind(socketPath);
+          socket.close();
+          try {
+            await File(socketPath).delete();
+          } catch (_) {}
+          developer.log(
+            'IPC socket will be created at: $socketPath',
+            name: kRpcIpcLogPrefix,
+          );
+          return socketPath;
+        } catch (e) {
+          if (i == 0) {
+            developer.log(
+              'IPC path $socketPath not available: $e',
+              name: kRpcIpcLogPrefix,
+            );
+          }
+          continue;
+        }
+      }
+    }
+    throw Exception(
+      'No available IPC socket paths found in any temp directory',
+    );
+  }
+}
+
+// Multiplatform IPC Socket Wrapper
+class MultiPlatformIpcSocketWrapper extends IpcSocketWrapper {
+  final dynamic socket;
+
+  MultiPlatformIpcSocketWrapper(this.socket);
+
+  @override
+  void send(Map<String, dynamic> msg) {
+    developer.log('IPC sending: $msg', name: kRpcIpcLogPrefix);
+    final packet = IpcServer.encodeIpcPacket(IpcTypes.frame, msg);
+    socket.add(packet);
+  }
+
+  @override
+  void sendPong(dynamic data) {
+    final packet = IpcServer.encodeIpcPacket(IpcTypes.pong, data ?? {});
+    socket.add(packet);
+  }
+
+  @override
+  void close() {
+    socket.close();
+  }
+
+  @override
+  void closeWithCode(int code, [String message = '']) {
+    final closeData = {'code': code, 'message': message};
+    final packet = IpcServer.encodeIpcPacket(IpcTypes.close, closeData);
+    socket.add(packet);
+    socket.close();
+  }
+}
--- a/lib/pods/activity/ipc_server.web.dart
+++ b/lib/pods/activity/ipc_server.web.dart
@@ -0,0 +1,61 @@
+// Stub implementation for web platform
+// This file provides empty implementations to avoid import errors on web
+
+// IPC Packet Types
+class IpcTypes {
+  static const int handshake = 0;
+  static const int frame = 1;
+  static const int close = 2;
+  static const int ping = 3;
+  static const int pong = 4;
+}
+
+// IPC Close Codes
+class IpcCloseCodes {
+  static const int closeNormal = 1000;
+  static const int closeUnsupported = 1003;
+  static const int closeAbnormal = 1006;
+}
+
+// IPC Error Codes
+class IpcErrorCodes {
+  static const int invalidClientId = 4000;
+  static const int invalidOrigin = 4001;
+  static const int rateLimited = 4002;
+  static const int tokenRevoked = 4003;
+  static const int invalidVersion = 4004;
+  static const int invalidEncoding = 4005;
+}
+
+// IPC Packet structure
+class IpcPacket {
+  final int type;
+  final Map<String, dynamic> data;
+
+  IpcPacket(this.type, this.data);
+}
+
+class IpcServer {
+  Future<void> start() async {}
+  Future<void> stop() async {}
+  void Function(dynamic, dynamic, dynamic)? handlePacket;
+  void addSocket(dynamic socket) {}
+  void removeSocket(dynamic socket) {}
+  List<dynamic> get sockets => [];
+}
+
+class IpcSocketWrapper {
+  String clientId = '';
+  bool handshook = false;
+
+  void addData(List<int> data) {}
+  void send(Map<String, dynamic> msg) {}
+  void sendPong(dynamic data) {}
+  void close() {}
+  void closeWithCode(int code, [String message = '']) {}
+  List<dynamic> readPackets() => [];
+}
+
+class MultiPlatformIpcServer extends IpcServer {}
+
+class MultiPlatformIpcSocketWrapper extends IpcSocketWrapper {}
--- a/lib/pods/call.dart
+++ b/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();
  }
 }
--- a/lib/pods/call.g.dart
+++ b/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(
+final callNotifierProvider = NotifierProvider<CallNotifier, CallState>.internal(
  CallNotifier.new,
  name: r'callNotifierProvider',
  debugGetCreateSourceHash:
-          const bool.fromEnvironment('dart.vm.product')
-              ? null
-              : _$callNotifierHash,
+      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
--- a/lib/pods/chat_rooms.dart
+++ b/lib/pods/chat_rooms.dart
@@ -0,0 +1,34 @@
+import "dart:async";
+import "package:flutter/material.dart";
+import "package:hooks_riverpod/hooks_riverpod.dart";
+
+final isSyncingProvider = StateProvider.autoDispose<bool>((ref) => false);
+
+final flashingMessagesProvider = StateProvider<Set<String>>((ref) => {});
+
+final appLifecycleStateProvider = StreamProvider<AppLifecycleState>((ref) {
+  final controller = StreamController<AppLifecycleState>();
+
+  final observer = _AppLifecycleObserver((state) {
+    if (controller.isClosed) return;
+    controller.add(state);
+  });
+  WidgetsBinding.instance.addObserver(observer);
+
+  ref.onDispose(() {
+    WidgetsBinding.instance.removeObserver(observer);
+    controller.close();
+  });
+
+  return controller.stream;
+});
+
+class _AppLifecycleObserver extends WidgetsBindingObserver {
+  final ValueChanged<AppLifecycleState> onChange;
+  _AppLifecycleObserver(this.onChange);
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    onChange(state);
+  }
+}
--- a/lib/pods/config.dart
+++ b/lib/pods/config.dart
@@ -15,14 +15,20 @@ const kNetworkServerStoreKey = 'app_server_url';

 const kAppbarTransparentStoreKey = 'app_bar_transparent';
 const kAppBackgroundStoreKey = 'app_has_background';
+const kAppShowBackgroundImage = 'app_show_background_image';
 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';
 const kAppEnterToSend = 'app_enter_to_send';
+const kAppDefaultPoolId = 'app_default_pool_id';
+const kAppMessageDisplayStyle = 'app_message_display_style';
+const kFeaturedPostsCollapsedId =
+    'featured_posts_collapsed_id'; // Key for storing the ID of the collapsed featured post

 const Map<String, FilterQuality> kImageQualityLevel = {
  'settingsImageQualityLowest': FilterQuality.none,
@@ -52,13 +58,17 @@ 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,
    required bool appBarTransparent,
+    required bool showBackgroundImage,
    required String? customFonts,
    required int? appColorScheme, // The color stored via the int type
    required Size? windowSize, // The window size for desktop platforms
+    required String? defaultPoolId,
+    required String messageDisplayStyle,
  }) = _AppSettings;
 }

@@ -69,13 +79,17 @@ 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,
      appBarTransparent: prefs.getBool(kAppbarTransparentStoreKey) ?? false,
+      showBackgroundImage: prefs.getBool(kAppShowBackgroundImage) ?? true,
      customFonts: prefs.getString(kAppCustomFonts),
      appColorScheme: prefs.getInt(kAppColorSchemeStoreKey),
      windowSize: _getWindowSizeFromPrefs(prefs),
+      defaultPoolId: prefs.getString(kAppDefaultPoolId),
+      messageDisplayStyle: prefs.getString(kAppMessageDisplayStyle) ?? 'bubble',
    );
  }

@@ -96,12 +110,28 @@ class AppSettingsNotifier extends _$AppSettingsNotifier {
    return null;
  }

+  void setDefaultPoolId(String? value) {
+    final prefs = ref.read(sharedPreferencesProvider);
+    if (value != null) {
+      prefs.setString(kAppDefaultPoolId, value);
+    } else {
+      prefs.remove(kAppDefaultPoolId);
+    }
+    state = state.copyWith(defaultPoolId: value);
+  }
+
  void setAutoTranslate(bool value) {
    final prefs = ref.read(sharedPreferencesProvider);
    prefs.setBool(kAppAutoTranslate, value);
    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);
@@ -127,6 +157,12 @@ class AppSettingsNotifier extends _$AppSettingsNotifier {
    ref.read(themeProvider.notifier).reloadTheme();
  }

+  void setShowBackgroundImage(bool value) {
+    final prefs = ref.read(sharedPreferencesProvider);
+    prefs.setBool(kAppShowBackgroundImage, value);
+    state = state.copyWith(showBackgroundImage: value);
+  }
+
  void setCustomFonts(String? value) {
    final prefs = ref.read(sharedPreferencesProvider);
    prefs.setString(kAppCustomFonts, value ?? '');
@@ -154,6 +190,12 @@ class AppSettingsNotifier extends _$AppSettingsNotifier {
  Size? getWindowSize() {
    return state.windowSize;
  }
+
+  void setMessageDisplayStyle(String value) {
+    final prefs = ref.read(sharedPreferencesProvider);
+    prefs.setString(kAppMessageDisplayStyle, value);
+    state = state.copyWith(messageDisplayStyle: value);
+  }
 }

 final updateInfoProvider =
--- a/lib/pods/config.freezed.dart
+++ b/lib/pods/config.freezed.dart
@@ -14,8 +14,9 @@ T _$identity<T>(T value) => value;
 /// @nodoc
 mixin _$AppSettings {

- bool get autoTranslate; bool get soundEffects; bool get aprilFoolFeatures; bool get enterToSend; bool get appBarTransparent; String? get customFonts; int? get appColorScheme;// The color stored via the int type
- Size? get windowSize;
+ 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;// The window size for desktop platforms
+ String? get defaultPoolId; String get messageDisplayStyle;
 /// Create a copy of AppSettings
 /// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@@ -26,16 +27,16 @@ $AppSettingsCopyWith<AppSettings> get copyWith => _$AppSettingsCopyWithImpl<AppS

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is AppSettings&&(identical(other.autoTranslate, autoTranslate) || other.autoTranslate == autoTranslate)&&(identical(other.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.customFonts, customFonts) || other.customFonts == customFonts)&&(identical(other.appColorScheme, appColorScheme) || other.appColorScheme == appColorScheme)&&(identical(other.windowSize, windowSize) || other.windowSize == windowSize));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is AppSettings&&(identical(other.autoTranslate, autoTranslate) || other.autoTranslate == autoTranslate)&&(identical(other.dataSavingMode, dataSavingMode) || other.dataSavingMode == dataSavingMode)&&(identical(other.soundEffects, soundEffects) || other.soundEffects == soundEffects)&&(identical(other.aprilFoolFeatures, aprilFoolFeatures) || other.aprilFoolFeatures == aprilFoolFeatures)&&(identical(other.enterToSend, enterToSend) || other.enterToSend == enterToSend)&&(identical(other.appBarTransparent, appBarTransparent) || other.appBarTransparent == appBarTransparent)&&(identical(other.showBackgroundImage, showBackgroundImage) || other.showBackgroundImage == showBackgroundImage)&&(identical(other.customFonts, customFonts) || other.customFonts == customFonts)&&(identical(other.appColorScheme, appColorScheme) || other.appColorScheme == appColorScheme)&&(identical(other.windowSize, windowSize) || other.windowSize == windowSize)&&(identical(other.defaultPoolId, defaultPoolId) || other.defaultPoolId == defaultPoolId)&&(identical(other.messageDisplayStyle, messageDisplayStyle) || other.messageDisplayStyle == messageDisplayStyle));
 }


@override
-int get hashCode => Object.hash(runtimeType,autoTranslate,soundEffects,aprilFoolFeatures,enterToSend,appBarTransparent,customFonts,appColorScheme,windowSize);
+int get hashCode => Object.hash(runtimeType,autoTranslate,dataSavingMode,soundEffects,aprilFoolFeatures,enterToSend,appBarTransparent,showBackgroundImage,customFonts,appColorScheme,windowSize,defaultPoolId,messageDisplayStyle);

@override
 String toString() {
-  return 'AppSettings(autoTranslate: $autoTranslate, soundEffects: $soundEffects, aprilFoolFeatures: $aprilFoolFeatures, enterToSend: $enterToSend, appBarTransparent: $appBarTransparent, customFonts: $customFonts, appColorScheme: $appColorScheme, windowSize: $windowSize)';
+  return 'AppSettings(autoTranslate: $autoTranslate, dataSavingMode: $dataSavingMode, soundEffects: $soundEffects, aprilFoolFeatures: $aprilFoolFeatures, enterToSend: $enterToSend, appBarTransparent: $appBarTransparent, showBackgroundImage: $showBackgroundImage, customFonts: $customFonts, appColorScheme: $appColorScheme, windowSize: $windowSize, defaultPoolId: $defaultPoolId, messageDisplayStyle: $messageDisplayStyle)';
 }


@@ -46,7 +47,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, String? customFonts, int? appColorScheme, Size? windowSize
+ bool autoTranslate, bool dataSavingMode, bool soundEffects, bool aprilFoolFeatures, bool enterToSend, bool appBarTransparent, bool showBackgroundImage, String? customFonts, int? appColorScheme, Size? windowSize, String? defaultPoolId, String messageDisplayStyle
 });


@@ -63,17 +64,21 @@ 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? customFonts = freezed,Object? appColorScheme = freezed,Object? windowSize = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? autoTranslate = null,Object? dataSavingMode = null,Object? soundEffects = null,Object? aprilFoolFeatures = null,Object? enterToSend = null,Object? appBarTransparent = null,Object? showBackgroundImage = null,Object? customFonts = freezed,Object? appColorScheme = freezed,Object? windowSize = freezed,Object? defaultPoolId = freezed,Object? messageDisplayStyle = null,}) {
  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
 as bool,appBarTransparent: null == appBarTransparent ? _self.appBarTransparent : appBarTransparent // ignore: cast_nullable_to_non_nullable
+as bool,showBackgroundImage: null == showBackgroundImage ? _self.showBackgroundImage : showBackgroundImage // ignore: cast_nullable_to_non_nullable
 as bool,customFonts: freezed == customFonts ? _self.customFonts : customFonts // ignore: cast_nullable_to_non_nullable
 as String?,appColorScheme: freezed == appColorScheme ? _self.appColorScheme : appColorScheme // ignore: cast_nullable_to_non_nullable
 as int?,windowSize: freezed == windowSize ? _self.windowSize : windowSize // ignore: cast_nullable_to_non_nullable
-as Size?,
+as Size?,defaultPoolId: freezed == defaultPoolId ? _self.defaultPoolId : defaultPoolId // ignore: cast_nullable_to_non_nullable
+as String?,messageDisplayStyle: null == messageDisplayStyle ? _self.messageDisplayStyle : messageDisplayStyle // ignore: cast_nullable_to_non_nullable
+as String,
  ));
 }

@@ -155,10 +160,10 @@ return $default(_that);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( bool autoTranslate,  bool soundEffects,  bool aprilFoolFeatures,  bool enterToSend,  bool appBarTransparent,  String? customFonts,  int? appColorScheme,  Size? windowSize)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( bool autoTranslate,  bool dataSavingMode,  bool soundEffects,  bool aprilFoolFeatures,  bool enterToSend,  bool appBarTransparent,  bool showBackgroundImage,  String? customFonts,  int? appColorScheme,  Size? windowSize,  String? defaultPoolId,  String messageDisplayStyle)?  $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.customFonts,_that.appColorScheme,_that.windowSize);case _:
+return $default(_that.autoTranslate,_that.dataSavingMode,_that.soundEffects,_that.aprilFoolFeatures,_that.enterToSend,_that.appBarTransparent,_that.showBackgroundImage,_that.customFonts,_that.appColorScheme,_that.windowSize,_that.defaultPoolId,_that.messageDisplayStyle);case _:
  return orElse();

 }
@@ -176,10 +181,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,  String? customFonts,  int? appColorScheme,  Size? windowSize)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( bool autoTranslate,  bool dataSavingMode,  bool soundEffects,  bool aprilFoolFeatures,  bool enterToSend,  bool appBarTransparent,  bool showBackgroundImage,  String? customFonts,  int? appColorScheme,  Size? windowSize,  String? defaultPoolId,  String messageDisplayStyle)  $default,) {final _that = this;
 switch (_that) {
 case _AppSettings():
-return $default(_that.autoTranslate,_that.soundEffects,_that.aprilFoolFeatures,_that.enterToSend,_that.appBarTransparent,_that.customFonts,_that.appColorScheme,_that.windowSize);}
+return $default(_that.autoTranslate,_that.dataSavingMode,_that.soundEffects,_that.aprilFoolFeatures,_that.enterToSend,_that.appBarTransparent,_that.showBackgroundImage,_that.customFonts,_that.appColorScheme,_that.windowSize,_that.defaultPoolId,_that.messageDisplayStyle);}
 }
 /// A variant of `when` that fallback to returning `null`
 ///
@@ -193,10 +198,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,  String? customFonts,  int? appColorScheme,  Size? windowSize)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( bool autoTranslate,  bool dataSavingMode,  bool soundEffects,  bool aprilFoolFeatures,  bool enterToSend,  bool appBarTransparent,  bool showBackgroundImage,  String? customFonts,  int? appColorScheme,  Size? windowSize,  String? defaultPoolId,  String messageDisplayStyle)?  $default,) {final _that = this;
 switch (_that) {
 case _AppSettings() when $default != null:
-return $default(_that.autoTranslate,_that.soundEffects,_that.aprilFoolFeatures,_that.enterToSend,_that.appBarTransparent,_that.customFonts,_that.appColorScheme,_that.windowSize);case _:
+return $default(_that.autoTranslate,_that.dataSavingMode,_that.soundEffects,_that.aprilFoolFeatures,_that.enterToSend,_that.appBarTransparent,_that.showBackgroundImage,_that.customFonts,_that.appColorScheme,_that.windowSize,_that.defaultPoolId,_that.messageDisplayStyle);case _:
  return null;

 }
@@ -208,18 +213,23 @@ 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.customFonts, required this.appColorScheme, required this.windowSize});
+  const _AppSettings({required this.autoTranslate, required this.dataSavingMode, required this.soundEffects, required this.aprilFoolFeatures, required this.enterToSend, required this.appBarTransparent, required this.showBackgroundImage, required this.customFonts, required this.appColorScheme, required this.windowSize, required this.defaultPoolId, required this.messageDisplayStyle});
  

@override final  bool autoTranslate;
+@override final  bool dataSavingMode;
@override final  bool soundEffects;
@override final  bool aprilFoolFeatures;
@override final  bool enterToSend;
@override final  bool appBarTransparent;
+@override final  bool showBackgroundImage;
@override final  String? customFonts;
@override final  int? appColorScheme;
 // The color stored via the int type
@override final  Size? windowSize;
+// The window size for desktop platforms
+@override final  String? defaultPoolId;
+@override final  String messageDisplayStyle;

 /// Create a copy of AppSettings
 /// with the given fields replaced by the non-null parameter values.
@@ -231,16 +241,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.customFonts, customFonts) || other.customFonts == customFonts)&&(identical(other.appColorScheme, appColorScheme) || other.appColorScheme == appColorScheme)&&(identical(other.windowSize, windowSize) || other.windowSize == windowSize));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _AppSettings&&(identical(other.autoTranslate, autoTranslate) || other.autoTranslate == autoTranslate)&&(identical(other.dataSavingMode, dataSavingMode) || other.dataSavingMode == dataSavingMode)&&(identical(other.soundEffects, soundEffects) || other.soundEffects == soundEffects)&&(identical(other.aprilFoolFeatures, aprilFoolFeatures) || other.aprilFoolFeatures == aprilFoolFeatures)&&(identical(other.enterToSend, enterToSend) || other.enterToSend == enterToSend)&&(identical(other.appBarTransparent, appBarTransparent) || other.appBarTransparent == appBarTransparent)&&(identical(other.showBackgroundImage, showBackgroundImage) || other.showBackgroundImage == showBackgroundImage)&&(identical(other.customFonts, customFonts) || other.customFonts == customFonts)&&(identical(other.appColorScheme, appColorScheme) || other.appColorScheme == appColorScheme)&&(identical(other.windowSize, windowSize) || other.windowSize == windowSize)&&(identical(other.defaultPoolId, defaultPoolId) || other.defaultPoolId == defaultPoolId)&&(identical(other.messageDisplayStyle, messageDisplayStyle) || other.messageDisplayStyle == messageDisplayStyle));
 }


@override
-int get hashCode => Object.hash(runtimeType,autoTranslate,soundEffects,aprilFoolFeatures,enterToSend,appBarTransparent,customFonts,appColorScheme,windowSize);
+int get hashCode => Object.hash(runtimeType,autoTranslate,dataSavingMode,soundEffects,aprilFoolFeatures,enterToSend,appBarTransparent,showBackgroundImage,customFonts,appColorScheme,windowSize,defaultPoolId,messageDisplayStyle);

@override
 String toString() {
-  return 'AppSettings(autoTranslate: $autoTranslate, soundEffects: $soundEffects, aprilFoolFeatures: $aprilFoolFeatures, enterToSend: $enterToSend, appBarTransparent: $appBarTransparent, customFonts: $customFonts, appColorScheme: $appColorScheme, windowSize: $windowSize)';
+  return 'AppSettings(autoTranslate: $autoTranslate, dataSavingMode: $dataSavingMode, soundEffects: $soundEffects, aprilFoolFeatures: $aprilFoolFeatures, enterToSend: $enterToSend, appBarTransparent: $appBarTransparent, showBackgroundImage: $showBackgroundImage, customFonts: $customFonts, appColorScheme: $appColorScheme, windowSize: $windowSize, defaultPoolId: $defaultPoolId, messageDisplayStyle: $messageDisplayStyle)';
 }


@@ -251,7 +261,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, String? customFonts, int? appColorScheme, Size? windowSize
+ bool autoTranslate, bool dataSavingMode, bool soundEffects, bool aprilFoolFeatures, bool enterToSend, bool appBarTransparent, bool showBackgroundImage, String? customFonts, int? appColorScheme, Size? windowSize, String? defaultPoolId, String messageDisplayStyle
 });


@@ -268,17 +278,21 @@ 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? customFonts = freezed,Object? appColorScheme = freezed,Object? windowSize = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? autoTranslate = null,Object? dataSavingMode = null,Object? soundEffects = null,Object? aprilFoolFeatures = null,Object? enterToSend = null,Object? appBarTransparent = null,Object? showBackgroundImage = null,Object? customFonts = freezed,Object? appColorScheme = freezed,Object? windowSize = freezed,Object? defaultPoolId = freezed,Object? messageDisplayStyle = null,}) {
  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
 as bool,appBarTransparent: null == appBarTransparent ? _self.appBarTransparent : appBarTransparent // ignore: cast_nullable_to_non_nullable
+as bool,showBackgroundImage: null == showBackgroundImage ? _self.showBackgroundImage : showBackgroundImage // ignore: cast_nullable_to_non_nullable
 as bool,customFonts: freezed == customFonts ? _self.customFonts : customFonts // ignore: cast_nullable_to_non_nullable
 as String?,appColorScheme: freezed == appColorScheme ? _self.appColorScheme : appColorScheme // ignore: cast_nullable_to_non_nullable
 as int?,windowSize: freezed == windowSize ? _self.windowSize : windowSize // ignore: cast_nullable_to_non_nullable
-as Size?,
+as Size?,defaultPoolId: freezed == defaultPoolId ? _self.defaultPoolId : defaultPoolId // ignore: cast_nullable_to_non_nullable
+as String?,messageDisplayStyle: null == messageDisplayStyle ? _self.messageDisplayStyle : messageDisplayStyle // ignore: cast_nullable_to_non_nullable
+as String,
  ));
 }

--- a/lib/pods/config.g.dart
+++ b/lib/pods/config.g.dart
@@ -7,7 +7,7 @@ part of 'config.dart';
 // **************************************************************************

 String _$appSettingsNotifierHash() =>
-    r'c4f40a3bc4311c6360c2b5e44f8df5e5d7c1bd75';
+    r'9f0979f18b107e61185391e7c39bd81ac4b8ca50';

 /// See also [AppSettingsNotifier].
@ProviderFor(AppSettingsNotifier)
--- a/lib/pods/file_pool.dart
+++ b/lib/pods/file_pool.dart
@@ -0,0 +1,28 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/file_pool.dart';
+import 'package:island/pods/config.dart';
+import 'package:island/pods/network.dart';
+
+final poolsProvider = FutureProvider<List<SnFilePool>>((ref) async {
+  final dio = ref.watch(apiClientProvider);
+  final response = await dio.get('/drive/pools');
+  final pools = SnFilePoolList.listFromResponse(response.data);
+  return pools.filterValid();
+});
+
+String resolveDefaultPoolId(WidgetRef ref, List<SnFilePool> pools) {
+  final settings = ref.watch(appSettingsNotifierProvider);
+  final validPools = pools.filterValid();
+
+  final configuredId = settings.defaultPoolId;
+  if (configuredId != null && validPools.any((p) => p.id == configuredId)) {
+    return configuredId;
+  }
+
+  if (validPools.isNotEmpty) {
+    return validPools.first.id;
+  }
+
+  // DEFAULT: Solar Network Driver
+  return '500e5ed8-bd44-4359-bc0a-ec85e2adf447'; }
+
--- a/lib/pods/messages_notifier.dart
+++ b/lib/pods/messages_notifier.dart
@@ -0,0 +1,852 @@
+import "dart:async";
+import "dart:developer" as developer;
+import "package:dio/dio.dart";
+import "package:drift/drift.dart" show Variable;
+import "package:easy_localization/easy_localization.dart";
+import "package:flutter/material.dart";
+import "package:island/database/drift_db.dart";
+import "package:island/database/message.dart";
+import "package:island/models/chat.dart";
+import "package:island/models/file.dart";
+import "package:island/pods/config.dart";
+import "package:island/pods/database.dart";
+import "package:island/pods/network.dart";
+import "package:island/services/file.dart";
+import "package:island/widgets/alert.dart";
+import "package:riverpod_annotation/riverpod_annotation.dart";
+import "package:uuid/uuid.dart";
+import "package:island/screens/chat/chat.dart";
+import "package:island/pods/chat_rooms.dart";
+
+part 'messages_notifier.g.dart';
+
+@riverpod
+class MessagesNotifier extends _$MessagesNotifier {
+  late final Dio _apiClient;
+  late final AppDatabase _database;
+  late final SnChatRoom _room;
+  late final SnChatMember _identity;
+
+  final Map<String, LocalChatMessage> _pendingMessages = {};
+  final Map<String, Map<int, double>> _fileUploadProgress = {};
+  int? _totalCount;
+  String? _searchQuery;
+  bool? _withLinks;
+  bool? _withAttachments;
+
+  late final String _roomId;
+  static const int _pageSize = 20;
+  bool _hasMore = true;
+  bool _isSyncing = false;
+  bool _isJumping = false;
+
+  @override
+  FutureOr<List<LocalChatMessage>> build(String roomId) async {
+    _roomId = roomId;
+    _apiClient = ref.watch(apiClientProvider);
+    _database = ref.watch(databaseProvider);
+    final room = await ref.watch(chatroomProvider(roomId).future);
+    final identity = await ref.watch(chatroomIdentityProvider(roomId).future);
+
+    if (room == null) {
+      throw Exception('Room not found');
+    }
+    _room = room;
+
+    // Allow building even if identity is null for public rooms
+    if (identity != null) {
+      _identity = identity;
+    }
+
+    developer.log(
+      'MessagesNotifier built for room $roomId',
+      name: 'MessagesNotifier',
+    );
+
+    // Only setup sync and lifecycle listeners if user is a member
+    if (identity != null) {
+      ref.listen(appLifecycleStateProvider, (_, next) {
+        if (next.hasValue && next.value == AppLifecycleState.resumed) {
+          developer.log(
+            'App resumed, syncing messages',
+            name: 'MessagesNotifier',
+          );
+          syncMessages();
+        }
+      });
+    }
+
+    loadInitial();
+    return [];
+  }
+
+  List<LocalChatMessage> _sortMessages(List<LocalChatMessage> messages) {
+    messages.sort((a, b) => b.createdAt.compareTo(a.createdAt));
+    return messages;
+  }
+
+  Future<List<LocalChatMessage>> _getCachedMessages({
+    int offset = 0,
+    int take = 20,
+  }) async {
+    developer.log(
+      'Getting cached messages from offset $offset, take $take',
+      name: 'MessagesNotifier',
+    );
+    final List<LocalChatMessage> dbMessages;
+    if (_searchQuery != null && _searchQuery!.isNotEmpty) {
+      dbMessages = await _database.searchMessages(
+        _roomId,
+        _searchQuery ?? '',
+        withAttachments: _withAttachments,
+      );
+    } else {
+      final chatMessagesFromDb = await _database.getMessagesForRoom(
+        _roomId,
+        offset: offset,
+        limit: take,
+      );
+      dbMessages =
+          chatMessagesFromDb.map(_database.companionToMessage).toList();
+    }
+
+    List<LocalChatMessage> filteredMessages = dbMessages;
+
+    if (_withLinks == true) {
+      filteredMessages =
+          filteredMessages.where((msg) => _hasLink(msg)).toList();
+    }
+
+    final dbLocalMessages = filteredMessages;
+
+    // Always ensure unique messages to prevent duplicate keys
+    final uniqueMessages = <LocalChatMessage>[];
+    final seenIds = <String>{};
+    for (final message in dbLocalMessages) {
+      if (seenIds.add(message.id)) {
+        uniqueMessages.add(message);
+      }
+    }
+
+    if (offset == 0) {
+      final pendingForRoom =
+          _pendingMessages.values
+              .where((msg) => msg.roomId == _roomId)
+              .toList();
+
+      final allMessages = [...pendingForRoom, ...uniqueMessages];
+      _sortMessages(allMessages); // Use the helper function
+
+      final finalUniqueMessages = <LocalChatMessage>[];
+      final finalSeenIds = <String>{};
+      for (final message in allMessages) {
+        if (finalSeenIds.add(message.id)) {
+          finalUniqueMessages.add(message);
+        }
+      }
+      return finalUniqueMessages;
+    }
+
+    return uniqueMessages;
+  }
+
+  Future<List<LocalChatMessage>> _fetchAndCacheMessages({
+    int offset = 0,
+    int take = 20,
+  }) async {
+    developer.log(
+      'Fetching messages from API, offset $offset, take $take',
+      name: 'MessagesNotifier',
+    );
+    if (_totalCount == null) {
+      final response = await _apiClient.get(
+        '/sphere/chat/$_roomId/messages',
+        queryParameters: {'offset': 0, 'take': 1},
+      );
+      _totalCount = int.parse(response.headers['x-total']?.firstOrNull ?? '0');
+    }
+
+    if (offset >= _totalCount!) {
+      return [];
+    }
+
+    final response = await _apiClient.get(
+      '/sphere/chat/$_roomId/messages',
+      queryParameters: {'offset': offset, 'take': take},
+    );
+
+    final List<dynamic> data = response.data;
+    _totalCount = int.parse(response.headers['x-total']?.firstOrNull ?? '0');
+
+    final messages =
+        data.map((json) {
+          final remoteMessage = SnChatMessage.fromJson(json);
+          return LocalChatMessage.fromRemoteMessage(
+            remoteMessage,
+            MessageStatus.sent,
+          );
+        }).toList();
+
+    for (final message in messages) {
+      await _database.saveMessage(_database.messageToCompanion(message));
+      if (message.nonce != null) {
+        _pendingMessages.removeWhere(
+          (_, pendingMsg) => pendingMsg.nonce == message.nonce,
+        );
+      }
+    }
+
+    return messages;
+  }
+
+  Future<void> syncMessages() async {
+    if (_isSyncing) {
+      developer.log(
+        'Sync already in progress, skipping.',
+        name: 'MessagesNotifier',
+      );
+      return;
+    }
+    _isSyncing = true;
+
+    developer.log('Starting message sync', name: 'MessagesNotifier');
+    Future.microtask(() => ref.read(isSyncingProvider.notifier).state = true);
+    try {
+      final dbMessages = await _database.getMessagesForRoom(
+        _room.id,
+        offset: 0,
+        limit: 1,
+      );
+      final lastMessage =
+          dbMessages.isEmpty
+              ? null
+              : _database.companionToMessage(dbMessages.first);
+
+      if (lastMessage == null) {
+        developer.log(
+          'No local messages, fetching from network',
+          name: 'MessagesNotifier',
+        );
+        final newMessages = await _fetchAndCacheMessages(
+          offset: 0,
+          take: _pageSize,
+        );
+        state = AsyncValue.data(newMessages);
+        return;
+      }
+
+      final resp = await _apiClient.post(
+        '/sphere/chat/${_room.id}/sync',
+        data: {
+          'last_sync_timestamp':
+              lastMessage.toRemoteMessage().updatedAt.millisecondsSinceEpoch,
+        },
+      );
+
+      final response = MessageSyncResponse.fromJson(resp.data);
+      developer.log(
+        'Sync response: ${response.messages.length} changes',
+        name: 'MessagesNotifier',
+      );
+      for (final message in response.messages) {
+        switch (message.type) {
+          case "messages.update":
+          case "messages.update.links":
+            await receiveMessageUpdate(message);
+            break;
+          case "messages.delete":
+            await receiveMessageDeletion(message.id.toString());
+            break;
+        }
+        // Still need receive the message to show the history actions
+        await receiveMessage(message);
+      }
+    } catch (err, stackTrace) {
+      developer.log(
+        'Error syncing messages',
+        name: 'MessagesNotifier',
+        error: err,
+        stackTrace: stackTrace,
+      );
+      showErrorAlert(err);
+    } finally {
+      developer.log('Finished message sync', name: 'MessagesNotifier');
+      Future.microtask(
+        () => ref.read(isSyncingProvider.notifier).state = false,
+      );
+      _isSyncing = false;
+    }
+  }
+
+  Future<List<LocalChatMessage>> listMessages({
+    int offset = 0,
+    int take = 20,
+    bool synced = false,
+  }) async {
+    try {
+      if (offset == 0 &&
+          !synced &&
+          (_searchQuery == null || _searchQuery!.isEmpty)) {
+        _fetchAndCacheMessages(offset: 0, take: take).catchError((_) {
+          return <LocalChatMessage>[];
+        });
+      }
+
+      final localMessages = await _getCachedMessages(
+        offset: offset,
+        take: take,
+      );
+
+      if (localMessages.isNotEmpty) {
+        return localMessages;
+      }
+
+      if (_searchQuery == null || _searchQuery!.isEmpty) {
+        return await _fetchAndCacheMessages(offset: offset, take: take);
+      } else {
+        return []; // If searching, and no local messages, don't fetch from network
+      }
+    } catch (e) {
+      final localMessages = await _getCachedMessages(
+        offset: offset,
+        take: take,
+      );
+
+      if (localMessages.isNotEmpty) {
+        return localMessages;
+      }
+      rethrow;
+    }
+  }
+
+  Future<void> loadInitial() async {
+    developer.log('Loading initial messages', name: 'MessagesNotifier');
+    if (_searchQuery == null || _searchQuery!.isEmpty) {
+      syncMessages();
+    }
+
+    final messages = await _getCachedMessages(offset: 0, take: _pageSize);
+
+    _hasMore = messages.length == _pageSize;
+
+    state = AsyncValue.data(messages);
+  }
+
+  Future<void> loadMore() async {
+    if (!_hasMore || state is AsyncLoading) return;
+    developer.log('Loading more messages', name: 'MessagesNotifier');
+
+    try {
+      final currentMessages = state.value ?? [];
+      final offset = currentMessages.length;
+
+      final newMessages = await listMessages(offset: offset, take: _pageSize);
+
+      if (newMessages.isEmpty || newMessages.length < _pageSize) {
+        _hasMore = false;
+      }
+
+      state = AsyncValue.data(
+        _sortMessages([...currentMessages, ...newMessages]),
+      );
+    } catch (err, stackTrace) {
+      developer.log(
+        'Error loading more messages',
+        name: 'MessagesNotifier',
+        error: err,
+        stackTrace: stackTrace,
+      );
+      showErrorAlert(err);
+    }
+  }
+
+  Future<void> sendMessage(
+    String content,
+    List<UniversalFile> attachments, {
+    SnChatMessage? editingTo,
+    SnChatMessage? forwardingTo,
+    SnChatMessage? replyingTo,
+    Function(String, Map<int, double>)? onProgress,
+  }) async {
+    final nonce = const Uuid().v4();
+    developer.log(
+      'Sending message with nonce $nonce',
+      name: 'MessagesNotifier',
+    );
+    final baseUrl = ref.read(serverUrlProvider);
+    final token = await getToken(ref.watch(tokenProvider));
+    if (token == null) throw ArgumentError('Access token is null');
+
+    final mockMessage = SnChatMessage(
+      id: 'pending_$nonce',
+      chatRoomId: _roomId,
+      senderId: _identity.id,
+      content: content,
+      createdAt: DateTime.now(),
+      updatedAt: DateTime.now(),
+      nonce: nonce,
+      sender: _identity,
+    );
+
+    final localMessage = LocalChatMessage.fromRemoteMessage(
+      mockMessage,
+      MessageStatus.pending,
+    );
+
+    _pendingMessages[localMessage.id] = localMessage;
+    _fileUploadProgress[localMessage.id] = {};
+    await _database.saveMessage(_database.messageToCompanion(localMessage));
+
+    final currentMessages = state.value ?? [];
+    state = AsyncValue.data([localMessage, ...currentMessages]);
+
+    try {
+      var cloudAttachments = List.empty(growable: true);
+      for (var idx = 0; idx < attachments.length; idx++) {
+        final cloudFile =
+            await putFileToCloud(
+              fileData: attachments[idx],
+              atk: token,
+              baseUrl: baseUrl,
+              filename: attachments[idx].data.name ?? 'Post media',
+              mimetype:
+                  attachments[idx].data.mimeType ??
+                  switch (attachments[idx].type) {
+                    UniversalFileType.image => 'image/unknown',
+                    UniversalFileType.video => 'video/unknown',
+                    UniversalFileType.audio => 'audio/unknown',
+                    UniversalFileType.file => 'application/octet-stream',
+                  },
+              onProgress: (progress, _) {
+                _fileUploadProgress[localMessage.id]?[idx] = progress;
+                onProgress?.call(
+                  localMessage.id,
+                  _fileUploadProgress[localMessage.id] ?? {},
+                );
+              },
+            ).future;
+        if (cloudFile == null) {
+          throw ArgumentError('Failed to upload the file...');
+        }
+        cloudAttachments.add(cloudFile);
+      }
+
+      final response = await _apiClient.request(
+        editingTo == null
+            ? '/sphere/chat/$_roomId/messages'
+            : '/sphere/chat/$_roomId/messages/${editingTo.id}',
+        data: {
+          'content': content,
+          'attachments_id': cloudAttachments.map((e) => e.id).toList(),
+          'replied_message_id': replyingTo?.id,
+          'forwarded_message_id': forwardingTo?.id,
+          'meta': {},
+          'nonce': nonce,
+        },
+        options: Options(method: editingTo == null ? 'POST' : 'PATCH'),
+      );
+
+      final remoteMessage = SnChatMessage.fromJson(response.data);
+      final updatedMessage = LocalChatMessage.fromRemoteMessage(
+        remoteMessage,
+        MessageStatus.sent,
+      );
+
+      _pendingMessages.remove(localMessage.id);
+      await _database.deleteMessage(localMessage.id);
+      await _database.saveMessage(_database.messageToCompanion(updatedMessage));
+
+      final currentMessages = state.value ?? [];
+      if (editingTo != null) {
+        final newMessages =
+            currentMessages
+                .where((m) => m.id != localMessage.id) // remove pending message
+                .map(
+                  (m) => m.id == editingTo.id ? updatedMessage : m,
+                ) // update original message
+                .toList();
+        state = AsyncValue.data(newMessages);
+      } else {
+        final newMessages =
+            currentMessages.map((m) {
+              if (m.id == localMessage.id) {
+                return updatedMessage;
+              }
+              return m;
+            }).toList();
+        state = AsyncValue.data(newMessages);
+      }
+      developer.log(
+        'Message with nonce $nonce sent successfully',
+        name: 'MessagesNotifier',
+      );
+    } catch (e, stackTrace) {
+      developer.log(
+        'Failed to send message with nonce $nonce',
+        name: 'MessagesNotifier',
+        error: e,
+        stackTrace: stackTrace,
+      );
+      localMessage.status = MessageStatus.failed;
+      _pendingMessages[localMessage.id] = localMessage;
+      await _database.updateMessageStatus(
+        localMessage.id,
+        MessageStatus.failed,
+      );
+      final newMessages =
+          (state.value ?? []).map((m) {
+            if (m.id == localMessage.id) {
+              return m..status = MessageStatus.failed;
+            }
+            return m;
+          }).toList();
+      state = AsyncValue.data(newMessages);
+      showErrorAlert(e);
+    }
+  }
+
+  Future<void> retryMessage(String pendingMessageId) async {
+    developer.log(
+      'Retrying message $pendingMessageId',
+      name: 'MessagesNotifier',
+    );
+    final message = await fetchMessageById(pendingMessageId);
+    if (message == null) {
+      throw Exception('Message not found');
+    }
+
+    message.status = MessageStatus.pending;
+    _pendingMessages[pendingMessageId] = message;
+    await _database.updateMessageStatus(
+      pendingMessageId,
+      MessageStatus.pending,
+    );
+
+    try {
+      var remoteMessage = message.toRemoteMessage();
+      final response = await _apiClient.post(
+        '/sphere/chat/${message.roomId}/messages',
+        data: {
+          'content': remoteMessage.content,
+          'attachments_id': remoteMessage.attachments,
+          'meta': remoteMessage.meta,
+          'nonce': message.nonce,
+        },
+      );
+
+      remoteMessage = SnChatMessage.fromJson(response.data);
+      final updatedMessage = LocalChatMessage.fromRemoteMessage(
+        remoteMessage,
+        MessageStatus.sent,
+      );
+
+      _pendingMessages.remove(pendingMessageId);
+      await _database.deleteMessage(pendingMessageId);
+      await _database.saveMessage(_database.messageToCompanion(updatedMessage));
+
+      final newMessages =
+          (state.value ?? []).map((m) {
+            if (m.id == pendingMessageId) {
+              return updatedMessage;
+            }
+            return m;
+          }).toList();
+      state = AsyncValue.data(newMessages);
+    } catch (e, stackTrace) {
+      developer.log(
+        'Failed to retry message $pendingMessageId',
+        name: 'MessagesNotifier',
+        error: e,
+        stackTrace: stackTrace,
+      );
+      message.status = MessageStatus.failed;
+      _pendingMessages[pendingMessageId] = message;
+      await _database.updateMessageStatus(
+        pendingMessageId,
+        MessageStatus.failed,
+      );
+      final newMessages =
+          (state.value ?? []).map((m) {
+            if (m.id == pendingMessageId) {
+              return m..status = MessageStatus.failed;
+            }
+            return m;
+          }).toList();
+      state = AsyncValue.data(_sortMessages(newMessages));
+      showErrorAlert(e);
+    }
+  }
+
+  Future<void> receiveMessage(SnChatMessage remoteMessage) async {
+    if (remoteMessage.chatRoomId != _roomId) return;
+    developer.log(
+      'Received new message ${remoteMessage.id}',
+      name: 'MessagesNotifier',
+    );
+
+    final localMessage = LocalChatMessage.fromRemoteMessage(
+      remoteMessage,
+      MessageStatus.sent,
+    );
+
+    if (remoteMessage.nonce != null) {
+      _pendingMessages.removeWhere(
+        (_, pendingMsg) => pendingMsg.nonce == remoteMessage.nonce,
+      );
+    }
+
+    await _database.saveMessage(_database.messageToCompanion(localMessage));
+
+    final currentMessages = state.value ?? [];
+    final existingIndex = currentMessages.indexWhere(
+      (m) =>
+          m.id == localMessage.id ||
+          (localMessage.nonce != null && m.nonce == localMessage.nonce),
+    );
+
+    if (existingIndex >= 0) {
+      final newList = [...currentMessages];
+      newList[existingIndex] = localMessage;
+      state = AsyncValue.data(_sortMessages(newList));
+    } else {
+      state = AsyncValue.data(
+        _sortMessages([localMessage, ...currentMessages]),
+      );
+    }
+  }
+
+  Future<void> receiveMessageUpdate(SnChatMessage remoteMessage) async {
+    if (remoteMessage.chatRoomId != _roomId) return;
+    developer.log(
+      'Received message update ${remoteMessage.id}',
+      name: 'MessagesNotifier',
+    );
+
+    final updatedMessage = LocalChatMessage.fromRemoteMessage(
+      remoteMessage,
+      MessageStatus.sent,
+    );
+    await _database.updateMessage(_database.messageToCompanion(updatedMessage));
+
+    final currentMessages = state.value ?? [];
+    final index = currentMessages.indexWhere((m) => m.id == updatedMessage.id);
+
+    if (index >= 0) {
+      final newList = [...currentMessages];
+      newList[index] = updatedMessage;
+      state = AsyncValue.data(_sortMessages(newList));
+    }
+  }
+
+  Future<void> receiveMessageDeletion(String messageId) async {
+    developer.log(
+      'Received message deletion $messageId',
+      name: 'MessagesNotifier',
+    );
+    _pendingMessages.remove(messageId);
+
+    final currentMessages = state.value ?? [];
+    final messageIndex = currentMessages.indexWhere((m) => m.id == messageId);
+
+    LocalChatMessage? messageToUpdate;
+    if (messageIndex != -1) {
+      messageToUpdate = currentMessages[messageIndex];
+    } else {
+      messageToUpdate = await fetchMessageById(messageId);
+    }
+
+    if (messageToUpdate == null) return;
+
+    final remote = messageToUpdate.toRemoteMessage();
+    final updatedRemote = remote.copyWith(
+      content: 'This message was deleted',
+      deletedAt: DateTime.now(),
+      attachments: [],
+    );
+
+    final deletedMessage = LocalChatMessage.fromRemoteMessage(
+      updatedRemote,
+      messageToUpdate.status,
+    );
+
+    await _database.saveMessage(_database.messageToCompanion(deletedMessage));
+
+    if (messageIndex != -1) {
+      final newList = [...currentMessages];
+      newList[messageIndex] = deletedMessage;
+      state = AsyncValue.data(newList);
+    }
+  }
+
+  Future<void> deleteMessage(String messageId) async {
+    developer.log('Deleting message $messageId', name: 'MessagesNotifier');
+    try {
+      await _apiClient.delete('/sphere/chat/$_roomId/messages/$messageId');
+      await receiveMessageDeletion(messageId);
+    } catch (err, stackTrace) {
+      developer.log(
+        'Error deleting message $messageId',
+        name: 'MessagesNotifier',
+        error: err,
+        stackTrace: stackTrace,
+      );
+      showErrorAlert(err);
+    }
+  }
+
+  void searchMessages(String query, {bool? withLinks, bool? withAttachments}) {
+    _searchQuery = query.trim();
+    _withLinks = withLinks;
+    _withAttachments = withAttachments;
+    loadInitial();
+  }
+
+  void clearSearch() {
+    _searchQuery = null;
+    _withLinks = null;
+    _withAttachments = null;
+    loadInitial();
+  }
+
+  Future<LocalChatMessage?> fetchMessageById(String messageId) async {
+    developer.log(
+      'Fetching message by id $messageId',
+      name: 'MessagesNotifier',
+    );
+    try {
+      final localMessage =
+          await (_database.select(_database.chatMessages)
+            ..where((tbl) => tbl.id.equals(messageId))).getSingleOrNull();
+      if (localMessage != null) {
+        return _database.companionToMessage(localMessage);
+      }
+
+      final response = await _apiClient.get(
+        '/sphere/chat/$_roomId/messages/$messageId',
+      );
+      final remoteMessage = SnChatMessage.fromJson(response.data);
+      final message = LocalChatMessage.fromRemoteMessage(
+        remoteMessage,
+        MessageStatus.sent,
+      );
+
+      await _database.saveMessage(_database.messageToCompanion(message));
+      return message;
+    } catch (e) {
+      if (e is DioException) return null;
+      rethrow;
+    }
+  }
+
+  Future<int> jumpToMessage(String messageId) async {
+    developer.log(
+      'Starting jump to message $messageId',
+      name: 'MessagesNotifier',
+    );
+    if (_isJumping) {
+      developer.log(
+        'Jump already in progress, skipping',
+        name: 'MessagesNotifier',
+      );
+      return -1;
+    }
+    _isJumping = true;
+
+    try {
+      developer.log('Fetching message $messageId', name: 'MessagesNotifier');
+      final message = await fetchMessageById(messageId);
+      if (message == null) {
+        developer.log('Message $messageId not found', name: 'MessagesNotifier');
+        showSnackBar('messageNotFound'.tr());
+        return -1;
+      }
+
+      // Check if message is already in current state to avoid duplicate loading
+      final currentMessages = state.value ?? [];
+      final existingIndex = currentMessages.indexWhere(
+        (m) => m.id == messageId,
+      );
+      if (existingIndex >= 0) {
+        developer.log(
+          'Message $messageId already in current state at index $existingIndex, jumping directly',
+          name: 'MessagesNotifier',
+        );
+        return existingIndex;
+      }
+
+      developer.log(
+        'Message $messageId not in current state, loading messages around it',
+        name: 'MessagesNotifier',
+      );
+
+      // Count messages newer than this one
+      final query = _database.customSelect(
+        'SELECT COUNT(*) as count FROM chat_messages WHERE room_id = ? AND created_at > ?',
+        variables: [
+          Variable.withString(_roomId),
+          Variable.withDateTime(message.createdAt),
+        ],
+        readsFrom: {_database.chatMessages},
+      );
+      final result = await query.getSingle();
+      final newerCount = result.read<int>('count');
+
+      // Load messages around this position
+      final offset =
+          (newerCount - _pageSize ~/ 2).clamp(0, double.infinity).toInt();
+      developer.log(
+        'Loading messages with offset $offset, take $_pageSize',
+        name: 'MessagesNotifier',
+      );
+      final loadedMessages = await _getCachedMessages(
+        offset: offset,
+        take: _pageSize,
+      );
+
+      // Check if loaded messages are already in current state
+      final currentIds = currentMessages.map((m) => m.id).toSet();
+      final newMessages =
+          loadedMessages.where((m) => !currentIds.contains(m.id)).toList();
+      developer.log(
+        'Loaded ${loadedMessages.length} messages, ${newMessages.length} are new',
+        name: 'MessagesNotifier',
+      );
+
+      if (newMessages.isNotEmpty) {
+        // Merge with current messages
+        final allMessages = [...currentMessages, ...newMessages];
+        final uniqueMessages = <LocalChatMessage>[];
+        final seenIds = <String>{};
+        for (final message in allMessages) {
+          if (seenIds.add(message.id)) {
+            uniqueMessages.add(message);
+          }
+        }
+        _sortMessages(uniqueMessages);
+        state = AsyncValue.data(uniqueMessages);
+        developer.log(
+          'Updated state with ${uniqueMessages.length} total messages',
+          name: 'MessagesNotifier',
+        );
+      }
+
+      final finalIndex = (state.value ?? []).indexWhere(
+        (m) => m.id == messageId,
+      );
+      developer.log(
+        'Final index for message $messageId is $finalIndex',
+        name: 'MessagesNotifier',
+      );
+      return finalIndex;
+    } finally {
+      _isJumping = false;
+    }
+  }
+
+  bool _hasLink(LocalChatMessage message) {
+    final content = message.toRemoteMessage().content;
+    if (content == null) return false;
+    final urlRegex = RegExp(r'https?://[^\s/$.?#].[^\s]*');
+    return urlRegex.hasMatch(content);
+  }
+}
--- a/lib/pods/messages_notifier.g.dart
+++ b/lib/pods/messages_notifier.g.dart
@@ -1,12 +1,12 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND

-part of 'room.dart';
+part of 'messages_notifier.dart';

 // **************************************************************************
 // RiverpodGenerator
 // **************************************************************************

-String _$messagesNotifierHash() => r'afc4d43f4948ec571118cef0321838a6cefc89c0';
+String _$messagesNotifierHash() => r'37bab723531a5c5248471ef810b74cf57b3dc237';

 /// Copied from Dart SDK
 class _SystemHash {
--- a/lib/pods/translate.dart
+++ b/lib/pods/translate.dart
@@ -1,11 +1,9 @@
 import 'dart:convert';
-import 'dart:developer';

 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/pods/network.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:flutter_langdetect/flutter_langdetect.dart' as langdetect;

 part 'translate.freezed.dart';
 part 'translate.g.dart';
@@ -29,10 +27,17 @@ Future<String> translateString(Ref ref, TranslateQuery query) async {

@riverpod
 String? detectStringLanguage(Ref ref, String text) {
-  try {
-    return langdetect.detectLangs(text).firstOrNull?.lang;
-  } catch (err) {
-    log('[Language] Unable to detect text\'s language: $text');
-    return null;
+  bool isChinese(String text) {
+    final chineseRegex = RegExp(r'[\u4e00-\u9fff]');
+    return chineseRegex.hasMatch(text);
  }
+
+  bool isEnglish(String text) {
+    final englishRegex = RegExp(r'[a-zA-Z]');
+    return englishRegex.hasMatch(text) && !isChinese(text);
+  }
+
+  if (isChinese(text)) return "zh";
+  if (isEnglish(text)) return "en";
+  return null;
 }
--- a/lib/pods/translate.g.dart
+++ b/lib/pods/translate.g.dart
@@ -149,7 +149,7 @@ class _TranslateStringProviderElement
 }

 String _$detectStringLanguageHash() =>
-    r'697b68464b3d00927cc43ccc1ba8ba93f2a470ed';
+    r'24fbf52edbbffcc8dc4f09f7206f82d69728e703';

 /// See also [detectStringLanguage].
@ProviderFor(detectStringLanguage)
--- a/lib/pods/userinfo.dart
+++ b/lib/pods/userinfo.dart
@@ -1,6 +1,12 @@
+import 'dart:convert';
 import 'dart:developer';
+import 'dart:io' show Platform;

+import 'package:dio/dio.dart';
+import 'package:easy_localization/easy_localization.dart';
 import 'package:firebase_analytics/firebase_analytics.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter_platform_alert/flutter_platform_alert.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/account.dart';
@@ -13,13 +19,62 @@ class UserInfoNotifier extends StateNotifier<AsyncValue<SnAccount?>> {
  UserInfoNotifier(this._ref) : super(const AsyncValue.data(null));

  Future<void> fetchUser() async {
+    final token = _ref.watch(tokenProvider);
+    if (token == null) {
+      log('[UserInfo] No token found, not going to fetch...');
+      return;
+    }
    try {
      final client = _ref.read(apiClientProvider);
      final response = await client.get('/id/accounts/me');
      final user = SnAccount.fromJson(response.data);
      state = AsyncValue.data(user);
+
+      if (kIsWeb || !(Platform.isLinux || Platform.isWindows)) {
        FirebaseAnalytics.instance.setUserId(id: user.id);
+      }
    } catch (error, stackTrace) {
+      if (!kIsWeb) {
+        if (error is DioException) {
+          FlutterPlatformAlert.showCustomAlert(
+            windowTitle: 'failedToLoadUserInfo'.tr(),
+            text: [
+              (error.response?.statusCode == 401
+                      ? 'failedToLoadUserInfoUnauthorized'
+                      : 'failedToLoadUserInfoNetwork')
+                  .tr()
+                  .trim(),
+              '',
+              '${error.response?.statusCode ?? 'Network Error'}',
+              if (error.response?.headers != null) error.response?.headers,
+              if (error.response?.data != null)
+                jsonEncode(error.response?.data),
+            ].join('\n'),
+            iconStyle: IconStyle.error,
+            neutralButtonTitle: 'retry'.tr(),
+            negativeButtonTitle: 'okay'.tr(),
+          ).then((value) {
+            if (value == CustomButton.neutralButton) {
+              fetchUser();
+            }
+          });
+        }
+        FlutterPlatformAlert.showCustomAlert(
+          windowTitle: 'failedToLoadUserInfo'.tr(),
+          text:
+              [
+                'failedToLoadUserInfoNetwork'.tr(),
+                error.toString(),
+              ].join('\n\n').trim(),
+          iconStyle: IconStyle.error,
+          neutralButtonTitle: 'retry'.tr(),
+          negativeButtonTitle: 'okay'.tr(),
+        ).then((value) {
+          if (value == CustomButton.neutralButton) {
+            fetchUser();
+          }
+        });
+      }
      log(
        "[UserInfo] Failed to fetch user info...",
        name: 'UserInfoNotifier',
@@ -35,8 +90,10 @@ class UserInfoNotifier extends StateNotifier<AsyncValue<SnAccount?>> {
    final prefs = _ref.read(sharedPreferencesProvider);
    await prefs.remove(kTokenPairStoreKey);
    _ref.invalidate(tokenProvider);
+    if (kIsWeb || !(Platform.isLinux || Platform.isWindows)) {
      FirebaseAnalytics.instance.setUserId(id: null);
    }
+  }
 }

 final userInfoProvider =
--- a/lib/route.dart
+++ b/lib/route.dart
@@ -1,14 +1,25 @@
+import 'dart:io' show Platform;
+import 'package:animations/animations.dart';
 import 'package:firebase_analytics/firebase_analytics.dart';
-
 import 'package:flutter/material.dart';
+import 'package:flutter/foundation.dart' show kIsWeb;
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/screens/about.dart';
-import 'package:island/screens/developers/apps.dart';
+import 'package:island/screens/developers/app_detail.dart';
+import 'package:island/screens/developers/bot_detail.dart';
 import 'package:island/screens/developers/edit_app.dart';
+import 'package:island/screens/developers/edit_bot.dart';
 import 'package:island/screens/developers/new_app.dart';
 import 'package:island/screens/developers/hub.dart';
+import 'package:island/screens/developers/new_bot.dart';
+import 'package:island/screens/developers/projects.dart';
+import 'package:island/screens/developers/edit_project.dart';
+import 'package:island/screens/developers/new_project.dart';
+import 'package:island/screens/developers/project_detail.dart';
 import 'package:island/screens/discovery/articles.dart';
+import 'package:island/screens/files/file_list.dart';
+import 'package:island/screens/posts/post_categories_list.dart';
 import 'package:island/screens/posts/post_category_detail.dart';
 import 'package:island/screens/posts/post_search.dart';
 import 'package:island/widgets/app_wrapper.dart';
@@ -20,19 +31,22 @@ import 'package:island/screens/notification.dart';
 import 'package:island/screens/wallet.dart';
 import 'package:island/screens/account/relationship.dart';
 import 'package:island/screens/account/profile.dart';
-import 'package:island/screens/account/me/update.dart';
+import 'package:island/screens/account/me/profile_update.dart';
 import 'package:island/screens/account/leveling.dart';
-import 'package:island/screens/account/me/settings.dart';
+import 'package:island/screens/account/me/account_settings.dart';
 import 'package:island/screens/chat/chat.dart';
 import 'package:island/screens/chat/room.dart';
 import 'package:island/screens/chat/room_detail.dart';
 import 'package:island/screens/chat/call.dart';
+import 'package:island/screens/chat/search_messages.dart';
 import 'package:island/screens/creators/hub.dart';
 import 'package:island/screens/creators/posts/post_manage_list.dart';
 import 'package:island/screens/creators/stickers/stickers.dart';
 import 'package:island/screens/creators/stickers/pack_detail.dart';
-import 'package:island/screens/stickers/marketplace.dart';
+import 'package:island/screens/stickers/sticker_marketplace.dart';
 import 'package:island/screens/stickers/pack_detail.dart';
+import 'package:island/screens/discovery/feeds/feed_marketplace.dart';
+import 'package:island/screens/discovery/feeds/feed_detail.dart';
 import 'package:island/screens/creators/poll/poll_list.dart';
 import 'package:island/screens/creators/publishers.dart';
 import 'package:island/screens/creators/webfeed/webfeed_list.dart';
@@ -50,18 +64,37 @@ import 'package:island/screens/account/event_calendar.dart';
 import 'package:island/screens/discovery/realms.dart';
 import 'package:island/screens/reports/report_detail.dart';
 import 'package:island/screens/reports/report_list.dart';
+import 'package:island/widgets/post/post_shuffle.dart';

 // Shell route keys for nested navigation
 final rootNavigatorKey = GlobalKey<NavigatorState>();
 final _shellNavigatorKey = GlobalKey<NavigatorState>();
 final _tabsShellKey = GlobalKey<NavigatorState>();

+Widget _tabPagesTransitionBuilder(
+  BuildContext context,
+  Animation<double> animation,
+  Animation<double> secondaryAnimation,
+  Widget child,
+) {
+  return FadeThroughTransition(
+    animation: animation,
+    secondaryAnimation: secondaryAnimation,
+    fillColor: Theme.of(context).colorScheme.surface,
+    child: child,
+  );
+}
+
+bool get _supportsAnalytics =>
+    kIsWeb || Platform.isAndroid || Platform.isIOS || Platform.isMacOS;
+
 // Provider for the router
 final routerProvider = Provider<GoRouter>((ref) {
  return GoRouter(
    navigatorKey: rootNavigatorKey,
    initialLocation: '/',
    observers: [
+      if (_supportsAnalytics)
        FirebaseAnalyticsObserver(analytics: FirebaseAnalytics.instance),
    ],
    routes: [
@@ -262,30 +295,99 @@ final routerProvider = Provider<GoRouter>((ref) {
                builder: (context, state) => const DeveloperHubScreen(),
              ),
              GoRoute(
-                name: 'developerApps',
-                path: '/developers/:name/apps',
+                name: 'developerProjects',
+                path: '/developers/:name/projects',
                builder:
-                    (context, state) => CustomAppsScreen(
+                    (context, state) => DevProjectsScreen(
                      publisherName: state.pathParameters['name']!,
                    ),
              ),
+              GoRoute(
+                name: 'developerProjectNew',
+                path: '/developers/:name/projects/new',
+                builder:
+                    (context, state) => NewProjectScreen(
+                      publisherName: state.pathParameters['name']!,
+                    ),
+              ),
+              GoRoute(
+                name: 'developerProjectEdit',
+                path: '/developers/:name/projects/:id/edit',
+                builder:
+                    (context, state) => EditProjectScreen(
+                      publisherName: state.pathParameters['name']!,
+                      id: state.pathParameters['id']!,
+                    ),
+              ),
+              GoRoute(
+                name: 'developerProjectDetail',
+                path: '/developers/:name/projects/:projectId',
+                builder:
+                    (context, state) => ProjectDetailScreen(
+                      publisherName: state.pathParameters['name']!,
+                      projectId: state.pathParameters['projectId']!,
+                    ),
+                routes: [
                  GoRoute(
                    name: 'developerAppNew',
-                path: '/developers/:name/apps/new',
+                    path: 'apps/new',
                    builder:
                        (context, state) => NewCustomAppScreen(
                          publisherName: state.pathParameters['name']!,
+                          projectId: state.pathParameters['projectId']!,
                        ),
                  ),
                  GoRoute(
                    name: 'developerAppEdit',
-                path: '/developers/:name/apps/:id',
+                    path: 'apps/:id/edit',
                    builder:
                        (context, state) => EditAppScreen(
                          publisherName: state.pathParameters['name']!,
+                          projectId: state.pathParameters['projectId']!,
                          id: state.pathParameters['id']!,
                        ),
                  ),
+                  GoRoute(
+                    name: 'developerAppDetail',
+                    path: 'apps/:appId',
+                    builder:
+                        (context, state) => AppDetailScreen(
+                          publisherName: state.pathParameters['name']!,
+                          projectId: state.pathParameters['projectId']!,
+                          appId: state.pathParameters['appId']!,
+                        ),
+                  ),
+                  GoRoute(
+                    name: 'developerBotDetail',
+                    path: 'bots/:botId',
+                    builder:
+                        (context, state) => BotDetailScreen(
+                          publisherName: state.pathParameters['name']!,
+                          projectId: state.pathParameters['projectId']!,
+                          botId: state.pathParameters['botId']!,
+                        ),
+                  ),
+                  GoRoute(
+                    name: 'developerBotNew',
+                    path: 'bots/new',
+                    builder:
+                        (context, state) => NewBotScreen(
+                          publisherName: state.pathParameters['name']!,
+                          projectId: state.pathParameters['projectId']!,
+                        ),
+                  ),
+                  GoRoute(
+                    name: 'developerBotEdit',
+                    path: 'bots/:id/edit',
+                    builder:
+                        (context, state) => EditBotScreen(
+                          publisherName: state.pathParameters['name']!,
+                          projectId: state.pathParameters['projectId']!,
+                          id: state.pathParameters['id']!,
+                        ),
+                  ),
+                ],
+              ),
            ],
          ),

@@ -339,7 +441,12 @@ final routerProvider = Provider<GoRouter>((ref) {
              GoRoute(
                name: 'explore',
                path: '/',
-                builder: (context, state) => const ExploreScreen(),
+                pageBuilder:
+                    (context, state) => CustomTransitionPage(
+                      key: const ValueKey('explore'),
+                      child: const ExploreScreen(),
+                      transitionsBuilder: _tabPagesTransitionBuilder,
+                    ),
              ),
              GoRoute(
                name: 'postSearch',
@@ -347,12 +454,14 @@ final routerProvider = Provider<GoRouter>((ref) {
                builder: (context, state) => const PostSearchScreen(),
              ),
              GoRoute(
-                name: 'postDetail',
-                path: '/posts/:id',
-                builder: (context, state) {
-                  final id = state.pathParameters['id']!;
-                  return PostDetailScreen(id: id);
-                },
+                name: 'postShuffle',
+                path: '/posts/shuffle',
+                builder: (context, state) => const PostShuffleScreen(),
+              ),
+              GoRoute(
+                name: 'postCategories',
+                path: '/posts/categories',
+                builder: (context, state) => const PostCategoriesListScreen(),
              ),
              GoRoute(
                name: 'postCategoryDetail',
@@ -362,6 +471,11 @@ final routerProvider = Provider<GoRouter>((ref) {
                  return PostCategoryDetailScreen(slug: slug, isCategory: true);
                },
              ),
+              GoRoute(
+                name: 'postTags',
+                path: '/posts/tags',
+                builder: (context, state) => const PostTagsListScreen(),
+              ),
              GoRoute(
                name: 'postTagDetail',
                path: '/posts/tags/:slug',
@@ -373,6 +487,14 @@ final routerProvider = Provider<GoRouter>((ref) {
                  );
                },
              ),
+              GoRoute(
+                name: 'postDetail',
+                path: '/posts/:id',
+                builder: (context, state) {
+                  final id = state.pathParameters['id']!;
+                  return PostDetailScreen(id: id);
+                },
+              ),
              GoRoute(
                name: 'publisherProfile',
                path: '/publishers/:name',
@@ -389,8 +511,12 @@ final routerProvider = Provider<GoRouter>((ref) {

              // Chat tab
              ShellRoute(
-                builder:
-                    (context, state, child) => ChatShellScreen(child: child),
+                pageBuilder:
+                    (context, state, child) => CustomTransitionPage(
+                      key: const ValueKey('chat'),
+                      child: ChatShellScreen(child: child),
+                      transitionsBuilder: _tabPagesTransitionBuilder,
+                    ),
                routes: [
                  GoRoute(
                    name: 'chatList',
@@ -426,6 +552,14 @@ final routerProvider = Provider<GoRouter>((ref) {
                      return ChatDetailScreen(id: id);
                    },
                  ),
+                  GoRoute(
+                    name: 'searchMessages',
+                    path: '/chat/:id/search',
+                    builder: (context, state) {
+                      final id = state.pathParameters['id']!;
+                      return SearchMessagesScreen(roomId: id);
+                    },
+                  ),
                ],
              ),

@@ -433,7 +567,12 @@ final routerProvider = Provider<GoRouter>((ref) {
              GoRoute(
                name: 'realmList',
                path: '/realms',
-                builder: (context, state) => const RealmListScreen(),
+                pageBuilder:
+                    (context, state) => CustomTransitionPage(
+                      key: const ValueKey('realms'),
+                      child: const RealmListScreen(),
+                      transitionsBuilder: _tabPagesTransitionBuilder,
+                    ),
                routes: [
                  GoRoute(
                    name: 'realmNew',
@@ -461,8 +600,12 @@ final routerProvider = Provider<GoRouter>((ref) {

              // Account tab
              ShellRoute(
-                builder:
-                    (context, state, child) => AccountShellScreen(child: child),
+                pageBuilder:
+                    (context, state, child) => CustomTransitionPage(
+                      key: const ValueKey('account'),
+                      child: AccountShellScreen(child: child),
+                      transitionsBuilder: _tabPagesTransitionBuilder,
+                    ),
                routes: [
                  GoRoute(
                    name: 'account',
@@ -486,6 +629,22 @@ final routerProvider = Provider<GoRouter>((ref) {
                      ),
                    ],
                  ),
+                  GoRoute(
+                    name: 'webFeedMarketplace',
+                    path: '/feeds',
+                    builder:
+                        (context, state) => const MarketplaceWebFeedsScreen(),
+                    routes: [
+                      GoRoute(
+                        name: 'webFeedDetail',
+                        path: ':feedId',
+                        builder: (context, state) {
+                          final feedId = state.pathParameters['feedId']!;
+                          return MarketplaceWebFeedDetailScreen(id: feedId);
+                        },
+                      ),
+                    ],
+                  ),
                  GoRoute(
                    name: 'notifications',
                    path: '/account/notifications',
@@ -496,6 +655,11 @@ final routerProvider = Provider<GoRouter>((ref) {
                    path: '/account/wallet',
                    builder: (context, state) => const WalletScreen(),
                  ),
+                  GoRoute(
+                    name: 'files',
+                    path: '/account/files',
+                    builder: (context, state) => const FileListScreen(),
+                  ),
                  GoRoute(
                    name: 'relationships',
                    path: '/account/relationships',
--- a/lib/screens/about.dart
+++ b/lib/screens/about.dart
@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:island/services/udid.native.dart';
+import 'package:island/services/udid.dart' as udid;
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
 import 'package:material_symbols_icons/symbols.dart';
@@ -68,7 +68,7 @@ class _AboutScreenState extends ConsumerState<AboutScreen> {
    try {
      final deviceInfoPlugin = DeviceInfoPlugin();
      _deviceInfo = await deviceInfoPlugin.deviceInfo;
-      _deviceUdid = await getUdid();
+      _deviceUdid = await udid.getUdid();
      if (mounted) {
        setState(() {});
      }
@@ -174,11 +174,20 @@ class _AboutScreenState extends ConsumerState<AboutScreen> {
                            context,
                            title: 'Device Information',
                            children: [
-                              _buildInfoItem(
+                              FutureBuilder<String>(
+                                future: udid.getDeviceName(),
+                                builder: (context, snapshot) {
+                                  final value =
+                                      snapshot.hasData
+                                          ? snapshot.data!
+                                          : 'unknown'.tr();
+                                  return _buildInfoItem(
                                    context,
                                    icon: Symbols.label,
                                    label: 'aboutDeviceName'.tr(),
-                                value: _deviceInfo?.data['name'],
+                                    value: value,
+                                  );
+                                },
                              ),
                              _buildInfoItem(
                                context,
--- a/lib/screens/account.dart
+++ b/lib/screens/account.dart
@@ -68,6 +68,7 @@ class AccountScreen extends HookConsumerWidget {
      body: SingleChildScrollView(
        padding: getTabbedPadding(context),
        child: Column(
+          spacing: 4,
          children: <Widget>[
            Card(
              child: Column(
@@ -112,20 +113,22 @@ class AccountScreen extends HookConsumerWidget {
                              crossAxisAlignment: CrossAxisAlignment.baseline,
                              textBaseline: TextBaseline.alphabetic,
                              children: [
-                                AccountName(
+                                Flexible(
+                                  child: AccountName(
                                    account: user.value!,
                                    style: TextStyle(
                                      fontSize: 16,
                                      fontWeight: FontWeight.bold,
                                    ),
                                  ),
-                                Text('@${user.value!.name}'),
+                                ),
+                                Flexible(child: Text('@${user.value!.name}')),
                              ],
                            ),
                            Text(
                              (user.value!.profile.bio.isNotEmpty)
                                  ? user.value!.profile.bio
-                                  : 'No description yet.',
+                                  : 'descriptionNone'.tr(),
                              maxLines: 1,
                              overflow: TextOverflow.ellipsis,
                            ),
@@ -138,28 +141,38 @@ class AccountScreen extends HookConsumerWidget {
                ],
              ),
            ).padding(horizontal: 8),
-            GestureDetector(
-              child: LevelingProgressCard(
+            LevelingProgressCard(
+              isCompact: true,
              level: user.value!.profile.level,
              experience: user.value!.profile.experience,
              progress: user.value!.profile.levelingProgress,
-              ),
              onTap: () {
                context.pushNamed('leveling');
              },
            ).padding(horizontal: 12),
+            const SizedBox.shrink(),
            Row(
+              spacing: 8,
              children: [
                Expanded(
                  child: Card(
+                    margin: EdgeInsets.zero,
                    child: InkWell(
                      borderRadius: BorderRadius.circular(8),
                      child: Column(
                        crossAxisAlignment: CrossAxisAlignment.start,
                        children: [
                          Icon(Symbols.draw, size: 28).padding(bottom: 8),
-                          Text('creatorHub').tr().fontSize(16).bold(),
-                          Text('creatorHubDescription').tr(),
+                          Text(
+                            'creatorHub',
+                            maxLines: 1,
+                            overflow: TextOverflow.ellipsis,
+                          ).tr().fontSize(16).bold(),
+                          Text(
+                            'creatorHubDescription',
+                            maxLines: 2,
+                            overflow: TextOverflow.ellipsis,
+                          ).tr(),
                        ],
                      ).padding(horizontal: 16, vertical: 12),
                      onTap: () {
@@ -170,14 +183,23 @@ class AccountScreen extends HookConsumerWidget {
                ),
                Expanded(
                  child: Card(
+                    margin: EdgeInsets.zero,
                    child: InkWell(
                      borderRadius: BorderRadius.circular(8),
                      child: Column(
                        crossAxisAlignment: CrossAxisAlignment.start,
                        children: [
                          Icon(Symbols.code, size: 28).padding(bottom: 8),
-                          Text('developerPortal').tr().fontSize(16).bold(),
-                          Text('developerPortalDescription').tr(),
+                          Text(
+                            'developerPortal',
+                            maxLines: 1,
+                            overflow: TextOverflow.ellipsis,
+                          ).tr().fontSize(16).bold(),
+                          Text(
+                            'developerPortalDescription',
+                            maxLines: 2,
+                            overflow: TextOverflow.ellipsis,
+                          ).tr(),
                        ],
                      ).padding(horizontal: 16, vertical: 12),
                      onTap: () {
@@ -187,7 +209,73 @@ class AccountScreen extends HookConsumerWidget {
                  ).height(140),
                ),
              ],
-            ).padding(horizontal: 8),
+            ).padding(horizontal: 12),
+            const SizedBox.shrink(),
+            Row(
+              spacing: 8,
+              children: [
+                Expanded(
+                  child: Card(
+                    margin: EdgeInsets.zero,
+                    child: InkWell(
+                      borderRadius: BorderRadius.circular(8),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Icon(Symbols.settings, size: 28).padding(bottom: 8),
+                          Text('appSettings').tr().fontSize(16).bold(),
+                        ],
+                      ).padding(horizontal: 16, vertical: 12),
+                      onTap: () {
+                        context.pushNamed('settings');
+                      },
+                    ),
+                  ).height(120),
+                ),
+                Expanded(
+                  child: Card(
+                    margin: EdgeInsets.zero,
+                    child: InkWell(
+                      borderRadius: BorderRadius.circular(8),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Icon(
+                            Symbols.person_edit,
+                            size: 28,
+                          ).padding(bottom: 8),
+                          Text('updateYourProfile').tr().fontSize(16).bold(),
+                        ],
+                      ).padding(horizontal: 16, vertical: 12),
+                      onTap: () {
+                        context.pushNamed('profileUpdate');
+                      },
+                    ),
+                  ).height(120),
+                ),
+                Expanded(
+                  child: Card(
+                    margin: EdgeInsets.zero,
+                    child: InkWell(
+                      borderRadius: BorderRadius.circular(8),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Icon(
+                            Symbols.manage_accounts,
+                            size: 28,
+                          ).padding(bottom: 8),
+                          Text('accountSettings').tr().fontSize(16).bold(),
+                        ],
+                      ).padding(horizontal: 16, vertical: 12),
+                      onTap: () {
+                        context.pushNamed('accountSettings');
+                      },
+                    ),
+                  ).height(120),
+                ),
+              ],
+            ).padding(horizontal: 12),
            ListTile(
              minTileHeight: 48,
              leading: const Icon(Symbols.notifications),
@@ -216,6 +304,16 @@ class AccountScreen extends HookConsumerWidget {
                context.pushNamed('wallet');
              },
            ),
+            ListTile(
+              minTileHeight: 48,
+              leading: const Icon(Symbols.files),
+              trailing: const Icon(Symbols.chevron_right),
+              contentPadding: EdgeInsets.symmetric(horizontal: 24),
+              title: Text('files').tr(),
+              onTap: () {
+                context.pushNamed('files');
+              },
+            ),
            ListTile(
              minTileHeight: 48,
              leading: const Icon(Symbols.people),
@@ -236,6 +334,16 @@ class AccountScreen extends HookConsumerWidget {
                context.pushNamed('stickerMarketplace');
              },
            ),
+            ListTile(
+              minTileHeight: 48,
+              leading: const Icon(Symbols.rss_feed),
+              trailing: const Icon(Symbols.chevron_right),
+              contentPadding: EdgeInsets.symmetric(horizontal: 24),
+              title: Text('webFeeds').tr(),
+              onTap: () {
+                context.pushNamed('webFeedMarketplace');
+              },
+            ),
            ListTile(
              minTileHeight: 48,
              title: Text('abuseReport').tr(),
@@ -245,37 +353,6 @@ class AccountScreen extends HookConsumerWidget {
              onTap: () => context.pushNamed('reportList'),
            ),
            const Divider(height: 1).padding(vertical: 8),
-            ListTile(
-              minTileHeight: 48,
-              leading: const Icon(Symbols.settings),
-              trailing: const Icon(Symbols.chevron_right),
-              contentPadding: EdgeInsets.symmetric(horizontal: 24),
-              title: Text('appSettings').tr(),
-              onTap: () {
-                context.pushNamed('settings');
-              },
-            ),
-            ListTile(
-              minTileHeight: 48,
-              leading: const Icon(Symbols.person_edit),
-              trailing: const Icon(Symbols.chevron_right),
-              contentPadding: EdgeInsets.symmetric(horizontal: 24),
-              title: Text('updateYourProfile').tr(),
-              onTap: () {
-                context.pushNamed('profileUpdate');
-              },
-            ),
-            ListTile(
-              minTileHeight: 48,
-              leading: const Icon(Symbols.manage_accounts),
-              trailing: const Icon(Symbols.chevron_right),
-              contentPadding: EdgeInsets.symmetric(horizontal: 24),
-              title: Text('accountSettings').tr(),
-              onTap: () {
-                context.pushNamed('accountSettings');
-              },
-            ),
-            const Divider(height: 1).padding(vertical: 8),
            ListTile(
              minTileHeight: 48,
              leading: const Icon(Symbols.info),
@@ -294,6 +371,8 @@ class AccountScreen extends HookConsumerWidget {
              title: Text('debugOptions').tr(),
              onTap: () {
                showModalBottomSheet(
+                  useRootNavigator: true,
+                  isScrollControlled: true,
                  context: context,
                  builder: (context) => DebugSheet(),
                );
@@ -389,6 +468,15 @@ class _UnauthorizedAccountScreen extends StatelessWidget {
                      },
                      child: Text('about').tr(),
                    ),
+                    TextButton(
+                      child: Text('debugOptions').tr(),
+                      onPressed: () {
+                        showModalBottomSheet(
+                          context: context,
+                          builder: (context) => DebugSheet(),
+                        );
+                      },
+                    ),
                    TextButton(
                      onPressed: () {
                        context.pushNamed('settings');
--- a/lib/screens/account/credits.dart
+++ b/lib/screens/account/credits.dart
@@ -0,0 +1,150 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:gap/gap.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/account.dart';
+import 'package:island/pods/network.dart';
+import 'package:material_symbols_icons/material_symbols_icons.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';
+import 'package:styled_widget/styled_widget.dart';
+
+part 'credits.g.dart';
+
+@riverpod
+Future<double> socialCredits(Ref ref) async {
+  final client = ref.watch(apiClientProvider);
+  final response = await client.get('/id/accounts/me/credits');
+  if (response.statusCode != 200) {
+    throw Exception('Failed to load social credits');
+  }
+  return response.data?.toDouble() ?? 0.0;
+}
+
+@riverpod
+class SocialCreditHistoryNotifier extends _$SocialCreditHistoryNotifier
+    with CursorPagingNotifierMixin<SnSocialCreditRecord> {
+  static const int _pageSize = 20;
+
+  @override
+  Future<CursorPagingData<SnSocialCreditRecord>> build() => fetch(cursor: null);
+
+  @override
+  Future<CursorPagingData<SnSocialCreditRecord>> 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(
+      '/id/accounts/me/credits/history',
+      queryParameters: queryParams,
+    );
+    final total = int.parse(response.headers.value('X-Total') ?? '0');
+    final List<dynamic> data = response.data;
+    final records =
+        data.map((json) => SnSocialCreditRecord.fromJson(json)).toList();
+
+    final hasMore = offset + records.length < total;
+    final nextCursor = hasMore ? (offset + records.length).toString() : null;
+
+    return CursorPagingData(
+      items: records,
+      hasMore: hasMore,
+      nextCursor: nextCursor,
+    );
+  }
+}
+
+class SocialCreditsTab extends HookConsumerWidget {
+  const SocialCreditsTab({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final socialCredits = ref.watch(socialCreditsProvider);
+    return Column(
+      children: [
+        const Gap(8),
+        Card(
+          margin: const EdgeInsets.only(left: 16, right: 16, top: 8),
+          child: socialCredits
+              .when(
+                data:
+                    (credits) => Stack(
+                      children: [
+                        Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Text(
+                              credits < 100
+                                  ? 'socialCreditsLevelPoor'.tr()
+                                  : credits < 150
+                                  ? 'socialCreditsLevelNormal'.tr()
+                                  : credits < 200
+                                  ? 'socialCreditsLevelGood'.tr()
+                                  : 'socialCreditsLevelExcellent'.tr(),
+                            ).tr().bold().fontSize(20),
+                            Text(
+                              '${credits.toStringAsFixed(2)} pts',
+                            ).fontSize(14),
+                            const Gap(8),
+                            LinearProgressIndicator(value: credits / 200),
+                          ],
+                        ),
+                        Positioned(
+                          right: 0,
+                          top: 0,
+                          child: IconButton(
+                            onPressed: () {},
+                            icon: const Icon(Symbols.info),
+                            tooltip: 'socialCreditsDescription'.tr(),
+                          ),
+                        ),
+                      ],
+                    ),
+                error: (_, _) => Text('Error loading credits'),
+                loading: () => const LinearProgressIndicator(),
+              )
+              .padding(horizontal: 20, vertical: 16),
+        ),
+        Expanded(
+          child: PagingHelperView(
+            provider: socialCreditHistoryNotifierProvider,
+            futureRefreshable: socialCreditHistoryNotifierProvider.future,
+            notifierRefreshable: socialCreditHistoryNotifierProvider.notifier,
+            contentBuilder:
+                (data, widgetCount, endItemView) => ListView.builder(
+                  padding: EdgeInsets.zero,
+                  itemCount: widgetCount,
+                  itemBuilder: (context, index) {
+                    if (index == widgetCount - 1) {
+                      return endItemView;
+                    }
+                    final record = data.items[index];
+                    return ListTile(
+                      contentPadding: const EdgeInsets.symmetric(
+                        horizontal: 24,
+                      ),
+                      title: Text(record.reason),
+                      subtitle: Text(
+                        DateFormat.yMMMd().format(record.createdAt),
+                      ),
+                      trailing: Text(
+                        record.delta > 0
+                            ? '+${record.delta}'
+                            : '${record.delta}',
+                        style: TextStyle(
+                          color: record.delta > 0 ? Colors.green : Colors.red,
+                        ),
+                      ),
+                    );
+                  },
+                ),
+          ),
+        ),
+      ],
+    );
+  }
+}
--- a/lib/screens/account/credits.g.dart
+++ b/lib/screens/account/credits.g.dart
@@ -0,0 +1,49 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'credits.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$socialCreditsHash() => r'2599844e892127ee4d315caced5c10e4dbaea142';
+
+/// See also [socialCredits].
+@ProviderFor(socialCredits)
+final socialCreditsProvider = AutoDisposeFutureProvider<double>.internal(
+  socialCredits,
+  name: r'socialCreditsProvider',
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product')
+          ? null
+          : _$socialCreditsHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+typedef SocialCreditsRef = AutoDisposeFutureProviderRef<double>;
+String _$socialCreditHistoryNotifierHash() =>
+    r'950db020754160f835c64cedf3fa2175e61e4d64';
+
+/// See also [SocialCreditHistoryNotifier].
+@ProviderFor(SocialCreditHistoryNotifier)
+final socialCreditHistoryNotifierProvider = AutoDisposeAsyncNotifierProvider<
+  SocialCreditHistoryNotifier,
+  CursorPagingData<SnSocialCreditRecord>
+>.internal(
+  SocialCreditHistoryNotifier.new,
+  name: r'socialCreditHistoryNotifierProvider',
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product')
+          ? null
+          : _$socialCreditHistoryNotifierHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef _$SocialCreditHistoryNotifier =
+    AutoDisposeAsyncNotifier<CursorPagingData<SnSocialCreditRecord>>;
+// 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
--- a/lib/screens/account/leveling.dart
+++ b/lib/screens/account/leveling.dart
@@ -4,11 +4,12 @@ import 'package:dio/dio.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/account.dart';
 import 'package:island/models/wallet.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/pods/userinfo.dart';
+import 'package:island/screens/account/credits.dart';
 import 'package:island/services/responsive.dart';
 import 'package:island/services/time.dart';
 import 'package:island/widgets/account/leveling_progress.dart';
@@ -19,6 +20,7 @@ import 'package:island/widgets/payment/payment_overlay.dart';
 import 'package:easy_localization/easy_localization.dart';
 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:styled_widget/styled_widget.dart';

 part 'leveling.g.dart';
@@ -35,13 +37,49 @@ Future<SnWalletSubscription?> accountStellarSubscription(Ref ref) async {
  }
 }

+@riverpod
+class LevelingHistoryNotifier extends _$LevelingHistoryNotifier
+    with CursorPagingNotifierMixin<SnExperienceRecord> {
+  static const int _pageSize = 20;
+
+  @override
+  Future<CursorPagingData<SnExperienceRecord>> build() => fetch(cursor: null);
+
+  @override
+  Future<CursorPagingData<SnExperienceRecord>> 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(
+      '/id/accounts/me/leveling',
+      queryParameters: queryParams,
+    );
+    final total = int.parse(response.headers.value('X-Total') ?? '0');
+    final List<dynamic> data = response.data;
+    final records =
+        data.map((json) => SnExperienceRecord.fromJson(json)).toList();
+
+    final hasMore = offset + records.length < total;
+    final nextCursor = hasMore ? (offset + records.length).toString() : null;
+
+    return CursorPagingData(
+      items: records,
+      hasMore: hasMore,
+      nextCursor: nextCursor,
+    );
+  }
+}
+
 class LevelingScreen extends HookConsumerWidget {
  const LevelingScreen({super.key});

  @override
  Widget build(BuildContext context, WidgetRef ref) {
    final user = ref.watch(userInfoProvider);
-    final stellarSubscription = ref.watch(accountStellarSubscriptionProvider);

    if (user.value == null) {
      return AppScaffold(
@@ -50,13 +88,189 @@ class LevelingScreen extends HookConsumerWidget {
      );
    }

-    final currentLevel = user.value!.profile.level;
-    final currentExp = user.value!.profile.experience;
-    final progress = user.value!.profile.levelingProgress;
+    return DefaultTabController(
+      length: 3,
+      child: AppScaffold(
+        appBar: AppBar(
+          title: Text('levelingProgress'.tr()),
+          bottom: TabBar(
+            tabs: [
+              Tab(
+                child: Text(
+                  'leveling'.tr(),
+                  textAlign: TextAlign.center,
+                  style: TextStyle(
+                    color: Theme.of(context).appBarTheme.foregroundColor!,
+                  ),
+                ),
+              ),
+              Tab(
+                child: Text(
+                  'socialCredits'.tr(),
+                  textAlign: TextAlign.center,
+                  style: TextStyle(
+                    color: Theme.of(context).appBarTheme.foregroundColor!,
+                  ),
+                ),
+              ),
+              Tab(
+                child: Text(
+                  'stellarProgram'.tr(),
+                  textAlign: TextAlign.center,
+                  style: TextStyle(
+                    color: Theme.of(context).appBarTheme.foregroundColor!,
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+        body: TabBarView(
+          children: [
+            _buildLevelingTab(context, ref, user.value!),
+            const SocialCreditsTab(),
+            _buildStellarProgramTab(context, ref),
+          ],
+        ),
+      ),
+    );
+  }

-    return AppScaffold(
-      appBar: AppBar(title: Text('levelingProgress'.tr())),
-      body: SingleChildScrollView(
+  Widget _buildLevelingTab(
+    BuildContext context,
+    WidgetRef ref,
+    SnAccount user,
+  ) {
+    final currentLevel = user.profile.level;
+    final currentExp = user.profile.experience;
+    final progress = user.profile.levelingProgress;
+
+    return Center(
+      child: Container(
+        padding: const EdgeInsets.symmetric(horizontal: 20),
+        constraints: const BoxConstraints(maxWidth: 480),
+        child: CustomScrollView(
+          slivers: [
+            const SliverGap(20),
+
+            // Current Progress Card
+            SliverToBoxAdapter(
+              child: LevelingProgressCard(
+                level: currentLevel,
+                experience: currentExp,
+                progress: progress,
+              ),
+            ),
+            const SliverGap(24),
+
+            // Level Stairs Graph
+            SliverToBoxAdapter(
+              child: Text(
+                'levelProgress'.tr(),
+                style: Theme.of(context).textTheme.headlineSmall?.copyWith(
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+            ),
+            const SliverGap(16),
+
+            SliverToBoxAdapter(
+              child: Card(
+                margin: EdgeInsets.zero,
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  children: [
+                    LinearProgressIndicator(
+                      value: currentLevel / 120,
+                      minHeight: 10,
+                      stopIndicatorRadius: 0,
+                      trackGap: 0,
+                      color: Theme.of(context).colorScheme.primary,
+                      backgroundColor:
+                          Theme.of(context).colorScheme.surfaceContainerHigh,
+                      borderRadius: BorderRadius.circular(32),
+                    ),
+                    const Gap(8),
+                    Text(
+                      '${'levelingProgressLevel'.tr(args: [currentLevel.toString()])} / 120',
+                      textAlign: TextAlign.right,
+                      style: Theme.of(context).textTheme.bodySmall,
+                    ),
+                  ],
+                ).padding(horizontal: 16, top: 16, bottom: 12),
+              ),
+            ),
+            const SliverGap(16),
+            // Leveling History
+            SliverToBoxAdapter(
+              child: Text(
+                'levelingHistory'.tr(),
+                style: Theme.of(context).textTheme.headlineSmall?.copyWith(
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+            ),
+            const SliverGap(8),
+            PagingHelperSliverView(
+              provider: levelingHistoryNotifierProvider,
+              futureRefreshable: levelingHistoryNotifierProvider.future,
+              notifierRefreshable: levelingHistoryNotifierProvider.notifier,
+              contentBuilder:
+                  (data, widgetCount, endItemView) => SliverList.builder(
+                    itemCount: widgetCount,
+                    itemBuilder: (context, index) {
+                      if (index == widgetCount - 1) {
+                        return endItemView;
+                      }
+                      final record = data.items[index];
+                      return ListTile(
+                        title: Column(
+                          mainAxisSize: MainAxisSize.min,
+                          crossAxisAlignment: CrossAxisAlignment.stretch,
+                          children: [
+                            Text(record.reason),
+                            Row(
+                              spacing: 4,
+                              children: [
+                                Text(
+                                  record.createdAt.formatRelative(context),
+                                ).fontSize(13),
+                                Text('·').fontSize(13).bold(),
+                                Text(
+                                  record.createdAt.formatSystem(),
+                                ).fontSize(13),
+                              ],
+                            ).opacity(0.8),
+                          ],
+                        ),
+                        subtitle: Row(
+                          spacing: 8,
+                          children: [
+                            Text(
+                              '${record.delta > 0 ? '+' : ''}${record.delta} EXP',
+                            ),
+                            if (record.bonusMultiplier != 1.0)
+                              Text('x${record.bonusMultiplier}'),
+                          ],
+                        ),
+                        minTileHeight: 56,
+                        contentPadding: EdgeInsets.symmetric(horizontal: 4),
+                      );
+                    },
+                  ),
+            ),
+
+            SliverGap(getTabbedPadding(context, vertical: 20).vertical),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildStellarProgramTab(BuildContext context, WidgetRef ref) {
+    final stellarSubscription = ref.watch(accountStellarSubscriptionProvider);
+
+    return SingleChildScrollView(
      padding: getTabbedPadding(context, horizontal: 20, vertical: 20),
      child: Center(
        child: ConstrainedBox(
@@ -64,156 +278,12 @@ class LevelingScreen extends HookConsumerWidget {
          child: Column(
            crossAxisAlignment: CrossAxisAlignment.stretch,
            children: [
-                // Current Progress Card
-                LevelingProgressCard(
-                  level: currentLevel,
-                  experience: currentExp,
-                  progress: progress,
-                ),
-                const Gap(24),
-
-                // Level Stairs Graph
-                Text(
-                  'levelProgress'.tr(),
-                  style: Theme.of(context).textTheme.headlineSmall?.copyWith(
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const Gap(16),
-
-                // Stairs visualization with fixed height and horizontal scroll
-                _buildLevelStairs(context, currentLevel),
-
-                const Gap(24),
-
-                // Membership section
              _buildMembershipSection(context, ref, stellarSubscription),
              const Gap(16),
            ],
          ),
        ),
      ),
-      ),
-    );
-  }
-
-  Widget _buildLevelStairs(BuildContext context, int currentLevel) {
-    const totalLevels = 14;
-    const stairHeight = 20.0;
-    const stairWidth = 50.0;
-    const containerHeight = 280.0;
-
-    return Container(
-      height: containerHeight,
-      decoration: BoxDecoration(
-        borderRadius: BorderRadius.circular(12),
-        border: Border.all(
-          color: Theme.of(context).colorScheme.outline.withOpacity(0.2),
-        ),
-      ),
-      child: SingleChildScrollView(
-        scrollDirection: Axis.horizontal,
-        padding: const EdgeInsets.symmetric(horizontal: 16),
-        child: SizedBox(
-          width: (totalLevels * (stairWidth + 8)) + 40,
-          height: containerHeight,
-          child: CustomPaint(
-            painter: LevelStairsPainter(
-              currentLevel: currentLevel,
-              totalLevels: totalLevels,
-              primaryColor: Theme.of(context).colorScheme.primary,
-              surfaceColor: Theme.of(context).colorScheme.surfaceContainerHigh,
-              onSurfaceColor: Theme.of(context).colorScheme.onSurface,
-              stairHeight: stairHeight,
-              stairWidth: stairWidth,
-            ),
-            child: Stack(
-              children: List.generate(totalLevels, (index) {
-                final level = index + 1;
-                final isCompleted = level <= currentLevel;
-                final isCurrent = level == currentLevel;
-
-                // Calculate position from bottom
-                final bottomPosition = 0.0;
-                final leftPosition = 20.0 + (index * (stairWidth + 8));
-
-                // Make higher levels progressively taller
-                final progressiveHeight =
-                    40.0 + (index * 15.0); // Base height + progressive increase
-
-                return Positioned(
-                  left: leftPosition,
-                  bottom: bottomPosition,
-                  child: Container(
-                    width: stairWidth,
-                    height: progressiveHeight,
-                    decoration: BoxDecoration(
-                      color:
-                          isCompleted
-                              ? Theme.of(context).colorScheme.primary
-                              : Theme.of(
-                                context,
-                              ).colorScheme.surfaceContainerHigh,
-                      borderRadius: const BorderRadius.only(
-                        topLeft: Radius.circular(6),
-                        topRight: Radius.circular(6),
-                      ),
-                      border:
-                          isCurrent
-                              ? Border.all(
-                                color: Theme.of(context).colorScheme.primary,
-                                width: 2,
-                              )
-                              : null,
-                      boxShadow:
-                          isCurrent
-                              ? [
-                                BoxShadow(
-                                  color: Theme.of(
-                                    context,
-                                  ).colorScheme.primary.withOpacity(0.3),
-                                  blurRadius: 6,
-                                  spreadRadius: 1,
-                                ),
-                              ]
-                              : null,
-                    ),
-                    child: Padding(
-                      padding: const EdgeInsets.only(top: 8),
-                      child: Column(
-                        children: [
-                          Text(
-                            level.toString(),
-                            style: GoogleFonts.robotoMono(
-                              fontSize: 14,
-                              fontWeight: FontWeight.bold,
-                              color:
-                                  isCompleted
-                                      ? Theme.of(context).colorScheme.onPrimary
-                                      : Theme.of(context).colorScheme.onSurface,
-                            ),
-                          ),
-                          if (isCurrent) ...[
-                            const Gap(4),
-                            Container(
-                              width: 4,
-                              height: 4,
-                              decoration: BoxDecoration(
-                                color: Theme.of(context).colorScheme.onPrimary,
-                                shape: BoxShape.circle,
-                              ),
-                            ),
-                          ],
-                        ],
-                      ),
-                    ),
-                  ),
-                );
-              }),
-            ),
-          ),
-        ),
-      ),
    );
  }

@@ -632,11 +702,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) {
--- a/lib/screens/account/leveling.g.dart
+++ b/lib/screens/account/leveling.g.dart
@@ -27,5 +27,26 @@ final accountStellarSubscriptionProvider =
 // ignore: unused_element
 typedef AccountStellarSubscriptionRef =
    AutoDisposeFutureProviderRef<SnWalletSubscription?>;
+String _$levelingHistoryNotifierHash() =>
+    r'e795f9b7911c9e50f15c095ea237cb0e87bf1e89';
+
+/// See also [LevelingHistoryNotifier].
+@ProviderFor(LevelingHistoryNotifier)
+final levelingHistoryNotifierProvider = AutoDisposeAsyncNotifierProvider<
+  LevelingHistoryNotifier,
+  CursorPagingData<SnExperienceRecord>
+>.internal(
+  LevelingHistoryNotifier.new,
+  name: r'levelingHistoryNotifierProvider',
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product')
+          ? null
+          : _$levelingHistoryNotifierHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef _$LevelingHistoryNotifier =
+    AutoDisposeAsyncNotifier<CursorPagingData<SnExperienceRecord>>;
 // 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
--- a/lib/screens/account/me/account_settings.dart
+++ b/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';
@@ -14,7 +15,6 @@ import 'package:island/screens/account/me/settings_connections.dart';
 import 'package:island/screens/account/me/settings_contacts.dart';
 import 'package:island/screens/auth/captcha.dart';
 import 'package:island/screens/auth/login.dart';
-import 'package:island/services/responsive.dart';
 import 'package:island/widgets/account/account_devices.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
@@ -23,7 +23,7 @@ import 'package:material_symbols_icons/symbols.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:styled_widget/styled_widget.dart';

-part 'settings.g.dart';
+part 'account_settings.g.dart';

@riverpod
 Future<List<SnAuthFactor>> authFactors(Ref ref) async {
@@ -57,7 +57,6 @@ class AccountSettingsScreen extends HookConsumerWidget {
  Widget build(BuildContext context, WidgetRef ref) {
    final isDesktop =
        !kIsWeb && (Platform.isWindows || Platform.isMacOS || Platform.isLinux);
-    final isWide = isWideScreen(context);

    Future<void> requestAccountDeletion() async {
      final confirm = await showConfirmAlert(
@@ -440,37 +439,6 @@ class AccountSettingsScreen extends HookConsumerWidget {

    // Create a responsive layout based on screen width
    Widget buildSettingsList() {
-      if (isWide) {
-        // Two-column layout for wide screens
-        return Row(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Expanded(
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  _SettingsSection(
-                    title: 'accountSecurityTitle',
-                    children: securitySettings,
-                  ),
-                ],
-              ),
-            ),
-            Expanded(
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  _SettingsSection(
-                    title: 'accountDangerZoneTitle',
-                    children: dangerZoneSettings,
-                  ),
-                ],
-              ),
-            ),
-          ],
-        );
-      } else {
-        // Single column layout for narrow screens
      return Column(
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
@@ -485,7 +453,6 @@ class AccountSettingsScreen extends HookConsumerWidget {
        ],
      );
    }
-    }

    return AppScaffold(
      appBar: AppBar(
@@ -513,6 +480,7 @@ class AccountSettingsScreen extends HookConsumerWidget {
                      );
                    },
                  ),
+                  const Gap(8),
                ]
                : null,
      ),
--- a/lib/screens/account/me/account_settings.g.dart
+++ b/lib/screens/account/me/account_settings.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND

-part of 'settings.dart';
+part of 'account_settings.dart';

 // **************************************************************************
 // RiverpodGenerator
--- a/lib/screens/account/me/profile_update.dart
+++ b/lib/screens/account/me/profile_update.dart
@@ -1,3 +1,4 @@
+import 'package:collection/collection.dart';
 import 'package:croppy/croppy.dart' hide cropImage;
 import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -20,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});
@@ -64,7 +66,7 @@ class UpdateProfileScreen extends HookConsumerWidget {
        final token = await getToken(ref.watch(tokenProvider));
        if (token == null) throw ArgumentError('Token is null');
        final cloudFile =
-            await putMediaToCloud(
+            await putFileToCloud(
              fileData: UniversalFile(
                data: result,
                type: UniversalFileType.image,
@@ -96,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 {
@@ -110,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);
@@ -168,11 +172,18 @@ class UpdateProfileScreen extends HookConsumerWidget {
            'location': locationController.text,
            'time_zone': timeZoneController.text,
            'birthday': birthday.value?.toUtc().toIso8601String(),
-            'links': links.value,
+            'links':
+                links.value
+                    .where((e) => e.name.isNotEmpty && e.url.isNotEmpty)
+                    .toList(),
          },
        );
        final userNotifier = ref.read(userInfoProvider.notifier);
        userNotifier.fetchUser();
+        links.value =
+            links.value
+                .where((e) => e.name.isNotEmpty && e.url.isNotEmpty)
+                .toList();
      } catch (err) {
        showErrorAlert(err);
      } finally {
@@ -283,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(
@@ -568,6 +605,7 @@ class UpdateProfileScreen extends HookConsumerWidget {
                    children: [
                      for (var i = 0; i < links.value.length; i++)
                        Row(
+                          key: ValueKey(links.value[i].hashCode),
                          crossAxisAlignment: CrossAxisAlignment.end,
                          children: [
                            Expanded(
@@ -610,8 +648,10 @@ class UpdateProfileScreen extends HookConsumerWidget {
                            IconButton(
                              icon: const Icon(Symbols.delete),
                              onPressed: () {
-                                links.value = List.from(links.value)
-                                  ..removeAt(i);
+                                links.value =
+                                    links.value
+                                        .whereIndexed((idx, _) => idx != i)
+                                        .toList();
                              },
                            ),
                          ],
--- a/lib/screens/account/me/settings_connections.dart
+++ b/lib/screens/account/me/settings_connections.dart
@@ -1,14 +1,16 @@
 import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/auth.dart';
+import 'package:island/pods/config.dart';
 import 'package:island/pods/network.dart';
-import 'package:island/screens/account/me/settings.dart';
+import 'package:island/screens/account/me/account_settings.dart';
 import 'package:island/screens/auth/oidc.native.dart';
-import 'package:island/services/text.dart';
+import 'package:island/utils/text.dart';
 import 'package:island/services/time.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/content/sheet.dart';
@@ -16,6 +18,7 @@ import 'package:island/widgets/response.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:sign_in_with_apple/sign_in_with_apple.dart';
 import 'package:styled_widget/styled_widget.dart';
+import 'package:url_launcher/url_launcher_string.dart';

 // Helper function to get provider icon and localized name
 Widget getProviderIcon(String provider, {double size = 24, Color? color}) {
@@ -165,9 +168,7 @@ class AccountConnectionNewSheet extends HookConsumerWidget {
              scopes: [AppleIDAuthorizationScopes.email],
              webAuthenticationOptions: WebAuthenticationOptions(
                clientId: 'dev.solsynth.solarpass',
-                redirectUri: Uri.parse(
-                  'https://id.solian.app/auth/callback/apple',
-                ),
+                redirectUri: Uri.parse('https://id.solian.app/auth/callback'),
              ),
            );

@@ -195,6 +196,13 @@ class AccountConnectionNewSheet extends HookConsumerWidget {
        case 'github':
        case 'discord':
        case 'afdian':
+          if (kIsWeb) {
+            final serverUrl = ref.watch(serverUrlProvider);
+            final accessToken = ref.watch(tokenProvider);
+            launchUrlString(
+              '$serverUrl/id/auth/login/${selectedProvider.value}?tk=${accessToken!.token}',
+            );
+          } else {
            await Navigator.of(context, rootNavigator: true).push(
              MaterialPageRoute(
                builder:
@@ -206,6 +214,7 @@ class AccountConnectionNewSheet extends HookConsumerWidget {
              ),
            );
            if (context.mounted) Navigator.pop(context, true);
+          }
          break;
        default:
          showSnackBar('accountConnectionAddError'.tr());
--- a/lib/screens/account/me/settings_contacts.dart
+++ b/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(),
--- a/Show More
+++ b/Show More