🔀 Merge pull request #20 from Texas0295/master

🐛 change -Werror to -Wextra

.github/workflows/nightly.yml

@@ -48,18 +48,34 @@ jobs:
         uses: subosito/flutter-action@v2
         with:
           channel: stable
-          cache: true
       - run: |
           sudo apt-get update -y
           sudo apt-get install -y ninja-build libgtk-3-dev
-          sudo apt-get install libmpv-dev mpv
-          sudo apt-get install libayatana-appindicator3-dev
-          sudo apt-get install keybinder-3.0
-          sudo apt-get install libnotify-dev
+          sudo apt-get install -y libmpv-dev mpv
+          sudo apt-get install -y libayatana-appindicator3-dev
+          sudo apt-get install -y keybinder-3.0
+          sudo apt-get install -y libnotify-dev
+          sudo apt-get install -y libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev
+          sudo apt-get install -y gstreamer-1.0
       - run: flutter pub get
       - run: flutter build linux
       - name: Archive production artifacts
         uses: actions/upload-artifact@v4
         with:
           name: build-output-linux
-          path: build/linux/x64/release/bundle
+          path: build/linux/x64/release/bundle
+      - name: Build AppImage
+        run: |
+          rm -r Solian.AppDir | true
+          mkdir Solian.AppDir
+          cp -r build/linux/x64/release/bundle/* Solian.AppDir
+          cp -r buildtools/appimage_config/* Solian.AppDir
+          cp assets/icon/icon-light-radius.png Solian.AppDir
+          sudo chmod +x buildtools/appimagetool-x86_64.AppImage
+          sudo chmod +x Solian.AppDir/AppRun
+          ./buildtools/appimagetool-x86_64.AppImage Solian.AppDir
+      - name: Archive production artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-output-linux-appimage
+          path: './*.AppImage*'

CODE_OF_CONDUCT.md

@@ -0,0 +1,34 @@
+# Code of Conduct
+
+Welcome to the Solar Network / HyperNet project!
+
+We're welcome for any contribution, from bug reports to feature requests to code contributions.
+
+To get started, start from fork the repository.
+
+## Project Structure
+
+The current repository you're visiting is the front-end project for the Solar Network project. It's built by Flutter and also manages all feature requests and issues reports in this repository.
+
+The backend of the Solar Network is written in Go and is a microservices app. The code is stored separately in different repositories. They're linked in the README.MD, you can have a look and try to contribute if you want.
+
+## Commit Messages
+
+We're using the gitmoji to clarify the reason and changes of the commit. To learn more about gitmoji, visit https://gitmoji.dev
+
+## Translations & Localization
+
+We're not accepting translation and localization improvements, or fixes on the GitHub or Solsynth Git Repository. If you want to contribute to those, please head to our Weblate: https://i18n.solsynth.dev. You will able to sign up / in via your Solar Network Account (Solarpass)
+
+## New Features
+
+To contribute new features, please create an issue or mention the feature you want in our official development chat channel. You should discuss the feature with us and the community first. You shouldn't just create a Pull Request for the feature you want, it will not be merged.
+
+## Bug Reports / Ask for help
+
+Read the error message, check for the update (including pre-releases), and wiki before creating an issue. At the same time, be respectful and don't argue with our developers and contributors in the development chat or GitHub issue. Otherwise your issue may got deleted and your Solar Network Account may got a strike. 
+
+-----------
+
+We appreciate every single commit you contributed. Let's work together and create a better Solar Network!
+

README.md

@@ -2,7 +2,7 @@
 
 ![](https://solsynth.dev/_next/static/media/alpha.e779a584.webp)
 
-Hello there! Welcome to the main repository of the HyperNet (also known as the Solar Network). The code here is mainly about the frontend app (also known as Solian). But you can still post issues here to get help and request new features!
+Hello there! Welcome to the main repository of the HyperNet (also known as the Solar Network). The code here is mainly about the front-end app (also known as Solian). But you can still post issues here to get help and request new features!
 
 ## Sub Projects
 
@@ -14,14 +14,55 @@ HyperNet, the Solar Network is a microservices project in which the backends are
 - The Messaging Service: [Messaging](https://github.com/Solsynth/HyperNet.Messaging)
 - The Wallet Service: [Wallet](https://github.com/Solsynth/HyperNet.Wallet)
 - The Crawler: [Reader](https://github.com/Solsynth/HyperNet.Reader)
-- Some others may not be listed, you can search in the organization with `HyperNet.` the prefix of all HyperNet projects.
+- The Attachments Service: [Paperclip](https://github.com/Solsynth/HyperNet.Paperclip)
+- Some others may not be listed, you can search in the organization with `HyperNet.` It's the prefix of all HyperNet projects.
 
 ## Tech Stack
 
-For those people who want to know the tech stack of this project, the frontend was built by Flutter, which provides the cross-platform ability.
+For those people who want to know the tech stack of this project, the front-end was built by Flutter, which provides cross-platform ability.
 
 The backend was built in Go and PostgreSQL with our very own microservice framework included in the nexus.
 
------
+If you want to contribute to the project, learn more about the [Code of Conduct](./CODE_OF_CONDUCT.md).
+
+## Getting Started
+
+The content below will lead you to the world of Solar Network.
+
+### For Normal Users
+
+1. Go to the Github Releases page, and download the latest release / pre-release according to your platform.
+   - **What's the difference between stable and pre-release?** The pre-release is untested by the other users and includes the new cutting-edge features, usually the pre-release is the feature drop. At the same time, due to we're not doing the API versioning, some breaking changes may break the stable release, so use the pre-release one instead.
+2. Create an account on the Solar Network
+3. Go to your email inbox to confirm your registration
+4. Start exploring!
+
+### For Developers
+
+To make the Solar Network App run in debug mode on your machine, you need to install the flutter development environment, for more environments, head to https://flutter.dev.
+
+For the Linux platform, you need to install those extra development libs:
+
+```bash
+sudo apt-get update -y
+sudo apt-get install -y ninja-build libgtk-3-dev
+sudo apt-get install -y libmpv-dev mpv
+sudo apt-get install -y libayatana-appindicator3-dev
+sudo apt-get install -y keybinder-3.0
+sudo apt-get install -y libnotify-dev
+sudo apt-get install -y libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev
+sudo apt-get install -y gstreamer-1.0
+```
+
+Then, use the flutter run for the app running in debug mode.
+
+```bash
+flutter pub get
+```
+
+If you want to build the release version, use the flutter build command. Learn more from the flutter docs.
+
+```bash
+flutter build <platform>
+```
 
-The readme will be updated in the future, to be determined. For now, you can check out the link of this repository to learn more on our official website.

android/.gitignore

@@ -11,3 +11,5 @@ GeneratedPluginRegistrant.java
 key.properties
 **/*.keystore
 **/*.jks
+
+app/.cxx

android/app/build.gradle

@@ -10,10 +10,15 @@ plugins {
 }
 
 dependencies {
+//    implementation('org.jitsi.react:jitsi-meet-sdk:11.1.1') { transitive = true }
+//    implementation 'com.facebook.fresco:webpsupport:2.6.0'
+//    implementation 'com.facebook.fresco:animated-webp:2.6.0'
+//    implementation 'com.facebook.react:react-android:0.75.5'
+//    implementation 'com.facebook.react:hermes-android:0.75.5'
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.glance:glance:1.1.1'
     implementation 'androidx.glance:glance-appwidget:1.1.1'
-    implementation 'androidx.compose.foundation:foundation-layout-android:1.7.6'
+    implementation 'androidx.compose.foundation:foundation-layout-android:1.7.8'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'io.coil-kt.coil3:coil-compose:3.0.4'
@@ -73,8 +78,10 @@ android {
         }
         release {
             signingConfig = signingConfigs.release
+            minifyEnabled true
+            shrinkResources true
 
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
 }

android/app/proguard-rules.pro

@@ -0,0 +1,96 @@
+-keepclassmembers class kotlin.Metadata { *; }
+-keep class dev.solsynth.solian.** { *; }
+-keep public class dev.solsynth.solian.data.** { public *; }
+-keepclassmembers class dev.solsynth.solian.data.** { *; }
+
+-keepattributes *Annotation*
+-keepattributes Signature
+-keepattributes EnclosingMethod
+
+-keep class com.google.gson.** { *; }
+
+-keepclassmembers class * {
+    @com.google.gson.annotations.SerializedName <fields>;
+}
+
+-dontwarn com.facebook.imagepipeline.nativecode.WebpTranscoder
+
+-keep,allowobfuscation @interface com.facebook.proguard.annotations.DoNotStrip
+-keep,allowobfuscation @interface com.facebook.proguard.annotations.KeepGettersAndSetters
+
+# Do not strip any method/class that is annotated with @DoNotStrip
+-keep @com.facebook.proguard.annotations.DoNotStrip class *
+-keepclassmembers class * {
+    @com.facebook.proguard.annotations.DoNotStrip *;
+}
+
+-keep @com.facebook.proguard.annotations.DoNotStripAny class * {
+    *;
+}
+
+-keepclassmembers @com.facebook.proguard.annotations.KeepGettersAndSetters class * {
+  void set*(***);
+  *** get*();
+}
+
+-keep class * implements com.facebook.react.bridge.JavaScriptModule { *; }
+-keep class * implements com.facebook.react.bridge.NativeModule { *; }
+-keepclassmembers,includedescriptorclasses class * { native <methods>; }
+-keepclassmembers class *  { @com.facebook.react.uimanager.annotations.ReactProp <methods>; }
+-keepclassmembers class *  { @com.facebook.react.uimanager.annotations.ReactPropGroup <methods>; }
+
+-dontwarn com.facebook.react.**
+-keep,includedescriptorclasses class com.facebook.react.bridge.** { *; }
+-keep,includedescriptorclasses class com.facebook.react.turbomodule.core.** { *; }
+
+# hermes
+-keep class com.facebook.jni.** { *; }
+
+# okio
+-keep class sun.misc.Unsafe { *; }
+-dontwarn java.nio.file.*
+-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+-dontwarn okio.**
+
+# yoga
+-keep,allowobfuscation @interface com.facebook.yoga.annotations.DoNotStrip
+-keep @com.facebook.yoga.annotations.DoNotStrip class *
+-keepclassmembers class * {
+    @com.facebook.yoga.annotations.DoNotStrip *;
+}
+
+# WebRTC
+
+-keep class org.webrtc.** { *; }
+-dontwarn org.chromium.build.BuildHooksAndroid
+
+# Jisti Meet SDK
+
+-keep class org.jitsi.meet.** { *; }
+-keep class org.jitsi.meet.sdk.** { *; }
+
+# We added the following when we switched minifyEnabled on. Probably because we
+# ran the app and hit problems...
+
+-keep class com.facebook.react.bridge.CatalystInstanceImpl { *; }
+-keep class com.facebook.react.bridge.ExecutorToken { *; }
+-keep class com.facebook.react.bridge.JavaScriptExecutor { *; }
+-keep class com.facebook.react.bridge.ModuleRegistryHolder { *; }
+-keep class com.facebook.react.bridge.ReadableType { *; }
+-keep class com.facebook.react.bridge.queue.NativeRunnable { *; }
+-keep class com.facebook.react.devsupport.** { *; }
+
+-dontwarn com.facebook.react.devsupport.**
+-dontwarn com.google.appengine.**
+-dontwarn com.squareup.okhttp.**
+-dontwarn javax.servlet.**
+
+# ^^^ We added the above when we switched minifyEnabled on.
+
+# Rule to avoid build errors related to SVGs.
+-keep public class com.horcrux.svg.** {*;}
+
+# https://github.com/facebook/fresco/issues/2638
+-keep public class com.facebook.imageutils.** {
+   public *;
+}

android/app/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -9,11 +9,13 @@
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="29" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="29" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <application
+        tools:replace="android:label"
         android:label="Solian"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"

android/app/src/proguard-rules.pro

@@ -1,14 +0,0 @@
--keepclassmembers class kotlin.Metadata { *; }
--keep class dev.solsynth.solian.** { *; }
--keep public class dev.solsynth.solian.data.** { public *; }
--keepclassmembers class dev.solsynth.solian.data.** { *; }
-
--keepattributes *Annotation*
--keepattributes Signature
--keepattributes EnclosingMethod
-
--keep class com.google.gson.** { *; }
-
--keepclassmembers class * {
-    @com.google.gson.annotations.SerializedName <fields>;
-}

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip

android/settings.gradle

@@ -10,18 +10,22 @@ pluginManagement {
     includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
     repositories {
+        maven {
+            url "https://github.com/jitsi/jitsi-maven-repository/raw/master/releases"
+        }
         google()
         mavenCentral()
         gradlePluginPortal()
+        maven { url 'https://www.jitpack.io' }
     }
 }
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version '8.7.3' apply false
+    id "com.android.application" version '8.9.1' apply false
     // START: FlutterFire Configuration
-    id "com.google.gms.google-services" version "4.3.15" apply false
-    id "com.google.firebase.crashlytics" version "2.8.1" apply false
+    id "com.google.gms.google-services" version "4.4.2" apply false
+    id "com.google.firebase.crashlytics" version "3.0.3" apply false
     // END: FlutterFire Configuration
     id "org.jetbrains.kotlin.android" version "1.8.22" apply false
 }

api/Passport/Give Punishment.bru

@@ -0,0 +1,20 @@
+meta {
+  name: Give Punishment
+  type: http
+  seq: 4
+}
+
+post {
+  url: {{endpoint}}/cgi/id/punishments
+  body: json
+  auth: inherit
+}
+
+body:json {
+  {
+    "reason": "吹哨管理条例 / 滥用吹哨功能，累积三次复核无效吹哨。处以禁用吹哨功能 30 天。",
+    "type": 1,
+    "perm_nodes": {"FlagPost":false},
+    "account_id": 5
+  }
+}

api/Reader/Trigger Scan News.bru

@@ -11,8 +11,5 @@ post {
 }
 
 body:json {
-  {
-    "sources": ["taiwan-pts"],
-    "eager": true
-  }
+  {}
 }

assets/translations/en-US.json

@@ -543,6 +543,7 @@
   "attachmentSaved": "Saved to album",
   "attachmentSavedDesktop": "Saved to Downloads folder",
   "openInAlbum": "Open in album",
+  "openInBrowser": "Open in browser",
   "postAbuseReport": "Report Post",
   "postAbuseReportDescription": "Report posts that violate our user agreement and community guidelines to help us improve the content on Solar Network. Please describe how this post violates the relevant rules. Do not include any sensitive information. We will process your report within 24 hours.",
   "abuseReport": "Abuse Report",
@@ -639,6 +640,7 @@
   "postQuestionUnansweredWithReward": "Unanswered Question, reward source points {}",
   "postQuestionAnswered": "Answered Question",
   "postQuestionAnswerSelect": "Select as Answer",
+  "postQuestionAnswerTitle": "Selected Question",
   "postQuestionAnswerSelected": "Answer has been selected, reward has been applied.",
   "postVideoUpload": "Upload Video",
   "realmJoin": "Join Realm",
@@ -875,7 +877,7 @@
   "appInitNetwork": "Initializing Network",
   "appInitUserdata": "Initializing User Data",
   "appInitWebsocket": "Establishing Solar Link",
-  "appInitNotification": "Initializing Push Notifications", 
+  "appInitNotification": "Initializing Push Notifications",
   "appInitKeyPair": "Initializing Key Pairs",
   "appInitStickers": "Initializing Stickers",
   "appInitUserDirectory": "Initializing User Directory",
@@ -890,5 +892,78 @@
   },
   "settingsHideBottomNav": "Hide Bottom Navigation",
   "settingsHideBottomNavDescription": "Hide the bottom navigation bar, and show the navigation buttons in the drawer.",
-  "reCaptcha": "reCaptcha"
+  "reCaptcha": "reCaptcha",
+  "friends": "Friends",
+  "friendsDescription": "Manage your friendships.",
+  "album": "Album",
+  "albumDescription": "View albums and manage attachments.",
+  "stickers": "Stickers",
+  "stickersDescription": "View sticker packs and manage stickers.",
+  "navBottomUnauthorizedCaption": "Or create an account",
+  "walletCurrencyGoldenShort": "GDP",
+  "walletCurrencyGolden": {
+    "one": "{} Golden Point",
+    "other": "{} Golden Points"
+  },
+  "walletTransactionTypeNormal": "Source Point",
+  "walletTransactionTypeGolden": "Golden Point",
+  "accountProgram": "Programs",
+  "accountProgramDescription": "Explore the available member programs.",
+  "accountProgramJoin": "Join Program",
+  "accountProgramJoinRequirements": "Requirements",
+  "accountProgramJoinPricing": "Pricing",
+  "accountProgramJoinPricingHint": "Billed every (30 days) month.",
+  "accountProgramLeaveHint": "After leaving the program, the source points will not be refunded.",
+  "accountProgramJoined": "Joined Program.",
+  "accountProgramAlreadyJoined": "Joined",
+  "accountProgramLeft": "Left Program.",
+  "leave": "Leave",
+  "attachmentFailedToLoadMedia": "Unable to load media file, please try again later. If this error occurs repeatedly, the source file may not exist or the network connection may be abnormal.",
+  "accountPunishments": "Punishments",
+  "accountPunishmentsDescription": "View your account's reputation status.",
+  "punishmentType0": "Strike",
+  "punishmentType1": "Limited",
+  "punishmentType2": "Banned",
+  "punishmentOverall": "Overall Status",
+  "punishmentStatusNormal": "All abilities normal",
+  "punishmentStatusWarned": "All abilities normal, but at least one strike is in effect",
+  "punishmentStatusLimited": "Some abilities limited, at least one limited punishment is in effect",
+  "punishmentStatusLimitedFully": "All abilities limited, at least one completely limited punishment is in effect",
+  "punishmentStatusBanned": "All services are terminated, banned",
+  "punishmentCreatedAt": "Applied since {}",
+  "punishmentExpiredAt": "Expired at {}",
+  "punishmentExpiredNever": "Never expired",
+  "punishmentModerator": "Moderator who made this punishment",
+  "punishmentMadeBySystem": "Made by auto-mod system",
+  "settingsAprilFoolFeatures": "April Fool Features",
+  "settingsAprilFoolFeaturesDescription": "Enable April Fool features during April Fool, this option will only be visible during April Fool.",
+  "settingsSoundEffects": "Sound Effects",
+  "settingsSoundEffectsDescription": "Enable the sound effects around the app.",
+  "settingsResetMemorizedWindowSize": "Reset Window Size",
+  "settingsResetMemorizedWindowSizeDescription": "Reset the memorized window size, and set it to the default size.",
+  "chatDirect": "Direct Messages",
+  "back": "Back",
+  "badgeProgramDeveloper": "Developer Program Member",
+  "badgeProgramStellar": "A Stellar",
+  "badgeProgramModerator": "Community Moderator",
+  "postEditedHint": "edited",
+  "splashScreenServer": "Server",
+  "splashScreenServerName": "Potato",
+  "splashScreenCaption": "Trying to establishing connection with HyperNet™",
+  "attachmentEditor": "Attachment editor",
+  "attachmentEditorUnUploadHint": "This attachment is not uploaded, metadata editing is unavailable, and you can crop this attachment.",
+  "attachmentEditorUploadHint": "This attachment is uploaded.",
+  "attachmentRating": "Rating",
+  "fieldAttachmentRating": "Content Rating",
+  "fieldAttachmentQuality": "Quality Rating",
+  "attachmentReferenceLink": "Use external attachment",
+  "fieldAttachmentReferenceLink": "Reference Link",
+  "attachmentReferenceLinkDescription": "It will be used as the source file of the attachment. The link needs to allow cross-origin access.",
+  "fieldAttachmentMimetype": "Mimetype",
+  "postVideoLive": "Live Stream",
+  "postVideoLiveDescription": "This is a live video, you can embed the source site by yourself.",
+  "postVideoRendererWeb": "WebView Rendering", 
+  "postVideoRendererWebDescription": "Use WebView to render the content",
+  "fieldPostVideoUrl": "Video URL",
+  "fieldPostVideoUrlDescription": "The URL of the video content, it can be a webpage, and will be rendered by iFrame / WebView."
 }

assets/translations/zh-CN.json

@@ -541,6 +541,7 @@
   "attachmentSaved": "已保存到相册",
   "attachmentSavedDesktop": "已保存到下载目录",
   "openInAlbum": "在相册中打开",
+  "openInBrowser": "在浏览器中打开",
   "postAbuseReport": "检举帖子",
   "postAbuseReportDescription": "检举不符合我们用户协议以及社区准则的帖子，来帮助我们更好的维护 Solar Network 上的内容。请在下面描述该帖子如何违反我么的相关规定。请勿填写任何敏感信息。我们将会在 24 小时内处理您的检举。",
   "abuseReport": "检举",
@@ -888,5 +889,78 @@
   },
   "settingsHideBottomNav": "隐藏底部导航栏",
   "settingsHideBottomNavDescription": "隐藏底部导航栏，在侧边栏抽屉显示导航按钮。",
-  "reCaptcha": "人机验证"
+  "reCaptcha": "人机验证",
+  "friends": "好友",
+  "friendsDescription": "管理好友关系。",
+  "album": "相册",
+  "albumDescription": "查看相册与管理上传附件。",
+  "stickers": "贴图",
+  "stickersDescription": "查看贴图包与管理贴图。",
+  "navBottomUnauthorizedCaption": "或者注册一个账号",
+  "walletCurrencyGoldenShort": "金点",
+  "walletCurrencyGolden": {
+    "one": "{} 金点",
+    "other": "{} 金点"
+  },
+  "walletTransactionTypeNormal": "源点",
+  "walletTransactionTypeGolden": "金点",
+  "accountProgram": "计划",
+  "accountProgramDescription": "了解可用的成员计划。",
+  "accountProgramJoin": "加入计划",
+  "accountProgramJoinRequirements": "要求",
+  "accountProgramJoinPricing": "价格",
+  "accountProgramJoinPricingHint": "按月（30 天）收费",
+  "accountProgramLeaveHint": "离开计划后，之前花费的源点不会退款。",
+  "accountProgramJoined": "已加入计划。",
+  "accountProgramLeft": "已离开计划。",
+  "accountProgramAlreadyJoined": "已加入",
+  "leave": "离开",
+  "attachmentFailedToLoadMedia": "无法加载媒体文件，请稍后重试。若此错误重复出现，可能源文件不存在或者网络连接异常。",
+  "accountPunishments": "处分",
+  "accountPunishmentsDescription": "查看你帐号的信誉状态。",
+  "punishmentType0": "警告",
+  "punishmentType1": "停权",
+  "punishmentType2": "封禁",
+  "punishmentOverall": "总体状态",
+  "punishmentStatusNormal": "所有功能正常",
+  "punishmentStatusWarned": "所有功能正常，但有警告生效",
+  "punishmentStatusLimited": "部份功能暂时受限，有至少一个停权生效",
+  "punishmentStatusLimitedFully": "所有功能暂时受限，有至少一个完全停权生效",
+  "punishmentStatusBanned": "所有服务终止，已被封禁",
+  "punishmentCreatedAt": "宣布于 {}",
+  "punishmentExpiredAt": "到期于 {}",
+  "punishmentExpiredNever": "永久生效",
+  "punishmentModerator": "责任管理员",
+  "punishmentMadeBySystem": "由系统自动裁决",
+  "settingsAprilFoolFeatures": "愚人节特性",
+  "settingsAprilFoolFeaturesDescription": "在愚人节期间启用愚人节特性，该选项只会在愚人节期间显示。",
+  "settingsSoundEffects": "声音效果",
+  "settingsSoundEffectsDescription": "在一些场合下启用声音特效。",
+  "settingsResetMemorizedWindowSize": "重置窗口大小",
+  "settingsResetMemorizedWindowSizeDescription": "重置记忆的窗口大小，以重新设置为默认大小。",
+  "chatDirect": "私信",
+  "back": "返回",
+  "badgeProgramDeveloper": "开发者计划成员",
+  "badgeProgramStellar": "一颗恒星",
+  "badgeProgramModerator": "社区管理员",
+  "postEditedHint": "已编辑",
+  "splashScreenServer": "服务器",
+  "splashScreenServerName": "土豆",
+  "splashScreenCaption": "正在尝试与 HyperNet™ 取得太阳链连接",
+  "attachmentEditor": "附件编辑器",
+  "attachmentEditorUnUploadHint": "该附件未上传，元数据编辑不可用，同时你可以裁剪本附件。",
+  "attachmentEditorUploadHint": "该附件已上传。",
+  "attachmentRating": "评级",
+  "fieldAttachmentRating": "内容分级",
+  "fieldAttachmentQuality": "质量评分",
+  "attachmentReferenceLink": "引用外部附件",
+  "fieldAttachmentReferenceLink": "引用连接",
+  "attachmentReferenceLinkDescription": "作为附件的源文件。需要链接允许跨域访问。",
+  "fieldAttachmentMimetype": "文件类型",
+  "postVideoLive": "直播",
+  "postVideoLiveDescription": "这是一条直播影片，允许用户自行嵌入源站。",
+  "postVideoRendererWeb": "网页渲染器", 
+  "postVideoRendererWebDescription": "使用 WebView 渲染内容。",
+  "fieldPostVideoUrl": "视频流地址",
+  "fieldPostVideoUrlDescription": "视频内容的地址，可以为网页，将会使用 iFrame / WebView 渲染。"
 }

assets/translations/zh-HK.json

@@ -888,5 +888,12 @@
   },
   "settingsHideBottomNav": "隱藏底部導航欄",
   "settingsHideBottomNavDescription": "隱藏底部導航欄，在側邊欄抽屜顯示導航按鈕。",
-  "reCaptcha": "人機驗證"
+  "reCaptcha": "人機驗證",
+  "friends": "好友",
+  "friendsDescription": "管理好友關係。",
+  "album": "相冊",
+  "albumDescription": "查看相冊與管理上傳附件。",
+  "stickers": "貼圖",
+  "stickersDescription": "查看貼圖包與管理貼圖。",
+  "navBottomUnauthorizedCaption": "或者註冊一個賬號"
 }

assets/translations/zh-TW.json

@@ -888,5 +888,12 @@
   },
   "settingsHideBottomNav": "隱藏底部導航欄",
   "settingsHideBottomNavDescription": "隱藏底部導航欄，在側邊欄抽屜顯示導航按鈕。",
-  "reCaptcha": "人機驗證"
+  "reCaptcha": "人機驗證",
+  "friends": "好友",
+  "friendsDescription": "管理好友關係。",
+  "album": "相冊",
+  "albumDescription": "查看相冊與管理上傳附件。",
+  "stickers": "貼圖",
+  "stickersDescription": "查看貼圖包與管理貼圖。",
+  "navBottomUnauthorizedCaption": "或者註冊一個賬號"
 }

buildtools/appimage_config/AppRun

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd "$(dirname "$0")"
+exec ./surface

buildtools/appimage_config/Solian.desktop

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Terminal=false
+Name=Solian
+Exec=surface %u
+Icon=icon-light-radius
+Categories=Network;

ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '13.0'
+platform :ios, '15.1'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

ios/Podfile.lock

@@ -1,5 +1,7 @@
 PODS:
   - Alamofire (5.10.2)
+  - audioplayers_darwin (0.0.1):
+    - Flutter
   - connectivity_plus (0.0.1):
     - Flutter
   - croppy (0.0.1):
@@ -44,58 +46,58 @@ PODS:
     - Flutter
   - file_saver (0.0.1):
     - Flutter
-  - Firebase/Analytics (11.8.0):
+  - Firebase/Analytics (11.10.0):
     - Firebase/Core
-  - Firebase/Core (11.8.0):
+  - Firebase/Core (11.10.0):
     - Firebase/CoreOnly
-    - FirebaseAnalytics (~> 11.8.0)
-  - Firebase/CoreOnly (11.8.0):
-    - FirebaseCore (~> 11.8.0)
-  - Firebase/Messaging (11.8.0):
+    - FirebaseAnalytics (~> 11.10.0)
+  - Firebase/CoreOnly (11.10.0):
+    - FirebaseCore (~> 11.10.0)
+  - Firebase/Messaging (11.10.0):
     - Firebase/CoreOnly
-    - FirebaseMessaging (~> 11.8.0)
-  - firebase_analytics (11.4.4):
-    - Firebase/Analytics (= 11.8.0)
+    - FirebaseMessaging (~> 11.10.0)
+  - firebase_analytics (11.4.5):
+    - Firebase/Analytics (= 11.10.0)
     - firebase_core
     - Flutter
-  - firebase_core (3.12.1):
-    - Firebase/CoreOnly (= 11.8.0)
+  - firebase_core (3.13.0):
+    - Firebase/CoreOnly (= 11.10.0)
     - Flutter
-  - firebase_messaging (15.2.4):
-    - Firebase/Messaging (= 11.8.0)
+  - firebase_messaging (15.2.5):
+    - Firebase/Messaging (= 11.10.0)
     - firebase_core
     - Flutter
-  - FirebaseAnalytics (11.8.0):
-    - FirebaseAnalytics/AdIdSupport (= 11.8.0)
-    - FirebaseCore (~> 11.8.0)
+  - FirebaseAnalytics (11.10.0):
+    - FirebaseAnalytics/AdIdSupport (= 11.10.0)
+    - FirebaseCore (~> 11.10.0)
     - FirebaseInstallations (~> 11.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
     - GoogleUtilities/MethodSwizzler (~> 8.0)
     - GoogleUtilities/Network (~> 8.0)
     - "GoogleUtilities/NSData+zlib (~> 8.0)"
     - nanopb (~> 3.30910.0)
-  - FirebaseAnalytics/AdIdSupport (11.8.0):
-    - FirebaseCore (~> 11.8.0)
+  - FirebaseAnalytics/AdIdSupport (11.10.0):
+    - FirebaseCore (~> 11.10.0)
     - FirebaseInstallations (~> 11.0)
-    - GoogleAppMeasurement (= 11.8.0)
+    - GoogleAppMeasurement (= 11.10.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
     - GoogleUtilities/MethodSwizzler (~> 8.0)
     - GoogleUtilities/Network (~> 8.0)
     - "GoogleUtilities/NSData+zlib (~> 8.0)"
     - nanopb (~> 3.30910.0)
-  - FirebaseCore (11.8.1):
-    - FirebaseCoreInternal (~> 11.8.0)
+  - FirebaseCore (11.10.0):
+    - FirebaseCoreInternal (~> 11.10.0)
     - GoogleUtilities/Environment (~> 8.0)
     - GoogleUtilities/Logger (~> 8.0)
-  - FirebaseCoreInternal (11.8.0):
+  - FirebaseCoreInternal (11.10.0):
     - "GoogleUtilities/NSData+zlib (~> 8.0)"
-  - FirebaseInstallations (11.8.0):
-    - FirebaseCore (~> 11.8.0)
+  - FirebaseInstallations (11.10.0):
+    - FirebaseCore (~> 11.10.0)
     - GoogleUtilities/Environment (~> 8.0)
     - GoogleUtilities/UserDefaults (~> 8.0)
     - PromisesObjC (~> 2.4)
-  - FirebaseMessaging (11.8.0):
-    - FirebaseCore (~> 11.8.0)
+  - FirebaseMessaging (11.10.0):
+    - FirebaseCore (~> 11.10.0)
     - FirebaseInstallations (~> 11.0)
     - GoogleDataTransport (~> 10.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
@@ -120,27 +122,26 @@ PODS:
   - flutter_udid (0.0.1):
     - Flutter
     - SAMKeychain
-  - flutter_webrtc (0.12.6):
-    - Flutter
-    - WebRTC-SDK (= 125.6422.06)
   - gal (1.0.0):
     - Flutter
     - FlutterMacOS
-  - GoogleAppMeasurement (11.8.0):
-    - GoogleAppMeasurement/AdIdSupport (= 11.8.0)
+  - Giphy (2.2.12):
+    - libwebp
+  - GoogleAppMeasurement (11.10.0):
+    - GoogleAppMeasurement/AdIdSupport (= 11.10.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
     - GoogleUtilities/MethodSwizzler (~> 8.0)
     - GoogleUtilities/Network (~> 8.0)
     - "GoogleUtilities/NSData+zlib (~> 8.0)"
     - nanopb (~> 3.30910.0)
-  - GoogleAppMeasurement/AdIdSupport (11.8.0):
-    - GoogleAppMeasurement/WithoutAdIdSupport (= 11.8.0)
+  - GoogleAppMeasurement/AdIdSupport (11.10.0):
+    - GoogleAppMeasurement/WithoutAdIdSupport (= 11.10.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
     - GoogleUtilities/MethodSwizzler (~> 8.0)
     - GoogleUtilities/Network (~> 8.0)
     - "GoogleUtilities/NSData+zlib (~> 8.0)"
     - nanopb (~> 3.30910.0)
-  - GoogleAppMeasurement/WithoutAdIdSupport (11.8.0):
+  - GoogleAppMeasurement/WithoutAdIdSupport (11.10.0):
     - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
     - GoogleUtilities/MethodSwizzler (~> 8.0)
     - GoogleUtilities/Network (~> 8.0)
@@ -182,15 +183,28 @@ PODS:
     - Flutter
   - in_app_review (2.0.0):
     - Flutter
-  - Kingfisher (8.2.0)
-  - livekit_client (2.4.1):
+  - jitsi_meet_flutter_sdk (11.1.1):
     - Flutter
-    - flutter_webrtc
-    - WebRTC-SDK (= 125.6422.06)
+    - JitsiMeetSDK (= 11.1.1)
+  - JitsiMeetSDK (11.1.1):
+    - Giphy (= 2.2.12)
+    - JitsiWebRTC (~> 124.0)
+  - JitsiWebRTC (124.0.2)
+  - Kingfisher (8.3.1)
+  - libwebp (1.5.0):
+    - libwebp/demux (= 1.5.0)
+    - libwebp/mux (= 1.5.0)
+    - libwebp/sharpyuv (= 1.5.0)
+    - libwebp/webp (= 1.5.0)
+  - libwebp/demux (1.5.0):
+    - libwebp/webp
+  - libwebp/mux (1.5.0):
+    - libwebp/demux
+  - libwebp/sharpyuv (1.5.0)
+  - libwebp/webp (1.5.0):
+    - libwebp/sharpyuv
   - media_kit_libs_ios_video (1.0.4):
     - Flutter
-  - media_kit_native_event_loop (1.0.0):
-    - Flutter
   - media_kit_video (0.0.1):
     - Flutter
   - nanopb (3.30910.0):
@@ -212,11 +226,9 @@ PODS:
   - receive_sharing_intent (1.8.1):
     - Flutter
   - SAMKeychain (1.5.3)
-  - screen_brightness_ios (0.1.0):
-    - Flutter
-  - SDWebImage (5.20.1):
-    - SDWebImage/Core (= 5.20.1)
-  - SDWebImage/Core (5.20.1)
+  - SDWebImage (5.21.0):
+    - SDWebImage/Core (= 5.21.0)
+  - SDWebImage/Core (5.21.0)
   - share_plus (0.0.1):
     - Flutter
   - shared_preferences_foundation (0.0.1):
@@ -256,12 +268,12 @@ PODS:
     - Flutter
   - wakelock_plus (0.0.1):
     - Flutter
-  - WebRTC-SDK (125.6422.06)
   - workmanager (0.0.1):
     - Flutter
 
 DEPENDENCIES:
   - Alamofire
+  - audioplayers_darwin (from `.symlinks/plugins/audioplayers_darwin/ios`)
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
   - croppy (from `.symlinks/plugins/croppy/ios`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
@@ -277,22 +289,19 @@ DEPENDENCIES:
   - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
   - flutter_timezone (from `.symlinks/plugins/flutter_timezone/ios`)
   - flutter_udid (from `.symlinks/plugins/flutter_udid/ios`)
-  - flutter_webrtc (from `.symlinks/plugins/flutter_webrtc/ios`)
   - gal (from `.symlinks/plugins/gal/darwin`)
   - home_widget (from `.symlinks/plugins/home_widget/ios`)
   - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
   - in_app_review (from `.symlinks/plugins/in_app_review/ios`)
+  - jitsi_meet_flutter_sdk (from `.symlinks/plugins/jitsi_meet_flutter_sdk/ios`)
   - Kingfisher (~> 8.0)
-  - livekit_client (from `.symlinks/plugins/livekit_client/ios`)
   - media_kit_libs_ios_video (from `.symlinks/plugins/media_kit_libs_ios_video/ios`)
-  - media_kit_native_event_loop (from `.symlinks/plugins/media_kit_native_event_loop/ios`)
   - media_kit_video (from `.symlinks/plugins/media_kit_video/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - pasteboard (from `.symlinks/plugins/pasteboard/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - receive_sharing_intent (from `.symlinks/plugins/receive_sharing_intent/ios`)
-  - screen_brightness_ios (from `.symlinks/plugins/screen_brightness_ios/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
@@ -314,10 +323,14 @@ SPEC REPOS:
     - FirebaseCoreInternal
     - FirebaseInstallations
     - FirebaseMessaging
+    - Giphy
     - GoogleAppMeasurement
     - GoogleDataTransport
     - GoogleUtilities
+    - JitsiMeetSDK
+    - JitsiWebRTC
     - Kingfisher
+    - libwebp
     - nanopb
     - OrderedSet
     - PromisesObjC
@@ -325,9 +338,10 @@ SPEC REPOS:
     - SDWebImage
     - sqlite3
     - SwiftyGif
-    - WebRTC-SDK
 
 EXTERNAL SOURCES:
+  audioplayers_darwin:
+    :path: ".symlinks/plugins/audioplayers_darwin/ios"
   connectivity_plus:
     :path: ".symlinks/plugins/connectivity_plus/ios"
   croppy:
@@ -358,8 +372,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_timezone/ios"
   flutter_udid:
     :path: ".symlinks/plugins/flutter_udid/ios"
-  flutter_webrtc:
-    :path: ".symlinks/plugins/flutter_webrtc/ios"
   gal:
     :path: ".symlinks/plugins/gal/darwin"
   home_widget:
@@ -368,12 +380,10 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/image_picker_ios/ios"
   in_app_review:
     :path: ".symlinks/plugins/in_app_review/ios"
-  livekit_client:
-    :path: ".symlinks/plugins/livekit_client/ios"
+  jitsi_meet_flutter_sdk:
+    :path: ".symlinks/plugins/jitsi_meet_flutter_sdk/ios"
   media_kit_libs_ios_video:
     :path: ".symlinks/plugins/media_kit_libs_ios_video/ios"
-  media_kit_native_event_loop:
-    :path: ".symlinks/plugins/media_kit_native_event_loop/ios"
   media_kit_video:
     :path: ".symlinks/plugins/media_kit_video/ios"
   package_info_plus:
@@ -386,8 +396,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/permission_handler_apple/ios"
   receive_sharing_intent:
     :path: ".symlinks/plugins/receive_sharing_intent/ios"
-  screen_brightness_ios:
-    :path: ".symlinks/plugins/screen_brightness_ios/ios"
   share_plus:
     :path: ".symlinks/plugins/share_plus/ios"
   shared_preferences_foundation:
@@ -409,66 +417,67 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Alamofire: 7193b3b92c74a07f85569e1a6c4f4237291e7496
-  connectivity_plus: 2a701ffec2c0ae28a48cf7540e279787e77c447d
-  croppy: b6199bc8d56bd2e03cc11609d1c47ad9875c1321
-  device_info_plus: bf2e3232933866d73fe290f2942f2156cdd10342
+  audioplayers_darwin: ccf9c770ee768abb07e26d90af093f7bab1c12ab
+  connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
+  croppy: 979e8ddc254f4642bffe7d52dc7193354b27ba30
+  device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
   DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
   DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
-  fast_rsa: dc48fb05f26bb108863de122b2a9f5554e8e2591
-  file_picker: b159e0c068aef54932bb15dc9fd1571818edaf49
-  file_saver: 503e386464dbe118f630e17b4c2e1190fa0cf808
-  Firebase: d80354ed7f6df5f9aca55e9eb47cc4b634735eaf
-  firebase_analytics: e3b6782e70e32b7fa18f7cd233e3201975dd86aa
-  firebase_core: ac395f994af4e28f6a38b59e05a88ca57abeb874
-  firebase_messaging: 7e223f4ee7ca053bf4ce43748e84a6d774ec9728
-  FirebaseAnalytics: 4fd42def128146e24e480e89f310e3d8534ea42b
-  FirebaseCore: 99fe0c4b44a39f37d99e6404e02009d2db5d718d
-  FirebaseCoreInternal: df24ce5af28864660ecbd13596fc8dd3a8c34629
-  FirebaseInstallations: 6c963bd2a86aca0481eef4f48f5a4df783ae5917
-  FirebaseMessaging: 487b634ccdf6f7b7ff180fdcb2a9935490f764e8
+  fast_rsa: d99f8e1809a4a312fa9216d830186869b2e9eb65
+  file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
+  file_saver: 6cdbcddd690cb02b0c1a0c225b37cd805c2bf8b6
+  Firebase: 1fe1c0a7d9aaea32efe01fbea5f0ebd8d70e53a2
+  firebase_analytics: 1998960b8fa16fd0cd9e77a6f9fd35a2009ad65e
+  firebase_core: 2d4534e7b489907dcede540c835b48981d890943
+  firebase_messaging: 75bc93a4df25faccad67f6662ae872ac9ae69b64
+  FirebaseAnalytics: 4e42333f02cf78ed93703a5c36f36dd518aebdef
+  FirebaseCore: 8344daef5e2661eb004b177488d6f9f0f24251b7
+  FirebaseCoreInternal: ef4505d2afb1d0ebbc33162cb3795382904b5679
+  FirebaseInstallations: 9980995bdd06ec8081dfb6ab364162bdd64245c3
+  FirebaseMessaging: 2b9f56aa4ed286e1f0ce2ee1d413aabb8f9f5cb9
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_app_update: 65f61da626cb111d1b24674abc4b01728d7723bc
-  flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4
-  flutter_native_splash: df59bb2e1421aa0282cb2e95618af4dcb0c56c29
-  flutter_timezone: ac3da59ac941ff1c98a2e1f0293420e020120282
-  flutter_udid: b2417673f287ee62817a1de3d1643f47b9f508ab
-  flutter_webrtc: 90260f83024b1b96d239a575ea4e3708e79344d1
-  gal: 6a522c75909f1244732d4596d11d6a2f86ff37a5
-  GoogleAppMeasurement: fc0817122bd4d4189164f85374e06773b9561896
+  flutter_app_update: 816fdb2e30e4832a7c45e3f108d391c42ef040a9
+  flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
+  flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
+  flutter_timezone: 7c838e17ffd4645d261e87037e5bebf6d38fe544
+  flutter_udid: f7c3884e6ec2951efe4f9de082257fc77c4d15e9
+  gal: baecd024ebfd13c441269ca7404792a7152fde89
+  Giphy: 83628960ed04e1c3428ff1b4fb2b027f65e82f50
+  GoogleAppMeasurement: 36684bfb3ee034e2b42b4321eb19da3a1b81e65d
   GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
   GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
-  home_widget: 0434835a4c9a75704264feff6be17ea40e0f0d57
-  image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
-  in_app_review: a31b5257259646ea78e0e35fc914979b0031d011
-  Kingfisher: 323e5c4ec7983aaace12af655a7b51a7f88a599d
-  livekit_client: 170022ce5f7c8c70d7f862ac9c17e11508ad5fbc
-  media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1
-  media_kit_native_event_loop: e6b2ab20cf0746eb1c33be961fcf79667304fa2a
-  media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
+  home_widget: f169fc41fd807b4d46ab6615dc44d62adbf9f64f
+  image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
+  in_app_review: 5596fe56fab799e8edb3561c03d053363ab13457
+  jitsi_meet_flutter_sdk: 0283a60730922d608fbad9872e07afdd5bb3578a
+  JitsiMeetSDK: 4e1c269aaaed8f2cb7b0fff2d3c00f08359b170e
+  JitsiWebRTC: b47805ab5668be38e7ee60e2258f49badfe8e1d0
+  Kingfisher: 3204d23de16b5ea53541c44ca5a8efb55741dec3
+  libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
+  media_kit_libs_ios_video: 5a18affdb97d1f5d466dc79988b13eff6c5e2854
+  media_kit_video: 1746e198cb697d1ffb734b1d05ec429d1fcd1474
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
   OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
-  package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
-  pasteboard: 982969ebaa7c78af3e6cc7761e8f5e77565d9ce0
-  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
-  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
+  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
+  pasteboard: 49088aeb6119d51f976a421db60d8e1ab079b63c
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
-  receive_sharing_intent: 79c848f5b045674ad60b9fea3bafea59962ad2c1
+  receive_sharing_intent: 222384f00ffe7e952bbfabaa9e3967cb87e5fe00
   SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
-  screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
-  SDWebImage: 33d0f23bddeb5d209ae959153883247be6703713
-  share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
-  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-  sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d
+  SDWebImage: f84b0feeb08d2d11e6a9b843cb06d75ebf5b8868
+  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
+  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+  sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
   sqlite3: fc1400008a9b3525f5914ed715a5d1af0b8f4983
-  sqlite3_flutter_libs: 487032b9008b28de37c72a3aa66849ef3745f3e6
+  sqlite3_flutter_libs: f6acaa2172e6bb3e2e70c771661905080e8ebcf2
   SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
-  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
-  video_compress: fce97e4fb1dfd88175aa07d2ffc8a2f297f87fbe
-  volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9
-  wakelock_plus: 373cfe59b235a6dd5837d0fb88791d2f13a90d56
-  WebRTC-SDK: 79942c006ea64f6fb48d7da8a4786dfc820bc1db
-  workmanager: 0afdcf5628bbde6924c21af7836fed07b42e30e6
+  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
+  video_compress: f2133a07762889d67f0711ac831faa26f956980e
+  volume_controller: 3657a1f65bedb98fa41ff7dc5793537919f31b12
+  wakelock_plus: 04623e3f525556020ebd4034310f20fe7fda8b49
+  workmanager: 01be2de7f184bd15de93a1812936a2b7f42ef07e
 
-PODFILE CHECKSUM: 9b244e02f87527430136c8d21cbdcf1cd586b6bc
+PODFILE CHECKSUM: d278ce52a331dda323590121247d2046cd085ae7
 
 COCOAPODS: 1.16.2

ios/Runner.xcodeproj/project.pbxproj

@@ -961,7 +961,7 @@
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Solian;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1521,7 +1521,7 @@
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Solian;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1549,7 +1549,7 @@
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Solian;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

ios/Runner/Info.plist

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSCalendarsUsageDescription</key>
+	<string>Grant access to Calander help us to shows Solar Calander with your own events.</string>
 	<key>AppGroupId</key>
 	<string>group.solsynth.solian</string>
 	<key>CADisableMinimumFrameDurationOnPhone</key>

lib/controllers/post_write_controller.dart

@@ -219,6 +219,8 @@ class PostWriteController extends ChangeNotifier {
   List<PostWriteMedia> attachments = List.empty(growable: true);
   DateTime? publishedAt, publishedUntil;
   SnAttachment? videoAttachment;
+  String videoUrl = '';
+  bool videoLive = false;
   SnPoll? poll;
 
   Future<void> fetchRelatedPost(
@@ -241,7 +243,13 @@ class PostWriteController extends ChangeNotifier {
         contentController.text = post.body['content'] ?? '';
         aliasController.text = post.alias ?? '';
         rewardController.text = post.body['reward']?.toString() ?? '';
-        videoAttachment = post.preload?.video;
+        if (post.body['video'] != null) {
+          if (post.body['video'] is String) {
+            videoUrl = post.body['video'];
+          } else {
+            videoAttachment = SnAttachment.fromJson(post.body['video']);
+          }
+        }
         publishedAt = post.publishedAt;
         publishedUntil = post.publishedUntil;
         visibleUsers = List.from(post.visibleUsersList ?? [], growable: true);
@@ -252,17 +260,23 @@ class PostWriteController extends ChangeNotifier {
         categories =
             List.from(post.categories.map((ele) => ele.alias), growable: true);
         attachments.addAll(
-            post.preload?.attachments?.map((ele) => PostWriteMedia(ele)) ?? []);
-        poll = post.preload?.poll;
+          post.body['attachments']
+                  ?.map((ele) => SnAttachment.fromJson(ele))
+                  ?.map((ele) => PostWriteMedia(ele))
+                  ?.cast<PostWriteMedia>() ??
+              [],
+        );
+        poll = post.poll;
 
+        videoLive = post.body['is_live'] ?? false;
         editingDraft = post.isDraft;
 
-        if (post.preload?.thumbnail != null &&
-            (post.preload?.thumbnail?.rid.isNotEmpty ?? false)) {
-          thumbnail = PostWriteMedia(post.preload!.thumbnail);
+        if (post.body['thumbnail'] != null) {
+          thumbnail =
+              PostWriteMedia(SnAttachment.fromJson(post.body['thumbnail']));
         }
-        if (post.preload?.realm != null) {
-          realm = post.preload!.realm!;
+        if (post.realm != null) {
+          realm = post.realm!;
         }
 
         editingPost = post;
@@ -438,8 +452,9 @@ class PostWriteController extends ChangeNotifier {
       titleController.text = data['title'] ?? '';
       descriptionController.text = data['description'] ?? '';
       rewardController.text = data['reward']?.toString() ?? '';
-      if (data['thumbnail'] != null)
+      if (data['thumbnail'] != null) {
         thumbnail = PostWriteMedia(SnAttachment.fromJson(data['thumbnail']));
+      }
       attachments.addAll(data['attachments']
           .map((ele) => PostWriteMedia(SnAttachment.fromJson(ele)))
           .cast<PostWriteMedia>());
@@ -448,10 +463,12 @@ class PostWriteController extends ChangeNotifier {
       visibility = data['visibility'];
       visibleUsers = List.from(data['visible_users_list'] ?? []);
       invisibleUsers = List.from(data['invisible_users_list'] ?? []);
-      if (data['published_at'] != null)
+      if (data['published_at'] != null) {
         publishedAt = DateTime.tryParse(data['published_at'])?.toLocal();
-      if (data['published_until'] != null)
+      }
+      if (data['published_until'] != null) {
         publishedUntil = DateTime.tryParse(data['published_until'])?.toLocal();
+      }
       replyingPost =
           data['reply_to'] != null ? SnPost.fromJson(data['reply_to']) : null;
       repostingPost =
@@ -588,9 +605,11 @@ class PostWriteController extends ChangeNotifier {
           if (replyingPost != null) 'reply_to': replyingPost!.id,
           if (repostingPost != null) 'repost_to': repostingPost!.id,
           if (reward != null) 'reward': reward,
-          if (videoAttachment != null) 'video': videoAttachment!.rid,
+          if (videoAttachment != null || videoUrl.isNotEmpty)
+            'video': videoUrl.isNotEmpty ? videoUrl : videoAttachment!.rid,
           if (poll != null) 'poll': poll!.id,
           if (realm != null) 'realm': realm!.id,
+          if (videoLive) 'is_live': videoLive,
           'is_draft': saveAsDraft,
         },
         onSendProgress: (count, total) {
@@ -731,6 +750,16 @@ class PostWriteController extends ChangeNotifier {
     notifyListeners();
   }
 
+  void setVideoUrl(String value) {
+    videoUrl = value;
+    notifyListeners();
+  }
+
+  void setVideoLive(bool value) {
+    videoLive = value;
+    notifyListeners();
+  }
+
   void setPoll(SnPoll? value) {
     poll = value;
     notifyListeners();

lib/main.dart

@@ -1,9 +1,9 @@
 import 'dart:async';
 import 'dart:developer';
 import 'dart:io';
-import 'dart:math' hide log;
 import 'dart:ui';
 
+import 'package:audioplayers/audioplayers.dart';
 import 'package:bitsdojo_window/bitsdojo_window.dart';
 import 'package:croppy/croppy.dart';
 import 'package:dio/dio.dart';
@@ -15,6 +15,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:gap/gap.dart';
 import 'package:go_router/go_router.dart';
+import 'package:google_fonts/google_fonts.dart';
 import 'package:hotkey_manager/hotkey_manager.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:provider/provider.dart';
@@ -25,7 +26,6 @@ import 'package:styled_widget/styled_widget.dart';
 import 'package:surface/firebase_options.dart';
 import 'package:surface/logger.dart';
 import 'package:surface/providers/channel.dart';
-import 'package:surface/providers/chat_call.dart';
 import 'package:surface/providers/config.dart';
 import 'package:surface/providers/database.dart';
 import 'package:surface/providers/keypair.dart';
@@ -49,6 +49,7 @@ import 'package:surface/router.dart';
 import 'package:flutter_web_plugins/url_strategy.dart' show usePathUrlStrategy;
 import 'package:surface/widgets/dialog.dart';
 import 'package:surface/widgets/menu_bar.dart';
+import 'package:surface/widgets/navigation/app_scaffold.dart';
 import 'package:surface/widgets/version_label.dart';
 import 'package:tray_manager/tray_manager.dart';
 import 'package:version/version.dart';
@@ -57,6 +58,7 @@ import 'package:in_app_review/in_app_review.dart';
 import 'package:image_picker_android/image_picker_android.dart';
 import 'package:image_picker_platform_interface/image_picker_platform_interface.dart';
 import 'package:local_notifier/local_notifier.dart';
+import 'package:flutter_animate/flutter_animate.dart';
 
 @pragma('vm:entry-point')
 void appBackgroundDispatcher() {
@@ -75,13 +77,40 @@ void appBackgroundDispatcher() {
   });
 }
 
+// Desktop size tools
+
+Future<Size> _getSavedWindowSize() async {
+  final prefs = await SharedPreferences.getInstance();
+  String? sizeString = prefs.getString(kAppWindowSize);
+
+  if (sizeString != null) {
+    List<String> parts = sizeString.split('x');
+    if (parts.length == 2) {
+      double? width = double.tryParse(parts[0]);
+      double? height = double.tryParse(parts[1]);
+      if (width != null && height != null) {
+        return Size(width, height);
+      }
+    }
+  }
+
+  return const Size(1280, 720); // Default size
+}
+
+Future<void> _saveWindowSize() async {
+  final prefs = await SharedPreferences.getInstance();
+  final size = appWindow.size;
+  await prefs.setString(kAppWindowSize, '${size.width}x${size.height}');
+}
+
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
   if (!kIsWeb && (Platform.isWindows || Platform.isLinux || Platform.isMacOS)) {
+    final Size savedSize = await _getSavedWindowSize();
     doWhenWindowReady(() {
       appWindow.minSize = Size(480, 640);
-      appWindow.size = Size(1280, 720);
+      appWindow.size = savedSize;
       appWindow.alignment = Alignment.center;
       appWindow.show();
     });
@@ -91,18 +120,15 @@ void main() async {
 
   if (!kIsWeb && !Platform.isLinux) {
     await Firebase.initializeApp(
-      options: DefaultFirebaseOptions.currentPlatform,
-    );
+        options: DefaultFirebaseOptions.currentPlatform);
   }
 
   GoRouter.optionURLReflectsImperativeAPIs = true;
   usePathUrlStrategy();
 
   if (!kIsWeb && (Platform.isAndroid || Platform.isIOS)) {
-    Workmanager().initialize(
-      appBackgroundDispatcher,
-      isInDebugMode: kDebugMode,
-    );
+    Workmanager()
+        .initialize(appBackgroundDispatcher, isInDebugMode: kDebugMode);
     if (Platform.isAndroid) {
       Workmanager().registerPeriodicTask(
         "widget-update-random-post",
@@ -137,7 +163,7 @@ class SolianApp extends StatelessWidget {
           Locale('en', 'US'),
           Locale('zh', 'CN'),
           Locale('zh', 'TW'),
-          Locale('zh', 'HK'),
+          Locale('zh', 'HK')
         ],
         fallbackLocale: Locale('en', 'US'),
         useFallbackTranslations: true,
@@ -161,7 +187,7 @@ class SolianApp extends StatelessWidget {
             Provider(create: (ctx) => SnNetworkProvider(ctx)),
             Provider(create: (ctx) => UserDirectoryProvider(ctx)),
             Provider(create: (ctx) => SnAttachmentProvider(ctx)),
-            Provider(create: (ctx) => SnRealmProvider(ctx)),
+            ChangeNotifierProvider(create: (ctx) => SnRealmProvider(ctx)),
             Provider(create: (ctx) => SnPostContentProvider(ctx)),
             Provider(create: (ctx) => SnRelationshipProvider(ctx)),
             Provider(create: (ctx) => SnLinkPreviewProvider(ctx)),
@@ -171,7 +197,6 @@ class SolianApp extends StatelessWidget {
             Provider(create: (ctx) => KeyPairProvider(ctx)),
             ChangeNotifierProvider(create: (ctx) => NotificationProvider(ctx)),
             ChangeNotifierProvider(create: (ctx) => ChatChannelProvider(ctx)),
-            ChangeNotifierProvider(create: (ctx) => ChatCallProvider(ctx)),
             Provider(create: (ctx) => SnTranslator()),
 
             // Additional helper layer
@@ -233,6 +258,7 @@ class _AppSplashScreen extends StatefulWidget {
 
 class _AppSplashScreenState extends State<_AppSplashScreen> with TrayListener {
   bool _isBusy = false;
+  double _initPercentage = 0;
   String _phaseText = 'appInitStarting';
 
   void _tryRequestRating() async {
@@ -263,12 +289,10 @@ class _AppSplashScreenState extends State<_AppSplashScreen> with TrayListener {
       final localVersionString = '${info.version}+${info.buildNumber}';
       final resp = await Dio(
         BaseOptions(
-          sendTimeout: const Duration(seconds: 60),
-          receiveTimeout: const Duration(seconds: 60),
-        ),
+            sendTimeout: const Duration(seconds: 60),
+            receiveTimeout: const Duration(seconds: 60)),
       ).get(
-        'https://api.github.com/repos/Solsynth/HyperNet.Surface/releases/latest',
-      );
+          'https://api.github.com/repos/Solsynth/HyperNet.Surface/releases/latest');
       final remoteVersionString = resp.data?['tag_name'] ?? '0.0.0+0';
       final remoteVersion = Version.parse(remoteVersionString.split('+').first);
       final localVersion = Version.parse(localVersionString.split('+').first);
@@ -283,9 +307,7 @@ class _AppSplashScreenState extends State<_AppSplashScreen> with TrayListener {
           mounted) {
         final config = context.read<ConfigProvider>();
         config.setUpdate(
-          remoteVersionString,
-          resp.data?['body'] ?? 'No changelog',
-        );
+            remoteVersionString, resp.data?['body'] ?? 'No changelog');
         logging.info("[Update] Update available: $remoteVersionString");
       }
     } catch (e) {
@@ -311,45 +333,57 @@ class _AppSplashScreenState extends State<_AppSplashScreen> with TrayListener {
       // The Network initialization must be done after the HomeWidget initialization
       // The Network initialization will save the server url to the HomeWidget
       // The Network initialization will also save initialize the Config, so it not need to be initialized again
+      _initPercentage = 0.1;
       _setPhaseText('network');
       final sn = context.read<SnNetworkProvider>();
       await sn.initializeUserAgent();
       await sn.setConfigWithNative();
       if (!mounted) return;
+      _initPercentage = 0.2;
       _setPhaseText('userdata');
       final ua = context.read<UserProvider>();
       await ua.initialize();
       if (!mounted) return;
+      _initPercentage = 0.3;
       _setPhaseText('websocket');
       final ws = context.read<WebSocketProvider>();
       await ws.tryConnect();
-      if (!mounted) return;
-      _setPhaseText('notification');
-      final notify = context.read<NotificationProvider>();
-      notify.listen();
-      await notify.registerPushNotifications();
-      if (!mounted) return;
-      _setPhaseText('keyPair');
-      final kp = context.read<KeyPairProvider>();
-      await kp.reloadActive();
-      kp.listen();
-      if (!mounted) return;
-      _setPhaseText('stickers');
-      final sticker = context.read<SnStickerProvider>();
-      await sticker.listSticker();
-      if (!mounted) return;
-      _setPhaseText('userDirectory');
-      final ud = context.read<UserDirectoryProvider>();
-      await ud.loadAccountCache();
-      if (!mounted) return;
-      _setPhaseText('realm');
-      final rm = context.read<SnRealmProvider>();
-      await rm.refreshAvailableRealms();
-      if (!mounted) return;
-      _setPhaseText('chat');
-      final ct = context.read<ChatChannelProvider>();
-      await ct.refreshAvailableChannels();
-      _setPhaseText('done');
+      try {
+        if (!mounted) return;
+        _initPercentage = 0.9;
+        _setPhaseText('keyPair');
+        final kp = context.read<KeyPairProvider>();
+        kp.reloadActive();
+        kp.listen();
+      } catch (_) {}
+      if (ua.isAuthorized) {
+        if (!mounted) return;
+        _setPhaseText('notification');
+        final notify = context.read<NotificationProvider>();
+        notify.listen();
+        try {
+          notify.registerPushNotifications();
+          if (!mounted) return;
+          _setPhaseText('stickers');
+          final sticker = context.read<SnStickerProvider>();
+          await sticker.listSticker();
+          if (!mounted) return;
+          _setPhaseText('userDirectory');
+          final ud = context.read<UserDirectoryProvider>();
+          await ud.loadAccountCache();
+          if (!mounted) return;
+          _setPhaseText('realm');
+          final rm = context.read<SnRealmProvider>();
+          await rm.refreshAvailableRealms();
+          if (!mounted) return;
+          _setPhaseText('chat');
+          final ct = context.read<ChatChannelProvider>();
+          await ct.refreshAvailableChannels();
+          _initPercentage = 1;
+          _setPhaseText('done');
+        } catch (_) {}
+        _playIntro();
+      }
     } catch (err) {
       if (!mounted) return;
       await context.showErrorDialog(err);
@@ -365,28 +399,42 @@ class _AppSplashScreenState extends State<_AppSplashScreen> with TrayListener {
     // The quit key has been removed, and the logic of the quit key is moved to system menu bar activator.
   }
 
+  void _playIntro() async {
+    final cfg = context.read<ConfigProvider>();
+    if (!cfg.soundEffects) return;
+
+    final date = DateTime.now();
+    final player = AudioPlayer(playerId: 'launch-done-player');
+    await player.play(
+      (cfg.aprilFoolFeatures && date.month == 4 && date.day == 1)
+          ? AssetSource('audio/sfx/launch-intro.mp3')
+          : AssetSource('audio/sfx/launch-done.mp3'),
+      volume: 0.8,
+      ctx: AudioContext(
+        android: AudioContextAndroid(
+          contentType: AndroidContentType.sonification,
+          usageType: AndroidUsageType.notificationEvent,
+        ),
+        iOS: AudioContextIOS(category: AVAudioSessionCategory.ambient),
+      ),
+      mode: PlayerMode.lowLatency,
+    );
+    player.onPlayerComplete.listen((_) {
+      player.dispose();
+    });
+  }
+
   final Menu _appTrayMenu = Menu(
     items: [
-      MenuItem(
-        key: 'version_label',
-        label: 'Solian',
-        disabled: true,
-      ),
+      MenuItem(key: 'version_label', label: 'Solian', disabled: true),
       MenuItem.separator(),
       MenuItem.checkbox(
-        checked: false,
-        key: 'mute_notification',
-        label: 'trayMenuMuteNotification'.tr(),
-      ),
+          checked: false,
+          key: 'mute_notification',
+          label: 'trayMenuMuteNotification'.tr()),
       MenuItem.separator(),
-      MenuItem(
-        key: 'window_show',
-        label: 'trayMenuShow'.tr(),
-      ),
-      MenuItem(
-        key: 'exit',
-        label: 'trayMenuExit'.tr(),
-      ),
+      MenuItem(key: 'window_show', label: 'trayMenuShow'.tr()),
+      MenuItem(key: 'exit', label: 'trayMenuExit'.tr()),
     ],
   );
 
@@ -414,9 +462,7 @@ class _AppSplashScreenState extends State<_AppSplashScreen> with TrayListener {
     if (kIsWeb || Platform.isAndroid || Platform.isIOS) return;
 
     await localNotifier.setup(
-      appName: 'Solian',
-      shortcutPolicy: ShortcutPolicy.requireCreate,
-    );
+        appName: 'Solian', shortcutPolicy: ShortcutPolicy.requireCreate);
   }
 
   AppLifecycleListener? _appLifecycleListener;
@@ -427,20 +473,26 @@ class _AppSplashScreenState extends State<_AppSplashScreen> with TrayListener {
 
     _isBusy = true;
     if (!kIsWeb && !(Platform.isIOS || Platform.isAndroid)) {
-      _appLifecycleListener = AppLifecycleListener(
-        onExitRequested: _onExitRequested,
-      );
+      _appLifecycleListener =
+          AppLifecycleListener(onExitRequested: _onExitRequested);
     }
 
-    _trayInitialization();
-    _hotkeyInitialization();
-    _notifyInitialization();
-    _initialize().then((_) {
-      _postInitialization();
-      _tryRequestRating();
-      _checkForUpdate();
-      setState(() => _isBusy = false);
-    });
+    try {
+      _trayInitialization();
+      _hotkeyInitialization();
+      _notifyInitialization();
+      _initialize().then((_) {
+        _postInitialization();
+        _tryRequestRating();
+        _checkForUpdate();
+        setState(() => _isBusy = false);
+      }).catchError((err) {
+        logging.error('[Bootstrap] Unable to initialize app', err);
+        setState(() => _isBusy = false);
+      });
+    } catch (err) {
+      logging.error('[Bootstrap] Unable to initialize (pre-stage) app', err);
+    }
   }
 
   Future<AppExitResponse> _onExitRequested() async {
@@ -449,6 +501,7 @@ class _AppSplashScreenState extends State<_AppSplashScreen> with TrayListener {
   }
 
   void _quitApp() {
+    _saveWindowSize();
     _appLifecycleListener?.dispose();
     if (Platform.isWindows) {
       appWindow.close();
@@ -530,41 +583,10 @@ class _AppSplashScreenState extends State<_AppSplashScreen> with TrayListener {
             });
             return SizeChangedLayoutNotifier(
               child: _isBusy
-                  ? Material(
-                      key: Key('app-splash-screen-$_isBusy'),
-                      child: Stack(
-                        children: [
-                          CustomPaint(painter: GraphPainter()),
-                          Center(
-                            child: Container(
-                              constraints: const BoxConstraints(
-                                maxWidth: 240,
-                              ),
-                              child: Column(
-                                mainAxisSize: MainAxisSize.min,
-                                children: [
-                                  Image.asset(
-                                    'assets/icon/icon.png',
-                                    width: 64,
-                                    height: 64,
-                                    color:
-                                        Theme.of(context).colorScheme.onSurface,
-                                  ),
-                                  Text('Solar Network').bold(),
-                                  AppVersionLabel(),
-                                  Gap(8),
-                                  Text(
-                                    _phaseText,
-                                    textAlign: TextAlign.center,
-                                  ),
-                                  Gap(16),
-                                  const LinearProgressIndicator(),
-                                ],
-                              ),
-                            ),
-                          ),
-                        ],
-                      ),
+                  ? _AppLoadingScreen(
+                      isBusy: _isBusy,
+                      initPercentage: _initPercentage,
+                      phaseText: _phaseText,
                     )
                   : widget.child,
             );
@@ -575,43 +597,233 @@ class _AppSplashScreenState extends State<_AppSplashScreen> with TrayListener {
   }
 }
 
-class GraphPainter extends CustomPainter {
-  final Random random = Random();
-  final int numNodes = 20;
-  final double maxDistance = 100; // Max distance to draw a line
+class _AppLoadingScreen extends StatelessWidget {
+  const _AppLoadingScreen({
+    required this.isBusy,
+    required this.initPercentage,
+    required this.phaseText,
+  });
+
+  final bool isBusy;
+  final double initPercentage;
+  final String phaseText;
 
   @override
-  void paint(Canvas canvas, Size size) {
-    final paintNode = Paint()..color = Colors.white;
-    final paintEdge = Paint()
-      ..color = Colors.white.withOpacity(0.3)
-      ..strokeWidth = 1;
+  Widget build(BuildContext context) {
+    if (ResponsiveScaffold.getIsExpand(context)) {
+      return Material(
+        key: Key('app-splash-screen-$isBusy'),
+        child: Stack(
+          children: [
+            Container(
+              decoration: BoxDecoration(
+                image: DecorationImage(
+                  image: AssetImage('assets/icon/kanban-1st.jpg'),
+                  fit: BoxFit.cover,
+                  opacity: 0.1,
+                ),
+                color: Theme.of(context).colorScheme.surface,
+                backgroundBlendMode: BlendMode.darken,
+              ),
+            ),
+            Center(
+              child: Row(
+                children: [
+                  Expanded(
+                    child: TweenAnimationBuilder<double>(
+                      tween: Tween(begin: 0, end: initPercentage),
+                      duration: Duration(milliseconds: 300),
+                      builder: (context, value, _) => Column(
+                        mainAxisSize: MainAxisSize.min,
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Text('${(value * 100).toStringAsFixed(0)}%')
+                              .padding(left: 32, bottom: 4),
+                          LinearProgressIndicator(
+                            value: value,
+                            borderRadius: const BorderRadius.all(
+                              Radius.circular(0),
+                            ),
+                            stopIndicatorColor: Colors.transparent,
+                            backgroundColor: Colors.transparent,
+                          ),
+                          const Gap(24),
+                        ],
+                      ),
+                    ),
+                  ),
+                  Expanded(
+                    child: TweenAnimationBuilder<double>(
+                      tween: Tween(begin: 0, end: initPercentage),
+                      duration: Duration(milliseconds: 300),
+                      builder: (context, value, _) => Column(
+                        mainAxisSize: MainAxisSize.min,
+                        crossAxisAlignment: CrossAxisAlignment.end,
+                        children: [
+                          Text('${(value * 100).toStringAsFixed(0)}%')
+                              .padding(right: 32, bottom: 4),
+                          Transform.flip(
+                            flipX: true,
+                            child: LinearProgressIndicator(
+                              value: value,
+                              borderRadius: const BorderRadius.all(
+                                Radius.circular(0),
+                              ),
+                              stopIndicatorColor: Colors.transparent,
+                              backgroundColor: Colors.transparent,
+                            ),
+                          ),
+                          const Gap(24),
+                        ],
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+            Center(
+              child: Container(
+                constraints: const BoxConstraints(maxWidth: 240, minWidth: 160),
+                padding: EdgeInsets.symmetric(horizontal: 16, vertical: 24),
+                decoration: BoxDecoration(
+                  color:
+                      Theme.of(context).colorScheme.surface.withOpacity(0.85),
+                  border: Border.all(
+                    color: Theme.of(context).dividerColor,
+                    width: 3,
+                  ),
+                  borderRadius: const BorderRadius.all(Radius.circular(12)),
+                ),
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    Text(
+                      'splashScreenServer',
+                      style: GoogleFonts.notoSerifHk(height: 1, fontSize: 11),
+                      textAlign: TextAlign.center,
+                    ).tr().opacity(0.85),
+                    Text(
+                      'splashScreenServerName',
+                      style: GoogleFonts.notoSerifHk(
+                        fontSize: 24,
+                        fontWeight: FontWeight.bold,
+                      ),
+                      textAlign: TextAlign.center,
+                    ).tr().opacity(0.85),
+                    Text.rich(
+                      TextSpan(
+                        text: '#',
+                        style: GoogleFonts.notoSerifHk(),
+                        children: [
+                          TextSpan(
+                            text: '0',
+                            style: GoogleFonts.notoSerifHk(
+                              fontSize: 80,
+                              fontWeight: FontWeight.bold,
+                            ),
+                          ),
+                        ],
+                      ),
+                      textAlign: TextAlign.center,
+                    ).padding(vertical: 16),
+                  ],
+                ),
+              ),
+            ),
+            Positioned(
+              left: 0,
+              right: 0,
+              bottom: MediaQuery.of(context).size.height * 0.2,
+              child: Column(
+                children: [
+                  Text(
+                    phaseText,
+                    textAlign: TextAlign.center,
+                  ),
+                  AnimateWidgetExtensions(Text(
+                    'splashScreenCaption',
+                    textAlign: TextAlign.center,
+                  ).tr())
+                      .animate(onPlay: (e) => e.repeat())
+                      .fadeIn(duration: 500.ms, curve: Curves.easeOut)
+                      .then()
+                      .fadeOut(
+                        duration: 500.ms,
+                        delay: 1000.ms,
+                        curve: Curves.easeIn,
+                      ),
+                ],
+              ),
+            ),
+            Positioned(
+              bottom: 8,
+              left: 16,
+              right: 16,
+              child: Row(
+                children: [
+                  Image.asset(
+                    'assets/icon/icon.png',
+                    width: 40,
+                    height: 40,
+                    color: Theme.of(context).colorScheme.onSurface,
+                  ).padding(all: 4),
+                  const Gap(4),
+                  Text('Solar Network').bold(),
+                  Expanded(child: const SizedBox()),
+                  AppVersionLabel(),
+                  const Gap(12),
+                ],
+              ),
+            ),
+          ],
+        ),
+      );
+    }
 
-    // Generate random points
-    List<Offset> nodes = List.generate(
-      numNodes,
-      (_) => Offset(
-        random.nextDouble() * size.width,
-        random.nextDouble() * size.height,
+    return Material(
+      key: Key('app-splash-screen-$isBusy'),
+      child: Stack(
+        children: [
+          Container(
+            decoration: BoxDecoration(
+              image: DecorationImage(
+                image: AssetImage('assets/icon/kanban-1st.jpg'),
+                fit: BoxFit.cover,
+                opacity: 0.1,
+              ),
+              color: Theme.of(context).colorScheme.surface,
+              backgroundBlendMode: BlendMode.darken,
+            ),
+          ),
+          Center(
+            child: Container(
+              constraints: const BoxConstraints(maxWidth: 240),
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Image.asset(
+                    'assets/icon/icon.png',
+                    width: 64,
+                    height: 64,
+                    color: Theme.of(context).colorScheme.onSurface,
+                  ),
+                  Text('Solar Network').bold(),
+                  AppVersionLabel(),
+                  Gap(8),
+                  Text(phaseText, textAlign: TextAlign.center),
+                  Gap(16),
+                  TweenAnimationBuilder<double>(
+                    tween: Tween(begin: 0, end: initPercentage),
+                    duration: Duration(milliseconds: 300),
+                    builder: (context, value, _) =>
+                        LinearProgressIndicator(value: value),
+                  ),
+                ],
+              ),
+            ),
+          ),
+        ],
       ),
     );
-
-    // Draw edges between close nodes
-    for (var i = 0; i < nodes.length; i++) {
-      for (var j = i + 1; j < nodes.length; j++) {
-        double distance = (nodes[i] - nodes[j]).distance;
-        if (distance < maxDistance) {
-          canvas.drawLine(nodes[i], nodes[j], paintEdge);
-        }
-      }
-    }
-
-    // Draw nodes
-    for (var node in nodes) {
-      canvas.drawCircle(node, 4, paintNode);
-    }
   }
-
-  @override
-  bool shouldRepaint(CustomPainter oldDelegate) => false;
 }

lib/providers/channel.dart

@@ -41,6 +41,11 @@ class ChatChannelProvider extends ChangeNotifier {
     });
   }
 
+  void addAvailableChannel(SnChannel channel) {
+    _availableChannels.add(channel);
+    notifyListeners();
+  }
+
   Future<void> _saveChannelToLocal(Iterable<SnChannel> channels) async {
     await Future.wait(
       channels.map(

lib/providers/chat_call.dart

@@ -1,459 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/material.dart';
-import 'package:livekit_client/livekit_client.dart';
-import 'package:permission_handler/permission_handler.dart';
-import 'package:provider/provider.dart';
-import 'package:surface/providers/sn_network.dart';
-import 'package:surface/types/chat.dart';
-import 'package:wakelock_plus/wakelock_plus.dart';
-
-class ChatCallProvider extends ChangeNotifier {
-  late final SnNetworkProvider _sn;
-
-  ChatCallProvider(BuildContext context) {
-    _sn = context.read<SnNetworkProvider>();
-  }
-
-  SnChatCall? _current;
-  SnChannel? _channel;
-
-  bool _isReady = false;
-  bool _isMounted = false;
-  bool _isInitialized = false;
-  bool _isBusy = false;
-
-  String _lastDuration = '00:00:00';
-  Timer? _lastDurationUpdateTimer;
-
-  String? token;
-  String? endpoint;
-
-  StreamSubscription? hwSubscription;
-  List<MediaDevice> _audioInputs = [];
-  List<MediaDevice> _videoInputs = [];
-
-  bool _enableAudio = true;
-  bool _enableVideo = false;
-  LocalAudioTrack? _audioTrack;
-  LocalVideoTrack? _videoTrack;
-  MediaDevice? _videoDevice;
-  MediaDevice? _audioDevice;
-
-  late Room _room;
-  late EventsListener<RoomEvent> _listener;
-
-  List<ParticipantTrack> _participantTracks = [];
-  ParticipantTrack? _focusTrack;
-
-  // Getters for private fields
-  SnChatCall? get current => _current;
-  SnChannel? get channel => _channel;
-  bool get isReady => _isReady;
-  bool get isMounted => _isMounted;
-  bool get isInitialized => _isInitialized;
-  bool get isBusy => _isBusy;
-  String get lastDuration => _lastDuration;
-  List<MediaDevice> get audioInputs => _audioInputs;
-  List<MediaDevice> get videoInputs => _videoInputs;
-  bool get enableAudio => _enableAudio;
-  bool get enableVideo => _enableVideo;
-  LocalAudioTrack? get audioTrack => _audioTrack;
-  LocalVideoTrack? get videoTrack => _videoTrack;
-  MediaDevice? get videoDevice => _videoDevice;
-  MediaDevice? get audioDevice => _audioDevice;
-  List<ParticipantTrack> get participantTracks => _participantTracks;
-  ParticipantTrack? get focusTrack => _focusTrack;
-  Room get room => _room;
-
-  void _updateDuration() {
-    if (_current == null) {
-      _lastDuration = '00:00:00';
-    } else {
-      Duration duration = DateTime.now().difference(_current!.createdAt);
-      String twoDigits(int n) => n.toString().padLeft(2, '0');
-      _lastDuration = '${twoDigits(duration.inHours)}:'
-          '${twoDigits(duration.inMinutes.remainder(60))}:'
-          '${twoDigits(duration.inSeconds.remainder(60))}';
-    }
-    notifyListeners();
-  }
-
-  void enableDurationUpdater() {
-    _updateDuration();
-    _lastDurationUpdateTimer = Timer.periodic(
-      const Duration(seconds: 1),
-      (_) => _updateDuration(),
-    );
-  }
-
-  void disableDurationUpdater() {
-    _lastDurationUpdateTimer?.cancel();
-    _lastDurationUpdateTimer = null;
-  }
-
-  Future<void> checkPermissions() async {
-    if (lkPlatformIs(PlatformType.macOS) || lkPlatformIs(PlatformType.linux)) {
-      return;
-    }
-
-    await Permission.camera.request();
-    await Permission.microphone.request();
-    await Permission.bluetooth.request();
-    await Permission.bluetoothConnect.request();
-  }
-
-  void setCall(SnChatCall call, SnChannel related) {
-    _current = call;
-    _channel = related;
-    notifyListeners();
-  }
-
-  Future<(String, String)> getRoomToken() async {
-    final resp = await _sn.client.post(
-      '/cgi/im/channels/${_channel!.keyPath}/calls/ongoing/token',
-    );
-    token = resp.data['token'];
-    endpoint = 'wss://${resp.data['endpoint']}';
-    return (token!, endpoint!);
-  }
-
-  void initHardware() {
-    if (_isReady) return;
-
-    _isReady = true;
-    hwSubscription = Hardware.instance.onDeviceChange.stream.listen(
-      _revertDevices,
-    );
-    Hardware.instance.enumerateDevices().then(_revertDevices);
-    notifyListeners();
-  }
-
-  void initRoom() {
-    initHardware();
-    _room = Room(
-      roomOptions: const RoomOptions(
-        dynacast: true,
-        adaptiveStream: true,
-        defaultAudioPublishOptions: AudioPublishOptions(
-          name: 'call_voice',
-          stream: 'call_stream',
-        ),
-        defaultVideoPublishOptions: VideoPublishOptions(
-          name: 'call_video',
-          stream: 'call_stream',
-          simulcast: true,
-          backupVideoCodec: BackupVideoCodec(enabled: true),
-        ),
-        defaultScreenShareCaptureOptions: ScreenShareCaptureOptions(
-          useiOSBroadcastExtension: true,
-          params: VideoParametersPresets.screenShareH1080FPS30,
-        ),
-        defaultCameraCaptureOptions: CameraCaptureOptions(
-          maxFrameRate: 30,
-          params: VideoParametersPresets.h1080_169,
-        ),
-      ),
-    );
-    _listener = _room.createListener();
-    WakelockPlus.enable();
-  }
-
-  Future<void> joinRoom(String url, String token) async {
-    if (_isMounted) return;
-
-    try {
-      await _room.connect(
-        url,
-        token,
-        fastConnectOptions: FastConnectOptions(
-          microphone: TrackOption(track: _audioTrack),
-          camera: TrackOption(track: _videoTrack),
-        ),
-      );
-    } finally {
-      _isMounted = true;
-      notifyListeners();
-    }
-  }
-
-  void setupRoom() {
-    if (isInitialized) return;
-
-    sortParticipants();
-    _room.addListener(_onRoomDidUpdate);
-    WidgetsBindingCompatible.instance?.addPostFrameCallback(
-      (_) => autoPublish(),
-    );
-
-    if (lkPlatformIsMobile()) {
-      Hardware.instance.setSpeakerphoneOn(true);
-    }
-
-    _isBusy = false;
-    _isInitialized = true;
-    notifyListeners();
-  }
-
-  void autoPublish() async {
-    try {
-      if (enableVideo) {
-        await _room.localParticipant?.setCameraEnabled(true);
-      }
-      if (enableAudio) {
-        await _room.localParticipant?.setMicrophoneEnabled(true);
-      }
-    } catch (error) {
-      rethrow;
-    }
-  }
-
-  Future<void> setEnableAudio(bool value) async {
-    _enableAudio = value;
-    if (!_enableAudio) {
-      await _audioTrack?.stop();
-      _audioTrack = null;
-    } else {
-      await _changeLocalAudioTrack();
-    }
-    notifyListeners();
-  }
-
-  Future<void> setEnableVideo(bool value) async {
-    _enableVideo = value;
-    if (!_enableVideo) {
-      await _videoTrack?.stop();
-      _videoTrack = null;
-    } else {
-      await _changeLocalVideoTrack();
-    }
-    notifyListeners();
-  }
-
-  void setupRoomListeners({
-    required Function(DisconnectReason?) onDisconnected,
-  }) {
-    _listener
-      ..on<RoomDisconnectedEvent>((event) async {
-        onDisconnected(event.reason);
-      })
-      ..on<ParticipantEvent>((event) => sortParticipants())
-      ..on<LocalTrackPublishedEvent>((_) => sortParticipants())
-      ..on<LocalTrackUnpublishedEvent>((_) => sortParticipants())
-      ..on<TrackSubscribedEvent>((_) => sortParticipants())
-      ..on<TrackUnsubscribedEvent>((_) => sortParticipants())
-      ..on<ParticipantNameUpdatedEvent>((event) {
-        sortParticipants();
-      });
-  }
-
-  void sortParticipants() {
-    Map<String, ParticipantTrack> mediaTracks = {};
-    for (var participant in _room.remoteParticipants.values) {
-      mediaTracks[participant.sid] = ParticipantTrack(
-        participant: participant,
-        videoTrack: null,
-        isScreenShare: false,
-      );
-
-      for (var t in participant.videoTrackPublications) {
-        mediaTracks[participant.sid]?.videoTrack = t.track;
-        mediaTracks[participant.sid]?.isScreenShare = t.isScreenShare;
-      }
-    }
-
-    final newTracks = List<ParticipantTrack>.empty(growable: true);
-
-    final mediaTrackList = mediaTracks.values.toList();
-    mediaTrackList.sort((a, b) {
-      // Loudest people first
-      if (a.participant.isSpeaking && b.participant.isSpeaking) {
-        if (a.participant.audioLevel > b.participant.audioLevel) {
-          return -1;
-        } else {
-          return 1;
-        }
-      }
-
-      // Last spoke first
-      final aSpokeAt = a.participant.lastSpokeAt?.millisecondsSinceEpoch ?? 0;
-      final bSpokeAt = b.participant.lastSpokeAt?.millisecondsSinceEpoch ?? 0;
-
-      if (aSpokeAt != bSpokeAt) {
-        return aSpokeAt > bSpokeAt ? -1 : 1;
-      }
-
-      // Has video first
-      if (a.participant.hasVideo != b.participant.hasVideo) {
-        return a.participant.hasVideo ? -1 : 1;
-      }
-
-      // First joined people first
-      return a.participant.joinedAt.millisecondsSinceEpoch -
-          b.participant.joinedAt.millisecondsSinceEpoch;
-    });
-
-    newTracks.addAll(mediaTrackList);
-
-    if (_room.localParticipant != null) {
-      ParticipantTrack localTrack = ParticipantTrack(
-        participant: _room.localParticipant!,
-        videoTrack: null,
-        isScreenShare: false,
-      );
-
-      final localParticipantTracks =
-          _room.localParticipant?.videoTrackPublications;
-      if (localParticipantTracks != null) {
-        for (var t in localParticipantTracks) {
-          localTrack.videoTrack = t.track;
-          localTrack.isScreenShare = t.isScreenShare;
-        }
-      }
-
-      newTracks.add(localTrack);
-    }
-
-    _participantTracks = newTracks;
-
-    if (focusTrack != null) {
-      final idx = participantTracks
-          .indexWhere((x) => x.participant.sid == _focusTrack!.participant.sid);
-      if (idx == -1) {
-        _focusTrack = null;
-      }
-    }
-
-    if (focusTrack == null) {
-      _focusTrack = participantTracks.firstOrNull;
-    } else {
-      final idx = participantTracks.indexWhere(
-        (x) => _focusTrack!.participant.sid == x.participant.sid,
-      );
-      if (idx > -1) {
-        _focusTrack = participantTracks[idx];
-      }
-    }
-
-    notifyListeners();
-  }
-
-  Future<void> _changeLocalAudioTrack() async {
-    if (_audioTrack != null) {
-      await _audioTrack!.stop();
-      _audioTrack = null;
-    }
-
-    if (_audioDevice != null) {
-      _audioTrack = await LocalAudioTrack.create(
-        AudioCaptureOptions(deviceId: _audioDevice!.deviceId),
-      );
-      await _audioTrack!.start();
-    }
-    notifyListeners();
-  }
-
-  Future<void> _changeLocalVideoTrack() async {
-    if (_videoTrack != null) {
-      await _videoTrack!.stop();
-      _videoTrack = null;
-    }
-
-    if (_videoDevice != null) {
-      _videoTrack = await LocalVideoTrack.createCameraTrack(
-        CameraCaptureOptions(
-          deviceId: _videoDevice!.deviceId,
-          params: VideoParametersPresets.h1080_169,
-        ),
-      );
-      await _videoTrack!.start();
-    }
-    notifyListeners();
-  }
-
-  void _revertDevices(List<MediaDevice> devices) {
-    _audioInputs = devices.where((d) => d.kind == 'audioinput').toList();
-    _videoInputs = devices.where((d) => d.kind == 'videoinput').toList();
-    notifyListeners();
-  }
-
-  void _onRoomDidUpdate() => sortParticipants();
-
-  Future<void> changeLocalAudioTrack() async {
-    if (audioTrack != null) {
-      await audioTrack!.stop();
-      _audioTrack = null;
-    }
-
-    if (audioDevice != null) {
-      _audioTrack = await LocalAudioTrack.create(
-        AudioCaptureOptions(
-          deviceId: audioDevice!.deviceId,
-        ),
-      );
-      await audioTrack!.start();
-    }
-  }
-
-  Future<void> changeLocalVideoTrack() async {
-    if (videoTrack != null) {
-      await _videoTrack!.stop();
-      _videoTrack = null;
-    }
-
-    if (videoDevice != null) {
-      _videoTrack = await LocalVideoTrack.createCameraTrack(
-        CameraCaptureOptions(
-          deviceId: videoDevice!.deviceId,
-          params: VideoParametersPresets.h1080_169,
-        ),
-      );
-      await videoTrack!.start();
-    }
-  }
-
-  void deactivateHardware() {
-    hwSubscription?.cancel();
-  }
-
-  void disposeRoom() {
-    _isBusy = false;
-    _isMounted = false;
-    _isInitialized = false;
-    _current = null;
-    _channel = null;
-    _room.removeListener(_onRoomDidUpdate);
-    _room.disconnect();
-    _room.dispose();
-    _listener.dispose();
-    WakelockPlus.disable();
-  }
-
-  void disposeHardware() {
-    _isReady = false;
-    _audioTrack?.stop();
-    _audioTrack = null;
-    _videoTrack?.stop();
-    _videoTrack = null;
-  }
-
-  void setVideoDevice(MediaDevice? value) {
-    _videoDevice = value;
-    notifyListeners();
-  }
-
-  void setAudioDevice(MediaDevice? value) {
-    _audioDevice = value;
-    notifyListeners();
-  }
-
-  void setFocusTrack(ParticipantTrack? value) {
-    _focusTrack = value;
-    notifyListeners();
-  }
-
-  void setIsBusy(bool value) {
-    _isBusy = value;
-    notifyListeners();
-  }
-}

lib/providers/config.dart

@@ -13,7 +13,6 @@ const kNetworkServerStoreKey = 'app_server_url';
 const kAppbarTransparentStoreKey = 'app_bar_transparent';
 const kAppBackgroundStoreKey = 'app_has_background';
 const kAppColorSchemeStoreKey = 'app_color_scheme';
-const kAppDrawerPreferCollapse = 'app_drawer_prefer_collapse';
 const kAppNotifyWithHaptic = 'app_notify_with_haptic';
 const kAppExpandPostLink = 'app_expand_post_link';
 const kAppExpandChatLink = 'app_expand_chat_link';
@@ -22,6 +21,9 @@ const kAppCustomFonts = 'app_custom_fonts';
 const kAppMixedFeed = 'app_mixed_feed';
 const kAppAutoTranslate = 'app_auto_translate';
 const kAppHideBottomNav = 'app_hide_bottom_nav';
+const kAppSoundEffects = 'app_sound_effects';
+const kAppAprilFoolFeatures = 'app_april_fool_features';
+const kAppWindowSize = 'app_window_size';
 
 const Map<String, FilterQuality> kImageQualityLevel = {
   'settingsImageQualityLowest': FilterQuality.none,
@@ -44,27 +46,17 @@ class ConfigProvider extends ChangeNotifier {
   }
 
   bool drawerIsCollapsed = false;
-  bool drawerIsExpanded = false;
 
   void calcDrawerSize(BuildContext context, {bool withMediaQuery = false}) {
     bool newDrawerIsCollapsed = false;
-    bool newDrawerIsExpanded = false;
     if (withMediaQuery) {
       newDrawerIsCollapsed = MediaQuery.of(context).size.width < 600;
-      newDrawerIsExpanded = MediaQuery.of(context).size.width >= 601;
     } else {
       final rpb = ResponsiveBreakpoints.of(context);
       newDrawerIsCollapsed = rpb.smallerOrEqualTo(MOBILE);
-      newDrawerIsExpanded = rpb.largerThan(TABLET)
-          ? (prefs.getBool(kAppDrawerPreferCollapse) ?? false)
-              ? false
-              : true
-          : false;
     }
 
-    if (newDrawerIsExpanded != drawerIsExpanded ||
-        newDrawerIsCollapsed != drawerIsCollapsed) {
-      drawerIsExpanded = newDrawerIsExpanded;
+    if (newDrawerIsCollapsed != drawerIsCollapsed) {
       drawerIsCollapsed = newDrawerIsCollapsed;
       notifyListeners();
     }
@@ -96,6 +88,24 @@ class ConfigProvider extends ChangeNotifier {
     return prefs.getBool(kAppHideBottomNav) ?? false;
   }
 
+  bool get aprilFoolFeatures {
+    return prefs.getBool(kAppAprilFoolFeatures) ?? true;
+  }
+
+  bool get soundEffects {
+    return prefs.getBool(kAppSoundEffects) ?? true;
+  }
+
+  set soundEffects(bool value) {
+    prefs.setBool(kAppSoundEffects, value);
+    notifyListeners();
+  }
+
+  set aprilFoolFeatures(bool value) {
+    prefs.setBool(kAppAprilFoolFeatures, value);
+    notifyListeners();
+  }
+
   set hideBottomNav(bool value) {
     prefs.setBool(kAppHideBottomNav, value);
     notifyListeners();

lib/providers/keypair.dart

@@ -152,7 +152,7 @@ class KeyPairProvider {
 
   Future<SnKeyPair?> reloadActive({bool autoEnroll = true}) async {
     final kp = await (_dt.db.snLocalKeyPair.select()
-          ..where((e) => e.accountId.equals(_ua.user!.id))
+          ..where((e) => e.accountId.equals(_ua.user?.id ?? 0))
           ..where((e) => e.privateKey.isNotNull())
           ..where((e) => e.isActive.equals(true))
           ..limit(1))

lib/providers/navigation.dart

@@ -4,7 +4,20 @@ import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:surface/types/realm.dart';
+
+class AppNavListItem {
+  final String title;
+  final String subtitle;
+  final String screen;
+  final IconData icon;
+
+  const AppNavListItem({
+    required this.title,
+    required this.subtitle,
+    required this.screen,
+    required this.icon,
+  });
+}
 
 class AppNavDestination {
   final String label;
@@ -46,40 +59,15 @@ class NavigationProvider extends ChangeNotifier {
       screen: 'chat',
       label: 'screenChat',
     ),
-    AppNavDestination(
-      icon: Icon(Symbols.account_circle, weight: 400, opticalSize: 20),
-      screen: 'account',
-      label: 'screenAccount',
-    ),
     AppNavDestination(
       icon: Icon(Symbols.group, weight: 400, opticalSize: 20),
       screen: 'realm',
       label: 'screenRealm',
     ),
     AppNavDestination(
-      icon: Icon(Symbols.newspaper, weight: 400, opticalSize: 20),
-      screen: 'news',
-      label: 'screenNews',
-    ),
-    AppNavDestination(
-      icon: Icon(Symbols.emoji_emotions, weight: 400, opticalSize: 20),
-      screen: 'stickers',
-      label: 'screenStickers',
-    ),
-    AppNavDestination(
-      icon: Icon(Symbols.photo_library, weight: 400, opticalSize: 20),
-      screen: 'album',
-      label: 'screenAlbum',
-    ),
-    AppNavDestination(
-      icon: Icon(Symbols.diversity_4, weight: 400, opticalSize: 20),
-      screen: 'friend',
-      label: 'screenFriend',
-    ),
-    AppNavDestination(
-      icon: Icon(Symbols.notifications, weight: 400, opticalSize: 20),
-      screen: 'notification',
-      label: 'screenNotification',
+      icon: Icon(Symbols.settings, weight: 400, opticalSize: 20),
+      screen: 'settings',
+      label: 'screenSettings',
     ),
   ];
   static const List<String> kDefaultPinnedDestination = [
@@ -141,11 +129,4 @@ class NavigationProvider extends ChangeNotifier {
     _currentIndex = idx;
     notifyListeners();
   }
-
-  SnRealm? focusedRealm;
-
-  void setFocusedRealm(SnRealm? realm) {
-    focusedRealm = realm;
-    notifyListeners();
-  }
 }

lib/providers/notification.dart

@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:audioplayers/audioplayers.dart';
 import 'package:bitsdojo_window/bitsdojo_window.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/foundation.dart';
@@ -22,6 +23,8 @@ class NotificationProvider extends ChangeNotifier {
   late final WebSocketProvider _ws;
   late final ConfigProvider _cfg;
 
+  final AudioPlayer _notifySoundPlayer = AudioPlayer(playerId: 'notify-sound');
+
   NotificationProvider(BuildContext context) {
     _sn = context.read<SnNetworkProvider>();
     _ua = context.read<UserProvider>();
@@ -66,14 +69,19 @@ class NotificationProvider extends ChangeNotifier {
     }
     logging.info('[Push Notification] Device Push Token is $token');
 
-    await _sn.client.post(
-      '/cgi/id/notifications/subscription',
-      data: {
-        'provider': provider,
-        'device_token': token,
-        'device_id': deviceUuid,
-      },
-    );
+    try {
+      await _sn.client.post(
+        '/cgi/id/notifications/subscription',
+        data: {
+          'provider': provider,
+          'device_token': token,
+          'device_id': deviceUuid
+        },
+      );
+    } catch (err) {
+      logging.error(
+          '[Push Notification] Unable to register push notifications: $err');
+    }
   }
 
   int showingCount = 0;
@@ -91,6 +99,25 @@ class NotificationProvider extends ChangeNotifier {
         final doHaptic = _cfg.prefs.getBool(kAppNotifyWithHaptic) ?? true;
         if (doHaptic) HapticFeedback.mediumImpact();
 
+        // April fool notification sfx
+        if (_cfg.prefs.getBool(kAppAprilFoolFeatures) ?? true) {
+          final now = DateTime.now();
+          if (now.day == 1 && now.month == 4) {
+            _notifySoundPlayer.play(
+              AssetSource('audio/notify/metal-pipe.mp3'),
+              volume: 0.6,
+              ctx: AudioContext(
+                android: AudioContextAndroid(
+                  contentType: AndroidContentType.sonification,
+                  usageType: AndroidUsageType.notificationEvent,
+                ),
+                iOS: AudioContextIOS(category: AVAudioSessionCategory.ambient),
+              ),
+              mode: PlayerMode.lowLatency,
+            );
+          }
+        }
+
         if (notification.topic == 'messaging.message' &&
             skippableNotifyChannel != null) {
           if (notification.metadata['channel_id'] != null &&

lib/providers/post.dart

@@ -1,144 +1,31 @@
+import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:surface/providers/sn_attachment.dart';
 import 'package:surface/providers/sn_network.dart';
-import 'package:surface/providers/sn_realm.dart';
-import 'package:surface/providers/user_directory.dart';
-import 'package:surface/types/poll.dart';
 import 'package:surface/types/post.dart';
-import 'package:surface/types/realm.dart';
 
 class SnPostContentProvider {
   late final SnNetworkProvider _sn;
-  late final UserDirectoryProvider _ud;
-  late final SnAttachmentProvider _attach;
-  late final SnRealmProvider _realm;
 
   SnPostContentProvider(BuildContext context) {
     _sn = context.read<SnNetworkProvider>();
-    _ud = context.read<UserDirectoryProvider>();
-    _attach = context.read<SnAttachmentProvider>();
-    _realm = context.read<SnRealmProvider>();
-  }
-
-  Future<SnPoll> _fetchPoll(int id) async {
-    final resp = await _sn.client.get('/cgi/co/polls/$id');
-    return SnPoll.fromJson(resp.data);
   }
 
   Future<List<SnPost>> _preloadRelatedDataInBatch(List<SnPost> out) async {
-    Set<String> rids = {};
-    Set<int> uids = {};
-    for (var i = 0; i < out.length; i++) {
-      rids.addAll(out[i].body['attachments']?.cast<String>() ?? []);
-      if (out[i].body['thumbnail'] != null) {
-        rids.add(out[i].body['thumbnail']);
-      }
-      if (out[i].body['video'] != null) {
-        rids.add(out[i].body['video']);
-      }
-      if (out[i].repostTo != null) {
-        out[i] = out[i].copyWith(
-          repostTo: await _preloadRelatedDataSingle(out[i].repostTo!),
-        );
-      }
-      if (out[i].publisher.type == 0) {
-        uids.add(out[i].publisher.accountId);
-      }
-    }
-
-    final attachments = await _attach.getMultiple(rids.toList());
-    for (var i = 0; i < out.length; i++) {
-      SnPoll? poll;
-      SnRealm? realm;
-      if (out[i].pollId != null) {
-        poll = await _fetchPoll(out[i].pollId!);
-      }
-      if (out[i].realmId != null) {
-        realm = await _realm.getRealm(out[i].realmId!);
-      }
-
-      out[i] = out[i].copyWith(
-        preload: SnPostPreload(
-          thumbnail: attachments
-              .where((ele) => ele?.rid == out[i].body['thumbnail'])
-              .firstOrNull,
-          attachments: attachments
-              .where((ele) =>
-                  out[i].body['attachments']?.contains(ele?.rid) ?? false)
-              .toList(),
-          video: attachments
-              .where((ele) => ele?.rid == out[i].body['video'])
-              .firstOrNull,
-          poll: poll,
-          realm: realm,
-        ),
-      );
-    }
-
-    uids.addAll(
-        attachments.where((ele) => ele != null).map((ele) => ele!.accountId));
-    await _ud.listAccount(uids);
-
     return out;
   }
 
   Future<SnPost> _preloadRelatedDataSingle(SnPost out) async {
-    Set<String> rids = {};
-    Set<int> uids = {};
-    rids.addAll(out.body['attachments']?.cast<String>() ?? []);
-    if (out.body['thumbnail'] != null) {
-      rids.add(out.body['thumbnail']);
-    }
-    if (out.body['video'] != null) {
-      rids.add(out.body['video']);
-    }
-    if (out.repostTo != null) {
-      out = out.copyWith(
-        repostTo: await _preloadRelatedDataSingle(out.repostTo!),
-      );
-    }
-    if (out.publisher.type == 0) {
-      uids.add(out.publisher.accountId);
-    }
-
-    final attachments = await _attach.getMultiple(rids.toList());
-
-    SnPoll? poll;
-    SnRealm? realm;
-    if (out.pollId != null) {
-      poll = await _fetchPoll(out.pollId!);
-    }
-    if (out.realmId != null) {
-      realm = await _realm.getRealm(out.realmId!);
-    }
-
-    out = out.copyWith(
-      preload: SnPostPreload(
-        thumbnail: attachments
-            .where((ele) => ele?.rid == out.body['thumbnail'])
-            .firstOrNull,
-        attachments: attachments
-            .where(
-                (ele) => out.body['attachments']?.contains(ele?.rid) ?? false)
-            .toList(),
-        video: attachments
-            .where((ele) => ele?.rid == out.body['video'])
-            .firstOrNull,
-        poll: poll,
-        realm: realm,
-      ),
-    );
-
-    uids.addAll(
-        attachments.where((ele) => ele != null).map((ele) => ele!.accountId));
-    await _ud.listAccount(uids);
-
     return out;
   }
 
   Future<List<SnPost>> listRecommendations() async {
-    final resp = await _sn.client.get('/cgi/co/recommendations');
+    final resp = await _sn.client.get(
+      '/cgi/co/recommendations',
+      options: Options(headers: {
+        'X-API-Version': '2',
+      }),
+    );
     final out = _preloadRelatedDataInBatch(
       List.from(resp.data.map((ele) => SnPost.fromJson(ele))),
     );
@@ -146,11 +33,14 @@ class SnPostContentProvider {
   }
 
   Future<List<SnFeedEntry>> getFeed({int take = 20, DateTime? cursor}) async {
-    final resp =
-        await _sn.client.get('/cgi/co/recommendations/feed', queryParameters: {
-      'take': take,
-      if (cursor != null) 'cursor': cursor.toUtc().millisecondsSinceEpoch,
-    });
+    final resp = await _sn.client.get(
+      '/cgi/co/recommendations/feed',
+      queryParameters: {
+        'take': take,
+        if (cursor != null) 'cursor': cursor.toUtc().millisecondsSinceEpoch,
+      },
+      options: Options(headers: {'X-API-Version': '2'}),
+    );
     final List<SnFeedEntry> out =
         List.from(resp.data.map((ele) => SnFeedEntry.fromJson(ele)));
 
@@ -202,6 +92,9 @@ class SnPostContentProvider {
         if (realm != null) 'realm': realm,
         if (channel != null) 'channel': channel,
       },
+      options: Options(headers: {
+        'X-API-Version': '2',
+      }),
     );
     final List<SnPost> out = await _preloadRelatedDataInBatch(
       List.from(resp.data['data']?.map((e) => SnPost.fromJson(e)) ?? []),
@@ -215,11 +108,16 @@ class SnPostContentProvider {
     int take = 10,
     int offset = 0,
   }) async {
-    final resp = await _sn.client
-        .get('/cgi/co/posts/$parentId/replies', queryParameters: {
-      'take': take,
-      'offset': offset,
-    });
+    final resp = await _sn.client.get(
+      '/cgi/co/posts/$parentId/replies',
+      queryParameters: {
+        'take': take,
+        'offset': offset,
+      },
+      options: Options(headers: {
+        'X-API-Version': '2',
+      }),
+    );
     final List<SnPost> out = await _preloadRelatedDataInBatch(
       List.from(resp.data['data']?.map((e) => SnPost.fromJson(e)) ?? []),
     );
@@ -234,13 +132,20 @@ class SnPostContentProvider {
     Iterable<String>? tags,
     Iterable<String>? categories,
   }) async {
-    final resp = await _sn.client.get('/cgi/co/posts/search', queryParameters: {
-      'take': take,
-      'offset': offset,
-      'probe': searchTerm,
-      if (tags?.isNotEmpty ?? false) 'tags': tags!.join(','),
-      if (categories?.isNotEmpty ?? false) 'categories': categories!.join(','),
-    });
+    final resp = await _sn.client.get(
+      '/cgi/co/posts/search',
+      queryParameters: {
+        'take': take,
+        'offset': offset,
+        'probe': searchTerm,
+        if (tags?.isNotEmpty ?? false) 'tags': tags!.join(','),
+        if (categories?.isNotEmpty ?? false)
+          'categories': categories!.join(','),
+      },
+      options: Options(headers: {
+        'X-API-Version': '2',
+      }),
+    );
     final List<SnPost> out = await _preloadRelatedDataInBatch(
       List.from(resp.data['data']?.map((e) => SnPost.fromJson(e)) ?? []),
     );
@@ -249,7 +154,12 @@ class SnPostContentProvider {
   }
 
   Future<SnPost> getPost(dynamic id) async {
-    final resp = await _sn.client.get('/cgi/co/posts/$id');
+    final resp = await _sn.client.get(
+      '/cgi/co/posts/$id',
+      options: Options(headers: {
+        'X-API-Version': '2',
+      }),
+    );
     final out = _preloadRelatedDataSingle(
       SnPost.fromJson(resp.data),
     );

lib/providers/sn_attachment.dart

@@ -120,6 +120,25 @@ class SnAttachmentProvider {
     'webp': 'image/webp',
   };
 
+  Future<SnAttachment> createWithReferenceLink(
+    String url,
+    String pool,
+    Map<String, dynamic>? metadata, {
+    String? mimetype,
+  }) async {
+    final resp = await _sn.client.post(
+      '/cgi/uc/attachments/referenced',
+      data: {
+        'url': url,
+        'pool': pool,
+        'metadata': metadata,
+        if (mimetype != null) 'mimetype': mimetype,
+      },
+    );
+
+    return SnAttachment.fromJson(resp.data);
+  }
+
   Future<SnAttachment> directUploadOne(
     Uint8List data,
     String filename,
@@ -311,6 +330,23 @@ class SnAttachmentProvider {
     return out;
   }
 
+  Future<SnAttachment> rateOne(
+    SnAttachment item, {
+    int? content,
+    int? quality,
+  }) async {
+    final resp = await _sn.client.put(
+      '/cgi/uc/attachments/${item.id}/rating',
+      data: {
+        'content_rating': content ?? item.contentRating,
+        'quality_rating': quality ?? item.qualityRating,
+      },
+    );
+    final out = SnAttachment.fromJson(resp.data);
+    _saveToLocal([out]);
+    return out;
+  }
+
   Future<void> _saveToLocal(Iterable<SnAttachment> out) async {
     for (final ele in out) {
       if (!ele.isAnalyzed || ele.destination == 0) continue;

lib/providers/sn_network.dart

@@ -249,8 +249,11 @@ class SnNetworkProvider {
     return null;
   }
 
-  String getAttachmentUrl(String ky) {
+  String getAttachmentUrl(String ky, {bool preview = true}) {
     if (ky.startsWith("http")) return ky;
+    if (!preview) {
+      return '${client.options.baseUrl}/cgi/uc/attachments/$ky?preview=false';
+    }
     return '${client.options.baseUrl}/cgi/uc/attachments/$ky';
   }
 

lib/providers/sn_realm.dart

@@ -8,7 +8,7 @@ import 'package:surface/providers/database.dart';
 import 'package:surface/providers/sn_network.dart';
 import 'package:surface/types/realm.dart';
 
-class SnRealmProvider {
+class SnRealmProvider extends ChangeNotifier {
   late final SnNetworkProvider _sn;
   late final DatabaseProvider _dt;
 
@@ -39,6 +39,11 @@ class SnRealmProvider {
     return out;
   }
 
+  void addAvailableRealm(SnRealm realm) {
+    _availableRealms.add(realm);
+    notifyListeners();
+  }
+
   Future<SnRealm> getRealm(dynamic aliasOrId) async {
     if (_cache.containsKey(aliasOrId.toString())) {
       return _cache[aliasOrId.toString()]!;

lib/providers/translation.dart

@@ -4,8 +4,7 @@ import 'package:crypto/crypto.dart';
 import 'package:dio/dio.dart';
 import 'package:surface/logger.dart';
 
-// TODO self host translate api
-const kTranslateApiBaseUrl = 'https://translate.disroot.org';
+const kTranslateApiBaseUrl = 'https://translate.solsynth.dev';
 
 class SnTranslator {
   final Dio client = Dio(

lib/providers/userinfo.dart

@@ -64,6 +64,7 @@ class UserProvider extends ChangeNotifier {
   }
 
   Future<SnAccount?> refreshUser() async {
+    if (!isAuthorized) return null;
     final resp = await _sn.client.get('/cgi/id/users/me');
     final out = SnAccount.fromJson(resp.data);
 

lib/router.dart

@@ -1,9 +1,9 @@
-import 'package:animations/animations.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:surface/screens/abuse_report.dart';
 import 'package:surface/screens/account.dart';
-import 'package:surface/screens/account/account_settings.dart';
+import 'package:surface/screens/account/punishments.dart';
+import 'package:surface/screens/account/settings.dart';
 import 'package:surface/screens/account/action_events.dart';
 import 'package:surface/screens/account/badges.dart';
 import 'package:surface/screens/account/contact_methods.dart';
@@ -13,6 +13,7 @@ import 'package:surface/screens/account/prefs/notify.dart';
 import 'package:surface/screens/account/prefs/security.dart';
 import 'package:surface/screens/account/profile_page.dart';
 import 'package:surface/screens/account/profile_edit.dart';
+import 'package:surface/screens/account/programs.dart';
 import 'package:surface/screens/account/publishers/publisher_edit.dart';
 import 'package:surface/screens/account/publishers/publisher_new.dart';
 import 'package:surface/screens/account/publishers/publishers.dart';
@@ -21,7 +22,6 @@ import 'package:surface/screens/album.dart';
 import 'package:surface/screens/auth/login.dart';
 import 'package:surface/screens/auth/register.dart';
 import 'package:surface/screens/chat.dart';
-import 'package:surface/screens/chat/call_room.dart';
 import 'package:surface/screens/chat/channel_detail.dart';
 import 'package:surface/screens/chat/manage.dart';
 import 'package:surface/screens/chat/room.dart';
@@ -29,8 +29,7 @@ import 'package:surface/screens/explore.dart';
 import 'package:surface/screens/friend.dart';
 import 'package:surface/screens/home.dart';
 import 'package:surface/screens/logging.dart';
-import 'package:surface/screens/news/news_detail.dart';
-import 'package:surface/screens/news/news_list.dart';
+import 'package:surface/screens/feed/feed_detail.dart';
 import 'package:surface/screens/notification.dart';
 import 'package:surface/screens/post/post_detail.dart';
 import 'package:surface/screens/post/post_draft.dart';
@@ -52,16 +51,6 @@ import 'package:surface/types/post.dart';
 import 'package:surface/widgets/about.dart';
 import 'package:surface/widgets/navigation/app_scaffold.dart';
 
-Widget _fadeThroughTransition(BuildContext context, Animation<double> animation,
-    Animation<double> secondaryAnimation, Widget child) {
-  return FadeThroughTransition(
-    animation: animation,
-    secondaryAnimation: secondaryAnimation,
-    fillColor: Colors.transparent,
-    child: child,
-  );
-}
-
 final _appRoutes = [
   GoRoute(
     path: '/',
@@ -70,8 +59,8 @@ final _appRoutes = [
   ),
   GoRoute(
     path: '/posts',
-    name: 'explore',
-    builder: (context, state) => const ExploreScreen(),
+    name: 'posts',
+    builder: (_, __) => const SizedBox.shrink(),
     routes: [
       GoRoute(
         path: '/draft',
@@ -109,156 +98,200 @@ final _appRoutes = [
               state.uri.queryParameters['categories']?.split(','),
         ),
       ),
+    ],
+  ),
+  ShellRoute(
+    builder: (context, state, child) => ResponsiveScaffold(
+      asideFlex: 2,
+      contentFlex: 3,
+      aside: const ExploreScreen(),
+      child: child,
+    ),
+    routes: [
+      GoRoute(
+        path: '/explore',
+        name: 'explore',
+        builder: (context, state) => const ResponsiveScaffoldLanding(
+          child: ExploreScreen(),
+        ),
+      ),
+      GoRoute(
+        path: '/posts/:slug',
+        name: 'postDetail',
+        builder: (context, state) => PostDetailScreen(
+          key: ValueKey(state.pathParameters['slug']!),
+          slug: state.pathParameters['slug']!,
+          preload: state.extra as SnPost?,
+        ),
+      ),
+      GoRoute(
+        path: '/pages/:id',
+        name: 'readerFeedDetail',
+        builder: (context, state) => ReaderPageScreen(
+          id: state.pathParameters['id']!,
+        ),
+      ),
       GoRoute(
         path: '/publishers/:name',
         name: 'postPublisher',
         builder: (context, state) =>
             PostPublisherScreen(name: state.pathParameters['name']!),
       ),
-      GoRoute(
-        path: '/:slug',
-        name: 'postDetail',
-        builder: (context, state) => PostDetailScreen(
-          slug: state.pathParameters['slug']!,
-          preload: state.extra as SnPost?,
-        ),
-      ),
     ],
   ),
-  GoRoute(
-    path: '/account',
-    name: 'account',
-    builder: (context, state) => const AccountScreen(),
+  ShellRoute(
+    builder: (context, state, child) => ResponsiveScaffold(
+      aside: const AccountScreen(),
+      child: child,
+    ),
     routes: [
       GoRoute(
-        path: '/contacts',
-        name: 'accountContactMethods',
-        builder: (context, state) => const AccountContactMethod(),
-      ),
-      GoRoute(
-        path: '/events',
-        name: 'accountActionEvents',
-        builder: (context, state) => const ActionEventScreen(),
-      ),
-      GoRoute(
-        path: '/tickets',
-        name: 'accountAuthTickets',
-        builder: (context, state) => const AccountAuthTicket(),
-      ),
-      GoRoute(
-        path: '/badges',
-        name: 'accountBadges',
-        builder: (context, state) => const AccountBadgesScreen(),
-      ),
-      GoRoute(
-        path: '/wallet',
-        name: 'accountWallet',
-        builder: (context, state) => const WalletScreen(),
-      ),
-      GoRoute(
-        path: '/keypairs',
-        name: 'accountKeyPairs',
-        builder: (context, state) => const KeyPairScreen(),
-      ),
-      GoRoute(
-        path: '/settings',
-        name: 'accountSettings',
-        builder: (context, state) => AccountSettingsScreen(),
+        path: '/account',
+        name: 'account',
+        builder: (context, state) =>
+            const ResponsiveScaffoldLanding(child: AccountScreen()),
         routes: [
           GoRoute(
-            path: '/notify',
-            name: 'accountSettingsNotify',
-            builder: (context, state) => const AccountNotifyPrefsScreen(),
+            path: '/punishments',
+            name: 'accountPunishments',
+            builder: (context, state) => const PunishmentsScreen(),
           ),
           GoRoute(
-            path: '/auth',
-            name: 'accountSettingsSecurity',
-            builder: (context, state) => const AccountSecurityPrefsScreen(),
+            path: '/programs',
+            name: 'accountProgram',
+            builder: (context, state) => const AccountProgramScreen(),
+          ),
+          GoRoute(
+            path: '/contacts',
+            name: 'accountContactMethods',
+            builder: (context, state) => const AccountContactMethod(),
+          ),
+          GoRoute(
+            path: '/events',
+            name: 'accountActionEvents',
+            builder: (context, state) => const ActionEventScreen(),
+          ),
+          GoRoute(
+            path: '/tickets',
+            name: 'accountAuthTickets',
+            builder: (context, state) => const AccountAuthTicket(),
+          ),
+          GoRoute(
+            path: '/badges',
+            name: 'accountBadges',
+            builder: (context, state) => const AccountBadgesScreen(),
+          ),
+          GoRoute(
+            path: '/wallet',
+            name: 'accountWallet',
+            builder: (context, state) => const WalletScreen(),
+          ),
+          GoRoute(
+            path: '/keypairs',
+            name: 'accountKeyPairs',
+            builder: (context, state) => const KeyPairScreen(),
+          ),
+          GoRoute(
+            path: '/settings',
+            name: 'accountSettings',
+            builder: (context, state) => AccountSettingsScreen(),
+            routes: [
+              GoRoute(
+                path: '/notify',
+                name: 'accountSettingsNotify',
+                builder: (context, state) => const AccountNotifyPrefsScreen(),
+              ),
+              GoRoute(
+                path: '/auth',
+                name: 'accountSettingsSecurity',
+                builder: (context, state) => const AccountSecurityPrefsScreen(),
+              ),
+            ],
+          ),
+          GoRoute(
+            path: '/settings/factors',
+            name: 'factorSettings',
+            builder: (context, state) => FactorSettingsScreen(),
+          ),
+          GoRoute(
+            path: '/profile/edit',
+            name: 'accountProfileEdit',
+            builder: (context, state) => ProfileEditScreen(),
+          ),
+          GoRoute(
+            path: '/publishers',
+            name: 'accountPublishers',
+            builder: (context, state) => PublisherScreen(),
+          ),
+          GoRoute(
+            path: '/publishers/new',
+            name: 'accountPublisherNew',
+            builder: (context, state) => AccountPublisherNewScreen(),
+          ),
+          GoRoute(
+            path: '/publishers/edit/:name',
+            name: 'accountPublisherEdit',
+            builder: (context, state) => AccountPublisherEditScreen(
+              name: state.pathParameters['name']!,
+            ),
           ),
         ],
       ),
-      GoRoute(
-        path: '/settings/factors',
-        name: 'factorSettings',
-        builder: (context, state) => FactorSettingsScreen(),
-      ),
-      GoRoute(
-        path: '/profile/edit',
-        name: 'accountProfileEdit',
-        builder: (context, state) => ProfileEditScreen(),
-      ),
-      GoRoute(
-        path: '/publishers',
-        name: 'accountPublishers',
-        builder: (context, state) => PublisherScreen(),
-      ),
-      GoRoute(
-        path: '/publishers/new',
-        name: 'accountPublisherNew',
-        builder: (context, state) => AccountPublisherNewScreen(),
-      ),
-      GoRoute(
-        path: '/publishers/edit/:name',
-        name: 'accountPublisherEdit',
-        builder: (context, state) => AccountPublisherEditScreen(
-          name: state.pathParameters['name']!,
-        ),
-      ),
-      GoRoute(
-        path: '/profile/:name',
-        name: 'accountProfilePage',
-        pageBuilder: (context, state) => NoTransitionPage(
-          child: UserScreen(name: state.pathParameters['name']!),
-        ),
-      ),
     ],
   ),
   GoRoute(
-    path: '/chat',
-    name: 'chat',
-    builder: (context, state) => const ChatScreen(),
+    path: '/accounts/:name',
+    name: 'accountProfilePage',
+    pageBuilder: (context, state) => NoTransitionPage(
+      child: UserScreen(name: state.pathParameters['name']!),
+    ),
+  ),
+  ShellRoute(
+    builder: (context, state, child) =>
+        ResponsiveScaffold(aside: const ChatScreen(), child: child),
     routes: [
       GoRoute(
-        path: '/:scope/:alias',
-        name: 'chatRoom',
-        builder: (context, state) => ChatRoomScreen(
-          scope: state.pathParameters['scope']!,
-          alias: state.pathParameters['alias']!,
-          extra: state.extra as ChatRoomScreenExtra?,
-        ),
-      ),
-      GoRoute(
-        path: '/:scope/:alias/call',
-        name: 'chatCallRoom',
-        builder: (context, state) => CallRoomScreen(
-          scope: state.pathParameters['scope']!,
-          alias: state.pathParameters['alias']!,
-        ),
-      ),
-      GoRoute(
-        path: '/:scope/:alias/detail',
-        name: 'channelDetail',
-        builder: (context, state) => ChannelDetailScreen(
-          scope: state.pathParameters['scope']!,
-          alias: state.pathParameters['alias']!,
-        ),
-      ),
-      GoRoute(
-        path: '/manage',
-        name: 'chatManage',
-        builder: (context, state) => ChatManageScreen(
-          editingChannelAlias: state.uri.queryParameters['editing'],
+        path: '/chat',
+        name: 'chat',
+        builder: (context, state) => const ResponsiveScaffoldLanding(
+          child: ChatScreen(),
         ),
+        routes: [
+          GoRoute(
+            path: '/:scope/:alias',
+            name: 'chatRoom',
+            builder: (context, state) => ChatRoomScreen(
+              key: ValueKey(
+                '${state.pathParameters['scope']!}:${state.pathParameters['alias']!}',
+              ),
+              scope: state.pathParameters['scope']!,
+              alias: state.pathParameters['alias']!,
+              extra: state.extra as ChatRoomScreenExtra?,
+            ),
+          ),
+          GoRoute(
+            path: '/:scope/:alias/detail',
+            name: 'channelDetail',
+            builder: (context, state) => ChannelDetailScreen(
+              scope: state.pathParameters['scope']!,
+              alias: state.pathParameters['alias']!,
+            ),
+          ),
+          GoRoute(
+            path: '/manage',
+            name: 'chatManage',
+            builder: (context, state) => ChatManageScreen(
+              editingChannelAlias: state.uri.queryParameters['editing'],
+            ),
+          ),
+        ],
       ),
     ],
   ),
   GoRoute(
     path: '/realm',
     name: 'realm',
-    pageBuilder: (context, state) => CustomTransitionPage(
-      transitionsBuilder: _fadeThroughTransition,
-      child: const RealmScreen(),
-    ),
+    builder: (context, state) => const RealmScreen(),
     routes: [
       GoRoute(
         path: '/:alias/community',
@@ -287,20 +320,6 @@ final _appRoutes = [
       ),
     ],
   ),
-  GoRoute(
-    path: '/news',
-    name: 'news',
-    builder: (context, state) => const NewsScreen(),
-    routes: [
-      GoRoute(
-        path: '/:hash',
-        name: 'newsDetail',
-        builder: (context, state) => NewsDetailScreen(
-          hash: state.pathParameters['hash']!,
-        ),
-      ),
-    ],
-  ),
   GoRoute(
     path: '/stickers',
     name: 'stickers',
@@ -371,4 +390,10 @@ final appRouter = GoRouter(
       ),
     ),
   ],
+  onException: (context, state, router) {
+    if (state.error is GoException) {
+      router.goNamed('/');
+    }
+  },
+  navigatorKey: GlobalKey(),
 );

lib/screens/account.dart

@@ -8,13 +8,13 @@ import 'package:material_symbols_icons/symbols.dart';
 import 'package:provider/provider.dart';
 import 'package:styled_widget/styled_widget.dart';
 import 'package:surface/providers/database.dart';
+import 'package:surface/providers/navigation.dart';
 import 'package:surface/providers/sn_network.dart';
 import 'package:surface/providers/userinfo.dart';
 import 'package:surface/providers/websocket.dart';
 import 'package:surface/types/account.dart';
 import 'package:surface/widgets/account/account_image.dart';
 import 'package:surface/widgets/account/account_status.dart';
-import 'package:surface/widgets/app_bar_leading.dart';
 import 'package:surface/widgets/dialog.dart';
 import 'package:surface/widgets/navigation/app_scaffold.dart';
 import 'package:surface/widgets/universal_image.dart';
@@ -22,27 +22,97 @@ import 'package:surface/widgets/universal_image.dart';
 class AccountScreen extends StatelessWidget {
   const AccountScreen({super.key});
 
+  static const List<AppNavListItem> kNavList = [
+    AppNavListItem(
+      title: "accountPublishers",
+      subtitle: "accountPublishersSubtitle",
+      screen: "accountPublishers",
+      icon: Symbols.face,
+    ),
+    AppNavListItem(
+      title: "accountProgram",
+      subtitle: "accountProgramDescription",
+      screen: "accountProgram",
+      icon: Symbols.communities,
+    ),
+    AppNavListItem(
+      title: "friends",
+      subtitle: "friendsDescription",
+      screen: "friend",
+      icon: Symbols.person,
+    ),
+    AppNavListItem(
+      title: "album",
+      subtitle: "albumDescription",
+      screen: "album",
+      icon: Symbols.photo_library,
+    ),
+    AppNavListItem(
+      title: "stickers",
+      subtitle: "stickersDescription",
+      screen: "stickers",
+      icon: Symbols.emoji_emotions,
+    ),
+    AppNavListItem(
+      title: "accountWallet",
+      subtitle: "accountWalletSubtitle",
+      screen: "accountWallet",
+      icon: Symbols.wallet,
+    ),
+    AppNavListItem(
+      title: "accountBadges",
+      subtitle: "accountBadgesDescription",
+      screen: "accountBadges",
+      icon: Symbols.award_star,
+    ),
+    AppNavListItem(
+      title: "accountKeyPairs",
+      subtitle: "accountKeyPairsDescription",
+      screen: "accountKeyPairs",
+      icon: Symbols.key,
+    ),
+    AppNavListItem(
+      title: "accountPunishments",
+      subtitle: "accountPunishmentsDescription",
+      screen: "accountPunishments",
+      icon: Symbols.credit_score,
+    ),
+    AppNavListItem(
+      title: "accountActionEvent",
+      subtitle: "accountActionEventDescription",
+      screen: "accountActionEvents",
+      icon: Symbols.history,
+    ),
+    AppNavListItem(
+      title: "accountAuthTickets",
+      subtitle: "accountAuthTicketsDescription",
+      screen: "accountAuthTickets",
+      icon: Symbols.confirmation_number,
+    ),
+    AppNavListItem(
+      title: "accountSettings",
+      subtitle: "accountSettingsSubtitle",
+      screen: "accountSettings",
+      icon: Symbols.manage_accounts,
+    ),
+    AppNavListItem(
+      title: "abuseReport",
+      subtitle: "abuseReportActionDescription",
+      screen: "abuseReport",
+      icon: Symbols.flag,
+    ),
+  ];
+
   @override
   Widget build(BuildContext context) {
     final ua = context.watch<UserProvider>();
     final sn = context.read<SnNetworkProvider>();
 
     return AppScaffold(
+      noBackground: ResponsiveScaffold.getIsExpand(context),
       appBar: AppBar(
-        leading: AutoAppBarLeading(),
-        title: Text(
-          "screenAccount",
-          style: TextStyle(
-            color: Colors.white,
-            shadows: [
-              Shadow(
-                offset: Offset(1, 1),
-                blurRadius: 5.0,
-                color: Color.fromARGB(255, 0, 0, 0),
-              ),
-            ],
-          ),
-        ).tr(),
+        leading: const PageBackButton(),
+        title: Text("screenAccount").tr(),
         flexibleSpace: ua.user != null && ua.user!.banner.isNotEmpty
             ? Stack(
                 fit: StackFit.expand,
@@ -71,15 +141,6 @@ class AccountScreen extends StatelessWidget {
                 ],
               )
             : null,
-        actions: [
-          IconButton(
-            icon: const Icon(Symbols.settings, fill: 1),
-            onPressed: () {
-              GoRouter.of(context).pushNamed('settings');
-            },
-          ),
-          const Gap(8),
-        ],
       ),
       body: SingleChildScrollView(
         child: ua.isAuthorized
@@ -118,7 +179,18 @@ class _AuthorizedAccountScreen extends StatelessWidget {
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
-                      AccountImage(content: ua.user!.avatar, radius: 28),
+                      GestureDetector(
+                        child: AccountImage(
+                          content: ua.user!.avatar,
+                          radius: 28,
+                        ),
+                        onTap: () {
+                          GoRouter.of(context)
+                              .pushNamed('accountProfilePage', pathParameters: {
+                            'name': ua.user!.name,
+                          });
+                        },
+                      ),
                       _AccountStatusWidget(account: ua.user!),
                     ],
                   ),
@@ -147,115 +219,42 @@ class _AuthorizedAccountScreen extends StatelessWidget {
             );
           }).padding(all: 20),
         ).padding(horizontal: 8, top: 16, bottom: 4),
-        ListTile(
-          title: Text('accountPublishers').tr(),
-          subtitle: Text('accountPublishersSubtitle').tr(),
-          contentPadding: const EdgeInsets.symmetric(horizontal: 24),
-          leading: const Icon(Symbols.face),
-          trailing: const Icon(Symbols.chevron_right),
-          onTap: () {
-            GoRouter.of(context).pushNamed('accountPublishers');
-          },
-        ),
-        ListTile(
-          title: Text('abuseReport').tr(),
-          subtitle: Text('abuseReportActionDescription').tr(),
-          contentPadding: const EdgeInsets.symmetric(horizontal: 24),
-          leading: const Icon(Symbols.flag),
-          trailing: const Icon(Symbols.chevron_right),
-          onTap: () {
-            GoRouter.of(context).pushNamed('abuseReport');
-          },
-        ),
-        ListTile(
-          title: Text('factorSettings').tr(),
-          subtitle: Text('factorSettingsSubtitle').tr(),
-          contentPadding: const EdgeInsets.symmetric(horizontal: 24),
-          leading: const Icon(Symbols.lock),
-          trailing: const Icon(Symbols.chevron_right),
-          onTap: () {
-            GoRouter.of(context).pushNamed('factorSettings');
-          },
-        ),
-        ListTile(
-          title: Text('accountWallet').tr(),
-          subtitle: Text('accountWalletSubtitle').tr(),
-          contentPadding: const EdgeInsets.symmetric(horizontal: 24),
-          leading: const Icon(Symbols.wallet),
-          trailing: const Icon(Symbols.chevron_right),
-          onTap: () {
-            GoRouter.of(context).pushNamed('accountWallet');
-          },
-        ),
-        ListTile(
-          title: Text('accountBadges').tr(),
-          subtitle: Text('accountBadgesDescription').tr(),
-          contentPadding: const EdgeInsets.symmetric(horizontal: 24),
-          leading: const Icon(Symbols.award_star),
-          trailing: const Icon(Symbols.chevron_right),
-          onTap: () {
-            GoRouter.of(context).pushNamed('accountBadges');
-          },
-        ),
-        ListTile(
-          title: Text('accountKeyPairs').tr(),
-          subtitle: Text('accountKeyPairsDescription').tr(),
-          contentPadding: const EdgeInsets.symmetric(horizontal: 24),
-          leading: const Icon(Symbols.key),
-          trailing: const Icon(Symbols.chevron_right),
-          onTap: () {
-            GoRouter.of(context).pushNamed('accountKeyPairs');
-          },
-        ),
-        ListTile(
-          title: Text('accountActionEvent').tr(),
-          subtitle: Text('accountActionEventDescription').tr(),
-          contentPadding: const EdgeInsets.symmetric(horizontal: 24),
-          leading: const Icon(Symbols.history),
-          trailing: const Icon(Symbols.chevron_right),
-          onTap: () {
-            GoRouter.of(context).pushNamed('accountActionEvents');
-          },
-        ),
-        ListTile(
-          title: Text('accountAuthTickets').tr(),
-          subtitle: Text('accountAuthTicketsDescription').tr(),
-          contentPadding: const EdgeInsets.symmetric(horizontal: 24),
-          leading: const Icon(Symbols.confirmation_number),
-          trailing: const Icon(Symbols.chevron_right),
-          onTap: () {
-            GoRouter.of(context).pushNamed('accountAuthTickets');
-          },
-        ),
-        ListTile(
-          title: Text('accountSettings').tr(),
-          subtitle: Text('accountSettingsSubtitle').tr(),
-          contentPadding: const EdgeInsets.symmetric(horizontal: 24),
-          leading: const Icon(Symbols.manage_accounts),
-          trailing: const Icon(Symbols.chevron_right),
-          onTap: () {
-            GoRouter.of(context).pushNamed('accountSettings');
-          },
-        ),
-        ListTile(
-          title: Text('accountLogout').tr(),
-          subtitle: Text('accountLogoutSubtitle').tr(),
-          contentPadding: const EdgeInsets.symmetric(horizontal: 24),
-          leading: const Icon(Symbols.logout),
-          trailing: const Icon(Symbols.chevron_right),
-          onTap: () async {
-            final confirm = await context.showConfirmDialog(
-              'accountLogoutConfirmTitle'.tr(),
-              'accountLogoutConfirm'.tr(),
-            );
+        for (final item in AccountScreen.kNavList)
+          Tooltip(
+            message: item.subtitle.tr(),
+            child: ListTile(
+              minTileHeight: 48,
+              title: Text(item.title).tr(),
+              contentPadding: const EdgeInsets.symmetric(horizontal: 24),
+              leading: Icon(item.icon),
+              trailing: const Icon(Symbols.chevron_right),
+              onTap: () {
+                GoRouter.of(context).pushNamed(item.screen);
+              },
+            ),
+          ),
+        Tooltip(
+          message: 'accountLogoutSubtitle'.tr(),
+          child: ListTile(
+            title: Text('accountLogout').tr(),
+            minTileHeight: 48,
+            contentPadding: const EdgeInsets.symmetric(horizontal: 24),
+            leading: const Icon(Symbols.logout),
+            trailing: const Icon(Symbols.chevron_right),
+            onTap: () async {
+              final confirm = await context.showConfirmDialog(
+                'accountLogoutConfirmTitle'.tr(),
+                'accountLogoutConfirm'.tr(),
+              );
 
-            if (!confirm) return;
-            if (!context.mounted) return;
-            ua.logoutUser();
-            final ws = context.read<WebSocketProvider>();
-            ws.disconnect();
-            context.read<DatabaseProvider>().removeDatabase();
-          },
+              if (!confirm) return;
+              if (!context.mounted) return;
+              ua.logoutUser();
+              final ws = context.read<WebSocketProvider>();
+              ws.disconnect();
+              context.read<DatabaseProvider>().removeDatabase();
+            },
+          ),
         ),
       ],
     );
@@ -295,14 +294,7 @@ class _UnauthorizedAccountScreen extends StatelessWidget {
           leading: const Icon(Symbols.login),
           trailing: const Icon(Symbols.chevron_right),
           onTap: () {
-            GoRouter.of(context).pushNamed('authLogin').then((value) {
-              if (value == true && context.mounted) {
-                final ua = context.read<UserProvider>();
-                context.showSnackbar('loginSuccess'.tr(args: [
-                  '@${ua.user?.name} (${ua.user?.nick})',
-                ]));
-              }
-            });
+            GoRouter.of(context).pushNamed('authLogin');
           },
         ),
         ListTile(

lib/screens/account/action_events.dart

@@ -59,6 +59,7 @@ class _ActionEventScreenState extends State<ActionEventScreen> {
   @override
   Widget build(BuildContext context) {
     return AppScaffold(
+      noBackground: ResponsiveScaffold.getIsExpand(context),
       appBar: AppBar(
         leading: const PageBackButton(),
         title: Text('accountActionEvent').tr(),

lib/screens/account/auth_tickets.dart

@@ -91,6 +91,7 @@ class _AccountAuthTicketState extends State<AccountAuthTicket> {
   @override
   Widget build(BuildContext context) {
     return AppScaffold(
+      noBackground: ResponsiveScaffold.getIsExpand(context),
       appBar: AppBar(
         leading: const PageBackButton(),
         title: Text('accountAuthTickets').tr(),

lib/screens/account/badges.dart

@@ -70,6 +70,7 @@ class _AccountBadgesScreenState extends State<AccountBadgesScreen> {
   @override
   Widget build(BuildContext context) {
     return AppScaffold(
+      noBackground: ResponsiveScaffold.getIsExpand(context),
       appBar: AppBar(
         title: Text('screenAccountBadges').tr(),
       ),

lib/screens/account/contact_methods.dart

@@ -69,6 +69,7 @@ class _AccountContactMethodState extends State<AccountContactMethod> {
   @override
   Widget build(BuildContext context) {
     return AppScaffold(
+      noBackground: ResponsiveScaffold.getIsExpand(context),
       appBar: AppBar(
         leading: const PageBackButton(),
         title: Text('accountContactMethods').tr(),

lib/screens/account/factor_settings.dart

@@ -16,7 +16,11 @@ final Map<int, (String, String, IconData)> kFactorTypes = {
   0: ('authFactorPassword', 'authFactorPasswordDescription', Symbols.password),
   1: ('authFactorEmail', 'authFactorEmailDescription', Symbols.email),
   2: ('authFactorTOTP', 'authFactorTOTPDescription', Symbols.timer),
-  3: ('authFactorInAppNotify', 'authFactorInAppNotifyDescription', Symbols.notifications_active),
+  3: (
+    'authFactorInAppNotify',
+    'authFactorInAppNotifyDescription',
+    Symbols.notifications_active
+  ),
 };
 
 class FactorSettingsScreen extends StatefulWidget {
@@ -36,7 +40,10 @@ class _FactorSettingsScreenState extends State<FactorSettingsScreen> {
       final sn = context.read<SnNetworkProvider>();
       final resp = await sn.client.get('/cgi/id/users/me/factors');
       _factors = List<SnAuthFactor>.from(
-        resp.data?.map((e) => SnAuthFactor.fromJson(e as Map<String, dynamic>)).toList() ?? [],
+        resp.data
+                ?.map((e) => SnAuthFactor.fromJson(e as Map<String, dynamic>))
+                .toList() ??
+            [],
       );
     } catch (err) {
       if (!mounted) return;
@@ -55,6 +62,7 @@ class _FactorSettingsScreenState extends State<FactorSettingsScreen> {
   @override
   Widget build(BuildContext context) {
     return AppScaffold(
+      noBackground: ResponsiveScaffold.getIsExpand(context),
       appBar: AppBar(
         leading: PageBackButton(),
         title: Text('screenFactorSettings').tr(),
@@ -96,7 +104,8 @@ class _FactorSettingsScreenState extends State<FactorSettingsScreen> {
                     return ListTile(
                       title: Text(kFactorTypes[ele.type]!.$1).tr(),
                       subtitle: Text(kFactorTypes[ele.type]!.$2).tr(),
-                      contentPadding: const EdgeInsets.only(left: 24, right: 12),
+                      contentPadding:
+                          const EdgeInsets.only(left: 24, right: 12),
                       leading: Icon(kFactorTypes[ele.type]!.$3),
                       trailing: IconButton(
                         icon: const Icon(Symbols.close),
@@ -105,14 +114,17 @@ class _FactorSettingsScreenState extends State<FactorSettingsScreen> {
                                 context
                                     .showConfirmDialog(
                                   'authFactorDelete'.tr(),
-                                  'authFactorDeleteDescription'.tr(args: [kFactorTypes[ele.type]!.$1.tr()]),
+                                  'authFactorDeleteDescription'.tr(
+                                      args: [kFactorTypes[ele.type]!.$1.tr()]),
                                 )
                                     .then((val) async {
                                   if (!val) return;
                                   try {
                                     if (!context.mounted) return;
-                                    final sn = context.read<SnNetworkProvider>();
-                                    await sn.client.delete('/cgi/id/users/me/factors/${ele.id}');
+                                    final sn =
+                                        context.read<SnNetworkProvider>();
+                                    await sn.client.delete(
+                                        '/cgi/id/users/me/factors/${ele.id}');
                                     _fetchFactors();
                                   } catch (err) {
                                     if (!context.mounted) return;
@@ -191,7 +203,9 @@ class _FactorNewDialogState extends State<_FactorNewDialog> {
               value: _factorType,
               items: kFactorTypes.entries.map(
                 (ele) {
-                  final contains = widget.currentlyHave.map((ele) => ele.type).contains(ele.key);
+                  final contains = widget.currentlyHave
+                      .map((ele) => ele.type)
+                      .contains(ele.key);
                   return DropdownMenuItem<int>(
                     enabled: !contains,
                     value: ele.key,

lib/screens/account/keypairs.dart

@@ -37,6 +37,7 @@ class _KeyPairScreenState extends State<KeyPairScreen> {
   @override
   Widget build(BuildContext context) {
     return AppScaffold(
+      noBackground: ResponsiveScaffold.getIsExpand(context),
       appBar: AppBar(
         title: Text('screenKeyPairs').tr(),
       ),

lib/screens/account/prefs/notify.dart

@@ -75,6 +75,7 @@ class _AccountNotifyPrefsScreenState extends State<AccountNotifyPrefsScreen> {
   @override
   Widget build(BuildContext context) {
     return AppScaffold(
+      noBackground: ResponsiveScaffold.getIsExpand(context),
       appBar: AppBar(
         leading: const PageBackButton(),
         title: Text('accountSettingsNotify').tr(),

lib/screens/account/prefs/security.dart

@@ -70,6 +70,7 @@ class _AccountSecurityPrefsScreenState
   @override
   Widget build(BuildContext context) {
     return AppScaffold(
+      noBackground: ResponsiveScaffold.getIsExpand(context),
       appBar: AppBar(
         leading: const PageBackButton(),
         title: Text('accountSettingsSecurity').tr(),

lib/screens/account/profile_edit.dart

@@ -66,37 +66,40 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {
     _locationController.text = prof.profile!.location;
     _avatar = prof.avatar;
     _banner = prof.banner;
-    _links = prof.profile!.links.entries.map((ele) => (ele.key, ele.value)).toList();
+    _links =
+        prof.profile!.links.entries.map((ele) => (ele.key, ele.value)).toList();
     _birthday = prof.profile!.birthday?.toLocal();
     if (_birthday != null) {
-      _birthdayController.text = DateFormat(_kDateFormat).format(prof.profile!.birthday!.toLocal());
+      _birthdayController.text =
+          DateFormat(_kDateFormat).format(prof.profile!.birthday!.toLocal());
     }
   }
 
   void _selectBirthday() async {
     await showCupertinoModalPopup<DateTime?>(
       context: context,
-      builder:
-          (BuildContext context) => Container(
-            height: 216,
-            padding: const EdgeInsets.only(top: 6.0),
-            margin: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
-            color: Theme.of(context).colorScheme.surface,
-            child: SafeArea(
-              top: false,
-              child: CupertinoDatePicker(
-                initialDateTime: _birthday?.toLocal(),
-                mode: CupertinoDatePickerMode.date,
-                use24hFormat: true,
-                onDateTimeChanged: (DateTime newDate) {
-                  setState(() {
-                    _birthday = newDate;
-                    _birthdayController.text = DateFormat(_kDateFormat).format(_birthday!);
-                  });
-                },
-              ),
-            ),
+      builder: (BuildContext context) => Container(
+        height: 216,
+        padding: const EdgeInsets.only(top: 6.0),
+        margin:
+            EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
+        color: Theme.of(context).colorScheme.surface,
+        child: SafeArea(
+          top: false,
+          child: CupertinoDatePicker(
+            initialDateTime: _birthday?.toLocal(),
+            mode: CupertinoDatePickerMode.date,
+            use24hFormat: true,
+            onDateTimeChanged: (DateTime newDate) {
+              setState(() {
+                _birthday = newDate;
+                _birthdayController.text =
+                    DateFormat(_kDateFormat).format(_birthday!);
+              });
+            },
           ),
+        ),
+      ),
     );
   }
 
@@ -109,29 +112,32 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {
 
     Uint8List? rawBytes;
     if (!skipCrop) {
-      final ImageProvider imageProvider = kIsWeb ? NetworkImage(image.path) : FileImage(File(image.path));
-      final aspectRatios =
-          place == 'banner' ? [CropAspectRatio(width: 16, height: 7)] : [CropAspectRatio(width: 1, height: 1)];
-      final result =
-          (!kIsWeb && (Platform.isIOS || Platform.isMacOS))
-              ? await showCupertinoImageCropper(
-                // ignore: use_build_context_synchronously
-                context,
-                allowedAspectRatios: aspectRatios,
-                imageProvider: imageProvider,
-              )
-              : await showMaterialImageCropper(
-                // ignore: use_build_context_synchronously
-                context,
-                allowedAspectRatios: aspectRatios,
-                imageProvider: imageProvider,
-              );
+      final ImageProvider imageProvider =
+          kIsWeb ? NetworkImage(image.path) : FileImage(File(image.path));
+      final aspectRatios = place == 'banner'
+          ? [CropAspectRatio(width: 16, height: 7)]
+          : [CropAspectRatio(width: 1, height: 1)];
+      final result = (!kIsWeb && (Platform.isIOS || Platform.isMacOS))
+          ? await showCupertinoImageCropper(
+              // ignore: use_build_context_synchronously
+              context,
+              allowedAspectRatios: aspectRatios,
+              imageProvider: imageProvider,
+            )
+          : await showMaterialImageCropper(
+              // ignore: use_build_context_synchronously
+              context,
+              allowedAspectRatios: aspectRatios,
+              imageProvider: imageProvider,
+            );
 
       if (result == null) return;
 
       if (!mounted) return;
       setState(() => _isBusy = true);
-      rawBytes = (await result.uiImage.toByteData(format: ImageByteFormat.png))!.buffer.asUint8List();
+      rawBytes = (await result.uiImage.toByteData(format: ImageByteFormat.png))!
+          .buffer
+          .asUint8List();
     } else {
       if (!mounted) return;
       setState(() => _isBusy = true);
@@ -152,7 +158,8 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {
 
       if (!mounted) return;
       final sn = context.read<SnNetworkProvider>();
-      await sn.client.put('/cgi/id/users/me/$place', data: {'attachment': attachment.rid});
+      await sn.client
+          .put('/cgi/id/users/me/$place', data: {'attachment': attachment.rid});
 
       if (!mounted) return;
       final ua = context.read<UserProvider>();
@@ -188,7 +195,9 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {
           'location': _locationController.value.text,
           'birthday': _birthday?.toUtc().toIso8601String(),
           'links': {
-            for (final link in _links!.where((ele) => ele.$1.isNotEmpty && ele.$2.isNotEmpty)) link.$1: link.$2,
+            for (final link in _links!
+                .where((ele) => ele.$1.isNotEmpty && ele.$2.isNotEmpty))
+              link.$1: link.$2,
           },
         },
       );
@@ -235,7 +244,10 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {
     final sn = context.read<SnNetworkProvider>();
 
     return AppScaffold(
-      appBar: AppBar(leading: const PageBackButton(), title: Text('screenAccountProfileEdit').tr()),
+      noBackground: ResponsiveScaffold.getIsExpand(context),
+      appBar: AppBar(
+          leading: const PageBackButton(),
+          title: Text('screenAccountProfileEdit').tr()),
       body: SingleChildScrollView(
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
@@ -251,13 +263,16 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {
                     child: ClipRRect(
                       borderRadius: const BorderRadius.all(Radius.circular(8)),
                       child: AspectRatio(
-                        aspectRatio: 16 / 9,
+                        aspectRatio: 16 / 7,
                         child: Container(
-                          color: Theme.of(context).colorScheme.surfaceContainerHigh,
-                          child:
-                              _banner != null
-                                  ? AutoResizeUniversalImage(sn.getAttachmentUrl(_banner!), fit: BoxFit.cover)
-                                  : const SizedBox.shrink(),
+                          color: Theme.of(context)
+                              .colorScheme
+                              .surfaceContainerHigh,
+                          child: _banner != null
+                              ? AutoResizeUniversalImage(
+                                  sn.getAttachmentUrl(_banner!),
+                                  fit: BoxFit.cover)
+                              : const SizedBox.shrink(),
                         ),
                       ),
                     ),
@@ -294,12 +309,16 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {
                     labelText: 'fieldUsername'.tr(),
                     helperText: 'fieldUsernameCannotEditHint'.tr(),
                   ),
-                  onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                  onTapOutside: (_) =>
+                      FocusManager.instance.primaryFocus?.unfocus(),
                 ),
                 TextField(
                   controller: _nicknameController,
-                  decoration: InputDecoration(border: const UnderlineInputBorder(), labelText: 'fieldNickname'.tr()),
-                  onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                  decoration: InputDecoration(
+                      border: const UnderlineInputBorder(),
+                      labelText: 'fieldNickname'.tr()),
+                  onTapOutside: (_) =>
+                      FocusManager.instance.primaryFocus?.unfocus(),
                 ),
                 Row(
                   children: [
@@ -311,7 +330,8 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {
                           border: const UnderlineInputBorder(),
                           labelText: 'fieldFirstName'.tr(),
                         ),
-                        onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                        onTapOutside: (_) =>
+                            FocusManager.instance.primaryFocus?.unfocus(),
                       ),
                     ),
                     const Gap(8),
@@ -323,7 +343,8 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {
                           border: const UnderlineInputBorder(),
                           labelText: 'fieldLastName'.tr(),
                         ),
-                        onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                        onTapOutside: (_) =>
+                            FocusManager.instance.primaryFocus?.unfocus(),
                       ),
                     ),
                   ],
@@ -338,7 +359,8 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {
                           border: const UnderlineInputBorder(),
                           labelText: 'fieldGender'.tr(),
                         ),
-                        onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                        onTapOutside: (_) =>
+                            FocusManager.instance.primaryFocus?.unfocus(),
                       ),
                     ),
                     const Gap(4),
@@ -350,7 +372,8 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {
                           border: const UnderlineInputBorder(),
                           labelText: 'fieldPronouns'.tr(),
                         ),
-                        onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                        onTapOutside: (_) =>
+                            FocusManager.instance.primaryFocus?.unfocus(),
                       ),
                     ),
                   ],
@@ -360,8 +383,11 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {
                   keyboardType: TextInputType.multiline,
                   maxLines: null,
                   minLines: 3,
-                  decoration: InputDecoration(border: const UnderlineInputBorder(), labelText: 'fieldDescription'.tr()),
-                  onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                  decoration: InputDecoration(
+                      border: const UnderlineInputBorder(),
+                      labelText: 'fieldDescription'.tr()),
+                  onTapOutside: (_) =>
+                      FocusManager.instance.primaryFocus?.unfocus(),
                 ),
                 Row(
                   crossAxisAlignment: CrossAxisAlignment.center,
@@ -373,18 +399,21 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {
                           border: const UnderlineInputBorder(),
                           labelText: 'fieldTimeZone'.tr(),
                         ),
-                        onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                        onTapOutside: (_) =>
+                            FocusManager.instance.primaryFocus?.unfocus(),
                       ),
                     ),
                     const Gap(4),
                     StyledWidget(
                       IconButton(
                         icon: const Icon(Symbols.calendar_month),
-                        visualDensity: VisualDensity(horizontal: -4, vertical: -4),
+                        visualDensity:
+                            VisualDensity(horizontal: -4, vertical: -4),
                         padding: EdgeInsets.zero,
                         constraints: const BoxConstraints(),
                         onPressed: () async {
-                          _timezoneController.text = await FlutterTimezone.getLocalTimezone();
+                          _timezoneController.text =
+                              await FlutterTimezone.getLocalTimezone();
                         },
                       ),
                     ).padding(top: 6),
@@ -392,7 +421,8 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {
                     StyledWidget(
                       IconButton(
                         icon: const Icon(Symbols.clear),
-                        visualDensity: VisualDensity(horizontal: -4, vertical: -4),
+                        visualDensity:
+                            VisualDensity(horizontal: -4, vertical: -4),
                         padding: EdgeInsets.zero,
                         constraints: const BoxConstraints(),
                         onPressed: () {
@@ -404,13 +434,18 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {
                 ),
                 TextField(
                   controller: _locationController,
-                  decoration: InputDecoration(border: const UnderlineInputBorder(), labelText: 'fieldLocation'.tr()),
-                  onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                  decoration: InputDecoration(
+                      border: const UnderlineInputBorder(),
+                      labelText: 'fieldLocation'.tr()),
+                  onTapOutside: (_) =>
+                      FocusManager.instance.primaryFocus?.unfocus(),
                 ),
                 TextField(
                   controller: _birthdayController,
                   readOnly: true,
-                  decoration: InputDecoration(border: const UnderlineInputBorder(), labelText: 'fieldBirthday'.tr()),
+                  decoration: InputDecoration(
+                      border: const UnderlineInputBorder(),
+                      labelText: 'fieldBirthday'.tr()),
                   onTap: () => _selectBirthday(),
                 ),
                 if (_links != null)
@@ -418,7 +453,8 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {
                     margin: const EdgeInsets.only(top: 16, bottom: 4),
                     child: Container(
                       width: double.infinity,
-                      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+                      padding: const EdgeInsets.symmetric(
+                          horizontal: 16, vertical: 8),
                       child: Column(
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
@@ -427,13 +463,17 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {
                               Expanded(
                                 child: Text(
                                   'fieldLinks'.tr(),
-                                  style: Theme.of(context).textTheme.titleMedium!.copyWith(fontSize: 17),
+                                  style: Theme.of(context)
+                                      .textTheme
+                                      .titleMedium!
+                                      .copyWith(fontSize: 17),
                                 ),
                               ),
                               IconButton(
                                 padding: EdgeInsets.zero,
                                 constraints: const BoxConstraints(),
-                                visualDensity: VisualDensity(horizontal: -4, vertical: -4),
+                                visualDensity:
+                                    VisualDensity(horizontal: -4, vertical: -4),
                                 icon: const Icon(Symbols.add),
                                 onPressed: () {
                                   setState(() => _links!.add(('', '')));
@@ -457,7 +497,9 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {
                                     onChanged: (value) {
                                       _links![idx] = (value, _links![idx].$2);
                                     },
-                                    onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                                    onTapOutside: (_) => FocusManager
+                                        .instance.primaryFocus
+                                        ?.unfocus(),
                                   ),
                                 ),
                                 const Gap(8),
@@ -473,7 +515,9 @@ class _ProfileEditScreenState extends State<ProfileEditScreen> {
                                     onChanged: (value) {
                                       _links![idx] = (_links![idx].$1, value);
                                     },
-                                    onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                                    onTapOutside: (_) => FocusManager
+                                        .instance.primaryFocus
+                                        ?.unfocus(),
                                   ),
                                 ),
                               ],

lib/screens/account/profile_page.dart

@@ -1,3 +1,4 @@
+import 'dart:math' as math;
 import 'dart:ui';
 
 import 'package:easy_localization/easy_localization.dart';
@@ -14,6 +15,7 @@ import 'package:surface/providers/experience.dart';
 import 'package:surface/providers/relationship.dart';
 import 'package:surface/providers/sn_network.dart';
 import 'package:surface/screens/abuse_report.dart';
+import 'package:surface/screens/account/punishments.dart';
 import 'package:surface/types/account.dart';
 import 'package:surface/types/check_in.dart';
 import 'package:surface/types/post.dart';
@@ -60,6 +62,21 @@ final Map<String, (String, IconData, Color)> kBadgesMeta = {
     Symbols.thumb_up,
     Colors.lightGreen,
   ),
+  'programs.developers': (
+    'badgeProgramDeveloper',
+    Symbols.code,
+    Colors.blue,
+  ),
+  'programs.stellar': (
+    'badgeProgramStellar',
+    Symbols.family_star,
+    Colors.orange,
+  ),
+  'programs.moderator': (
+    'badgeProgramModerator',
+    Symbols.sword_rose,
+    Colors.blue,
+  ),
 };
 
 class UserScreen extends StatefulWidget {
@@ -227,7 +244,7 @@ class _UserScreenState extends State<UserScreen>
 
   late final _appBarWidth = MediaQuery.of(context).size.width;
   late final _appBarHeight =
-      (_appBarWidth * kBannerAspectRatio).roundToDouble();
+      math.min((_appBarWidth * kBannerAspectRatio), 360).roundToDouble();
 
   void _updateAppBarBlur() {
     if (_scrollController.offset > _appBarHeight) return;
@@ -441,7 +458,7 @@ class _UserScreenState extends State<UserScreen>
                     ],
                   ).padding(right: 8),
                   if (_account!.profile!.description.isNotEmpty)
-                    const Gap(12)
+                    const Gap(4)
                   else
                     const Gap(8),
                   if (_account!.profile!.description.isNotEmpty)
@@ -487,14 +504,15 @@ class _UserScreenState extends State<UserScreen>
                       ],
                     ).padding(vertical: 8, horizontal: 12),
                   ),
-                  const Gap(8),
-                  Wrap(
-                    children: _account!.badges
-                        .map(
-                          (ele) => AccountBadge(badge: ele),
-                        )
-                        .toList(),
-                  ).padding(horizontal: 8),
+                  if (_account!.badges.isNotEmpty) const Gap(8),
+                  if (_account!.badges.isNotEmpty)
+                    Wrap(
+                      spacing: 4,
+                      runSpacing: 4,
+                      children: _account!.badges
+                          .map((ele) => AccountBadge(badge: ele))
+                          .toList(),
+                    ).padding(horizontal: 8),
                   const Gap(8),
                   Column(
                     children: [
@@ -603,6 +621,17 @@ class _UserScreenState extends State<UserScreen>
                 ],
               ).padding(all: 16),
             ),
+          if (_account?.punishments.isNotEmpty ?? false)
+            SliverToBoxAdapter(child: const Divider()),
+          if (_account?.punishments.isNotEmpty ?? false)
+            SliverToBoxAdapter(
+              child: Column(
+                children: [
+                  for (final ele in _account!.punishments)
+                    PunishmentInfoCard(ele: ele),
+                ],
+              ),
+            ),
           if (_account?.profile?.links.isNotEmpty ?? false)
             SliverToBoxAdapter(child: const Divider()),
           if (_account?.profile?.links.isNotEmpty ?? false)

lib/screens/account/programs.dart

@@ -0,0 +1,291 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:gap/gap.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:provider/provider.dart';
+import 'package:styled_widget/styled_widget.dart';
+import 'package:surface/providers/experience.dart';
+import 'package:surface/providers/sn_network.dart';
+import 'package:surface/types/account.dart';
+import 'package:surface/widgets/dialog.dart';
+import 'package:surface/widgets/loading_indicator.dart';
+import 'package:surface/widgets/markdown_content.dart';
+import 'package:surface/widgets/navigation/app_scaffold.dart';
+
+class AccountProgramScreen extends StatefulWidget {
+  const AccountProgramScreen({super.key});
+
+  @override
+  State<AccountProgramScreen> createState() => _AccountProgramScreenState();
+}
+
+class _AccountProgramScreenState extends State<AccountProgramScreen> {
+  bool _isBusy = false;
+  final List<SnProgram> _programs = List.empty(growable: true);
+  final List<SnProgramMember> _programMembers = List.empty(growable: true);
+
+  Future<void> _fetchPrograms() async {
+    _programs.clear();
+    setState(() => _isBusy = true);
+    try {
+      final sn = context.read<SnNetworkProvider>();
+      final resp = await sn.client.get('/cgi/id/programs');
+      _programs.addAll(
+        resp.data.map((ele) => SnProgram.fromJson(ele)).cast<SnProgram>(),
+      );
+    } catch (err) {
+      if (!mounted) return;
+      context.showErrorDialog(err);
+    } finally {
+      setState(() => _isBusy = false);
+    }
+  }
+
+  Future<void> _fetchProgramMembers() async {
+    _programMembers.clear();
+    setState(() => _isBusy = true);
+    try {
+      final sn = context.read<SnNetworkProvider>();
+      final resp = await sn.client.get('/cgi/id/programs/members');
+      _programMembers.addAll(
+        resp.data
+            .map((ele) => SnProgramMember.fromJson(ele))
+            .cast<SnProgramMember>(),
+      );
+    } catch (err) {
+      if (!mounted) return;
+      context.showErrorDialog(err);
+    } finally {
+      setState(() => _isBusy = false);
+    }
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _fetchPrograms();
+    _fetchProgramMembers();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AppScaffold(
+      noBackground: ResponsiveScaffold.getIsExpand(context),
+      appBar: AppBar(
+        title: Text('accountProgram').tr(),
+      ),
+      body: Column(
+        children: [
+          LoadingIndicator(isActive: _isBusy),
+          Expanded(
+            child: ListView.builder(
+              padding: EdgeInsets.zero,
+              itemCount: _programs.length,
+              itemBuilder: (context, idx) {
+                final ele = _programs[idx];
+                return Card(
+                  child: InkWell(
+                    borderRadius: BorderRadius.all(Radius.circular(8)),
+                    onTap: () {
+                      showModalBottomSheet(
+                        isScrollControlled: true,
+                        context: context,
+                        builder: (context) => _ProgramJoinPopup(
+                          program: ele,
+                          isJoined:
+                              _programMembers.any((e) => e.programId == ele.id),
+                        ),
+                      ).then((value) {
+                        if (value == true) {
+                          _fetchProgramMembers();
+                        }
+                      });
+                    },
+                    child: Column(
+                      children: [
+                        if (ele.appearance['banner'] != null)
+                          AspectRatio(
+                            aspectRatio: 16 / 5,
+                            child: ClipRRect(
+                              borderRadius: BorderRadius.circular(8),
+                              child: Container(
+                                color: Theme.of(context)
+                                    .colorScheme
+                                    .surfaceVariant,
+                                child: Image.network(
+                                  ele.appearance['banner'],
+                                  color: Theme.of(context)
+                                      .colorScheme
+                                      .onSurfaceVariant,
+                                ),
+                              ),
+                            ),
+                          ),
+                        Padding(
+                          padding: const EdgeInsets.all(16),
+                          child: Row(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              Expanded(
+                                child: Column(
+                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                  children: [
+                                    Text(
+                                      ele.name,
+                                      style: Theme.of(context)
+                                          .textTheme
+                                          .titleMedium,
+                                    ).bold(),
+                                    Text(
+                                      ele.description,
+                                      maxLines: 3,
+                                      overflow: TextOverflow.ellipsis,
+                                    ),
+                                    if (_programMembers
+                                        .any((e) => e.programId == ele.id))
+                                      Text('accountProgramAlreadyJoined'.tr())
+                                          .opacity(0.75),
+                                  ],
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ).padding(horizontal: 8);
+              },
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _ProgramJoinPopup extends StatefulWidget {
+  final SnProgram program;
+  final bool isJoined;
+  const _ProgramJoinPopup({required this.program, required this.isJoined});
+
+  @override
+  State<_ProgramJoinPopup> createState() => _ProgramJoinPopupState();
+}
+
+class _ProgramJoinPopupState extends State<_ProgramJoinPopup> {
+  bool _isBusy = false;
+
+  Future<void> _joinProgram() async {
+    setState(() => _isBusy = true);
+    try {
+      final sn = context.read<SnNetworkProvider>();
+      await sn.client.post('/cgi/id/programs/${widget.program.id}');
+      if (!mounted) return;
+      Navigator.pop(context, true);
+      context.showSnackbar('accountProgramJoined'.tr());
+    } catch (err) {
+      if (!mounted) return;
+      context.showErrorDialog(err);
+    } finally {
+      setState(() => _isBusy = false);
+    }
+  }
+
+  Future<void> _leaveProgram() async {
+    setState(() => _isBusy = true);
+    try {
+      final sn = context.read<SnNetworkProvider>();
+      await sn.client.delete('/cgi/id/programs/${widget.program.id}');
+      if (!mounted) return;
+      Navigator.pop(context, true);
+      context.showSnackbar('accountProgramLeft'.tr());
+    } catch (err) {
+      if (!mounted) return;
+      context.showErrorDialog(err);
+    } finally {
+      setState(() => _isBusy = false);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      height: MediaQuery.of(context).size.height * 0.75,
+      child: SingleChildScrollView(
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              crossAxisAlignment: CrossAxisAlignment.center,
+              children: [
+                const Icon(Symbols.add, size: 24),
+                const Gap(16),
+                Text(
+                  'accountProgramJoin',
+                  style: Theme.of(context).textTheme.titleLarge,
+                ).tr(),
+              ],
+            ).padding(horizontal: 20, top: 16, bottom: 12),
+            Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                if (widget.program.appearance['banner'] != null)
+                  AspectRatio(
+                    aspectRatio: 16 / 5,
+                    child: ClipRRect(
+                      borderRadius: BorderRadius.circular(8),
+                      child: Container(
+                        color: Theme.of(context).colorScheme.surfaceVariant,
+                        child: Image.network(
+                          widget.program.appearance['banner'],
+                          color: Theme.of(context).colorScheme.onSurfaceVariant,
+                        ),
+                      ),
+                    ),
+                  ).padding(bottom: 12),
+                Text(
+                  widget.program.name,
+                  style: Theme.of(context).textTheme.titleMedium,
+                ).bold(),
+                MarkdownTextContent(content: widget.program.description),
+                const Gap(8),
+                Text(
+                  'accountProgramJoinRequirements',
+                  style: Theme.of(context).textTheme.titleMedium,
+                ).tr().bold(),
+                Text('≥EXP ${widget.program.expRequirement}'),
+                Text('≥Lv${getLevelFromExp(widget.program.expRequirement)}'),
+                const Gap(8),
+                Text(
+                  'accountProgramJoinPricing',
+                  style: Theme.of(context).textTheme.titleMedium,
+                ).tr().bold(),
+                Text('walletCurrency${widget.program.price['currency'].toString().capitalize().replaceFirst('Normal', '')}')
+                    .plural(widget.program.price['amount'].toDouble()),
+                Text('accountProgramJoinPricingHint').tr().opacity(0.75),
+                const Gap(8),
+                if (widget.isJoined)
+                  Text('accountProgramLeaveHint')
+                      .tr()
+                      .opacity(0.75)
+                      .padding(bottom: 8),
+                if (!widget.isJoined)
+                  ElevatedButton(
+                    onPressed: _isBusy ? null : _joinProgram,
+                    child: Text('join').tr(),
+                  )
+                else
+                  ElevatedButton(
+                    onPressed: _isBusy ? null : _leaveProgram,
+                    child: Text('leave').tr(),
+                  ),
+              ],
+            ).padding(horizontal: 24),
+            Gap(MediaQuery.of(context).padding.bottom),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/screens/account/publishers/publisher_edit.dart

@@ -27,10 +27,12 @@ class AccountPublisherEditScreen extends StatefulWidget {
   const AccountPublisherEditScreen({super.key, required this.name});
 
   @override
-  State<AccountPublisherEditScreen> createState() => _AccountPublisherEditScreenState();
+  State<AccountPublisherEditScreen> createState() =>
+      _AccountPublisherEditScreenState();
 }
 
-class _AccountPublisherEditScreenState extends State<AccountPublisherEditScreen> {
+class _AccountPublisherEditScreenState
+    extends State<AccountPublisherEditScreen> {
   bool _isBusy = false;
 
   SnPublisher? _publisher;
@@ -115,29 +117,32 @@ class _AccountPublisherEditScreenState extends State<AccountPublisherEditScreen>
 
     Uint8List? rawBytes;
     if (!skipCrop) {
-      final ImageProvider imageProvider = kIsWeb ? NetworkImage(image.path) : FileImage(File(image.path));
-      final aspectRatios =
-          place == 'banner' ? [CropAspectRatio(width: 16, height: 7)] : [CropAspectRatio(width: 1, height: 1)];
-      final result =
-          (!kIsWeb && (Platform.isIOS || Platform.isMacOS))
-              ? await showCupertinoImageCropper(
-                // ignore: use_build_context_synchronously
-                context,
-                allowedAspectRatios: aspectRatios,
-                imageProvider: imageProvider,
-              )
-              : await showMaterialImageCropper(
-                // ignore: use_build_context_synchronously
-                context,
-                allowedAspectRatios: aspectRatios,
-                imageProvider: imageProvider,
-              );
+      final ImageProvider imageProvider =
+          kIsWeb ? NetworkImage(image.path) : FileImage(File(image.path));
+      final aspectRatios = place == 'banner'
+          ? [CropAspectRatio(width: 16, height: 7)]
+          : [CropAspectRatio(width: 1, height: 1)];
+      final result = (!kIsWeb && (Platform.isIOS || Platform.isMacOS))
+          ? await showCupertinoImageCropper(
+              // ignore: use_build_context_synchronously
+              context,
+              allowedAspectRatios: aspectRatios,
+              imageProvider: imageProvider,
+            )
+          : await showMaterialImageCropper(
+              // ignore: use_build_context_synchronously
+              context,
+              allowedAspectRatios: aspectRatios,
+              imageProvider: imageProvider,
+            );
 
       if (result == null) return;
 
       if (!mounted) return;
       setState(() => _isBusy = true);
-      rawBytes = (await result.uiImage.toByteData(format: ImageByteFormat.png))!.buffer.asUint8List();
+      rawBytes = (await result.uiImage.toByteData(format: ImageByteFormat.png))!
+          .buffer
+          .asUint8List();
     } else {
       if (!mounted) return;
       setState(() => _isBusy = true);
@@ -191,7 +196,10 @@ class _AccountPublisherEditScreenState extends State<AccountPublisherEditScreen>
     final sn = context.read<SnNetworkProvider>();
 
     return AppScaffold(
-      appBar: AppBar(leading: PageBackButton(), title: Text('screenAccountPublisherEdit').tr()),
+      noBackground: ResponsiveScaffold.getIsExpand(context),
+      appBar: AppBar(
+          leading: PageBackButton(),
+          title: Text('screenAccountPublisherEdit').tr()),
       body: SingleChildScrollView(
         child: Column(
           children: [
@@ -206,13 +214,16 @@ class _AccountPublisherEditScreenState extends State<AccountPublisherEditScreen>
                     child: ClipRRect(
                       borderRadius: const BorderRadius.all(Radius.circular(8)),
                       child: AspectRatio(
-                        aspectRatio: 16 / 9,
+                        aspectRatio: 16 / 7,
                         child: Container(
-                          color: Theme.of(context).colorScheme.surfaceContainerHigh,
-                          child:
-                              _banner != null
-                                  ? AutoResizeUniversalImage(sn.getAttachmentUrl(_banner!), fit: BoxFit.cover)
-                                  : const SizedBox.shrink(),
+                          color: Theme.of(context)
+                              .colorScheme
+                              .surfaceContainerHigh,
+                          child: _banner != null
+                              ? AutoResizeUniversalImage(
+                                  sn.getAttachmentUrl(_banner!),
+                                  fit: BoxFit.cover)
+                              : const SizedBox.shrink(),
                         ),
                       ),
                     ),
@@ -245,13 +256,15 @@ class _AccountPublisherEditScreenState extends State<AccountPublisherEditScreen>
                 labelText: 'fieldUsername'.tr(),
                 helperText: 'fieldUsernameCannotEditHint'.tr(),
               ),
-              onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+              onTapOutside: (_) =>
+                  FocusManager.instance.primaryFocus?.unfocus(),
             ),
             const Gap(4),
             TextField(
               controller: _nickController,
               decoration: InputDecoration(labelText: 'fieldNickname'.tr()),
-              onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+              onTapOutside: (_) =>
+                  FocusManager.instance.primaryFocus?.unfocus(),
             ),
             const Gap(4),
             TextField(
@@ -259,7 +272,8 @@ class _AccountPublisherEditScreenState extends State<AccountPublisherEditScreen>
               maxLines: null,
               minLines: 3,
               decoration: InputDecoration(labelText: 'fieldDescription'.tr()),
-              onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+              onTapOutside: (_) =>
+                  FocusManager.instance.primaryFocus?.unfocus(),
             ),
             const Gap(12),
             Row(

lib/screens/account/publishers/publisher_new.dart

@@ -25,7 +25,8 @@ class _AccountPublisherNewScreenState extends State<AccountPublisherNewScreen> {
 
   @override
   Widget build(BuildContext context) {
-    return  AppScaffold(
+    return AppScaffold(
+      noBackground: ResponsiveScaffold.getIsExpand(context),
       appBar: AppBar(
         leading: const PageBackButton(),
         title: Text('screenAccountPublisherNew').tr(),

lib/screens/account/publishers/publishers.dart

@@ -33,7 +33,8 @@ class _PublisherScreenState extends State<PublisherScreen> {
 
     try {
       final resp = await sn.client.get('/cgi/co/publishers/me');
-      final List<SnPublisher> out = List<SnPublisher>.from(resp.data?.map((e) => SnPublisher.fromJson(e)) ?? []);
+      final List<SnPublisher> out = List<SnPublisher>.from(
+          resp.data?.map((e) => SnPublisher.fromJson(e)) ?? []);
 
       if (!mounted) return;
 
@@ -81,6 +82,7 @@ class _PublisherScreenState extends State<PublisherScreen> {
   @override
   Widget build(BuildContext context) {
     return AppScaffold(
+      noBackground: ResponsiveScaffold.getIsExpand(context),
       appBar: AppBar(
         leading: const PageBackButton(),
         title: Text('screenAccountPublishers').tr(),
@@ -93,7 +95,9 @@ class _PublisherScreenState extends State<PublisherScreen> {
             contentPadding: const EdgeInsets.symmetric(horizontal: 24),
             leading: const Icon(Symbols.add_circle),
             onTap: () {
-              GoRouter.of(context).pushNamed('accountPublisherNew').then((value) {
+              GoRouter.of(context)
+                  .pushNamed('accountPublisherNew')
+                  .then((value) {
                 if (value == true) {
                   _publishers.clear();
                   _fetchPublishers();
@@ -119,7 +123,8 @@ class _PublisherScreenState extends State<PublisherScreen> {
                     return ListTile(
                       title: Text(publisher.nick),
                       subtitle: Text('@${publisher.name}'),
-                      contentPadding: const EdgeInsets.symmetric(horizontal: 16),
+                      contentPadding:
+                          const EdgeInsets.symmetric(horizontal: 16),
                       leading: AccountImage(content: publisher.avatar),
                       trailing: PopupMenuButton(
                         itemBuilder: (BuildContext context) => [

lib/screens/account/punishments.dart

@@ -0,0 +1,199 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:gap/gap.dart';
+import 'package:go_router/go_router.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:provider/provider.dart';
+import 'package:styled_widget/styled_widget.dart';
+import 'package:surface/providers/sn_network.dart';
+import 'package:surface/types/account.dart';
+import 'package:surface/widgets/account/account_image.dart';
+import 'package:surface/widgets/dialog.dart';
+import 'package:surface/widgets/loading_indicator.dart';
+import 'package:surface/widgets/navigation/app_scaffold.dart';
+
+const kPunishmentIcons = [
+  Symbols.warning,
+  Symbols.emergency_home,
+  Symbols.dangerous,
+];
+
+class PunishmentsScreen extends StatefulWidget {
+  const PunishmentsScreen({super.key});
+
+  @override
+  State<PunishmentsScreen> createState() => _PunishmentsScreenState();
+}
+
+class _PunishmentsScreenState extends State<PunishmentsScreen> {
+  bool _isBusy = false;
+  List<SnPunishment>? _punishments;
+
+  Future<void> _fetchPunishments() async {
+    setState(() => _isBusy = true);
+    try {
+      final sn = context.read<SnNetworkProvider>();
+      final resp = await sn.client.get('/cgi/id/punishments');
+      if (!mounted) return;
+      _punishments = List.from(
+        resp.data.map((ele) => SnPunishment.fromJson(ele)),
+      );
+    } catch (err) {
+      if (!mounted) return;
+      context.showErrorDialog(err);
+    } finally {
+      setState(() => _isBusy = false);
+    }
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _fetchPunishments();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AppScaffold(
+      noBackground: ResponsiveScaffold.getIsExpand(context),
+      appBar: AppBar(
+        title: Text('accountPunishments').tr(),
+        leading: PageBackButton(),
+      ),
+      body: Column(
+        children: [
+          LoadingIndicator(isActive: _isBusy),
+          Card(
+            margin: EdgeInsets.only(bottom: 8, left: 8, right: 8),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Row(
+                  children: [
+                    Icon(Symbols.visibility, size: 20),
+                    const Gap(6),
+                    Expanded(
+                      child: Text('punishmentOverall').tr().fontSize(16).bold(),
+                    ),
+                  ],
+                ),
+                Builder(
+                  builder: (context) {
+                    if (_punishments == null) return Text('loading').tr();
+                    if (_punishments!.any((ele) => ele.type == 2)) {
+                      return Text('punishmentStatusBanned').tr();
+                    }
+                    if (_punishments!.any(
+                      (ele) => ele.type == 1 && ele.permNodes.isEmpty,
+                    )) {
+                      return Text('punishmentStatusLimitedFully').tr();
+                    } else if (_punishments!.any((ele) => ele.type == 1)) {
+                      return Text('punishmentStatusLimited').tr();
+                    }
+                    if (_punishments!.any((ele) => ele.type == 0)) {
+                      return Text('punishmentStatusWarned').tr();
+                    }
+                    return Text('punishmentStatusNormal').tr();
+                  },
+                ),
+              ],
+            ).padding(horizontal: 24, vertical: 16),
+          ),
+          Expanded(
+            child: RefreshIndicator(
+              onRefresh: _fetchPunishments,
+              child: ListView.separated(
+                padding: EdgeInsets.zero,
+                itemCount: _punishments?.length ?? 0,
+                itemBuilder: (context, index) {
+                  final ele = _punishments![index];
+                  return PunishmentInfoCard(ele: ele);
+                },
+                separatorBuilder: (_, __) => const Gap(8),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class PunishmentInfoCard extends StatelessWidget {
+  const PunishmentInfoCard({
+    super.key,
+    required this.ele,
+  });
+
+  final SnPunishment ele;
+
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      margin: EdgeInsets.symmetric(horizontal: 8),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            children: [
+              Icon(kPunishmentIcons[ele.type], size: 20),
+              const Gap(6),
+              Expanded(
+                child:
+                    Text('punishmentType${ele.type}').tr().fontSize(16).bold(),
+              ),
+            ],
+          ),
+          Text(ele.reason),
+          const Gap(4),
+          Text(
+            'punishmentCreatedAt'.tr(args: [
+              DateFormat().format(
+                ele.createdAt.toLocal(),
+              )
+            ]),
+          ).opacity(0.8),
+          Text(
+            ele.expiredAt == null
+                ? 'punishmentExpiredNever'.tr()
+                : 'punishmentExpiredAt'.tr(args: [
+                    DateFormat().format(
+                      ele.expiredAt!.toLocal(),
+                    )
+                  ]),
+          ).opacity(0.8),
+          const Gap(8),
+          if (ele.moderator != null)
+            Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text('punishmentModerator').tr().opacity(0.75),
+                InkWell(
+                  child: Row(
+                    children: [
+                      AccountImage(
+                        content: ele.moderator!.avatar,
+                        radius: 8,
+                      ),
+                      const Gap(4),
+                      Text(ele.moderator?.nick ?? 'unknown'),
+                    ],
+                  ),
+                  onTap: () {
+                    GoRouter.of(context).pushNamed(
+                      'accountProfilePage',
+                      pathParameters: {
+                        'name': ele.moderator!.name,
+                      },
+                    );
+                  },
+                ),
+              ],
+            )
+          else
+            Text('punishmentMadeBySystem').tr().opacity(0.75),
+        ],
+      ).padding(horizontal: 24, vertical: 16),
+    );
+  }
+}

lib/screens/account/settings.dart

@@ -37,6 +37,7 @@ class AccountSettingsScreen extends StatelessWidget {
     final ua = context.watch<UserProvider>();
 
     return AppScaffold(
+      noBackground: ResponsiveScaffold.getIsExpand(context),
       appBar: AppBar(
         leading: PageBackButton(),
         title: Text('screenAccountSettings').tr(),
@@ -117,6 +118,16 @@ class AccountSettingsScreen extends StatelessWidget {
                 GoRouter.of(context).pushNamed('accountSettingsSecurity');
               },
             ),
+            ListTile(
+              title: Text('factorSettings').tr(),
+              subtitle: Text('factorSettingsSubtitle').tr(),
+              contentPadding: const EdgeInsets.symmetric(horizontal: 24),
+              leading: const Icon(Symbols.lock),
+              trailing: const Icon(Symbols.chevron_right),
+              onTap: () {
+                GoRouter.of(context).pushNamed('factorSettings');
+              },
+            ),
             ListTile(
               title: Text('accountProfileEdit').tr(),
               subtitle: Text('accountProfileEditSubtitle').tr(),

lib/screens/album.dart

@@ -1,21 +1,21 @@
 import 'package:dismissible_page/dismissible_page.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
 import 'package:gap/gap.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:material_symbols_icons/symbols.dart';
+import 'package:path/path.dart' show withoutExtension;
 import 'package:provider/provider.dart';
 import 'package:styled_widget/styled_widget.dart';
 import 'package:surface/providers/sn_network.dart';
-import 'package:surface/providers/user_directory.dart';
+import 'package:surface/providers/userinfo.dart';
 import 'package:surface/types/attachment.dart';
-import 'package:surface/widgets/app_bar_leading.dart';
-import 'package:surface/widgets/attachment/attachment_zoom.dart';
 import 'package:surface/widgets/attachment/attachment_item.dart';
+import 'package:surface/widgets/attachment/attachment_zoom.dart';
 import 'package:surface/widgets/dialog.dart';
 import 'package:surface/widgets/navigation/app_scaffold.dart';
 import 'package:uuid/uuid.dart';
+import 'package:very_good_infinite_list/very_good_infinite_list.dart';
 
 class AlbumScreen extends StatefulWidget {
   const AlbumScreen({super.key});
@@ -50,23 +50,23 @@ class _AlbumScreenState extends State<AlbumScreen> {
   Future<void> _fetchAttachments() async {
     setState(() => _isBusy = true);
 
+    final ua = context.read<UserProvider>();
+
     const uuid = Uuid();
 
     try {
       final sn = context.read<SnNetworkProvider>();
-      final ud = context.read<UserDirectoryProvider>();
       final resp = await sn.client.get('/cgi/uc/attachments', queryParameters: {
         'take': 10,
         'offset': _attachments.length,
+        'author': ua.user?.name,
       });
       final attachments = List<SnAttachment>.from(
         resp.data['data']?.map((e) => SnAttachment.fromJson(e)) ?? [],
-      ).where((e) => e.mimetype.startsWith('image')).toList();
+      );
       _attachments.addAll(attachments);
       _heroTags.addAll(_attachments.map((_) => uuid.v4()));
 
-      await ud.listAccount(attachments.map((e) => e.accountId).toSet());
-
       _totalCount = resp.data['count'] as int?;
     } catch (err) {
       if (!mounted) return;
@@ -102,92 +102,127 @@ class _AlbumScreenState extends State<AlbumScreen> {
   @override
   Widget build(BuildContext context) {
     return AppScaffold(
-      body: CustomScrollView(
-        controller: _scrollController,
-        slivers: [
-          SliverAppBar(
-            leading: AutoAppBarLeading(),
-            title: Text('screenAlbum').tr(),
-          ),
-          SliverToBoxAdapter(
-            child: Card(
-              child: Row(
-                children: [
-                  SizedBox(
-                    width: 80,
-                    height: 80,
-                    child: CircularProgressIndicator(
-                      value: _billing?.includedRatio ?? 0,
-                      strokeWidth: 8,
-                      backgroundColor: Theme.of(context).colorScheme.surfaceContainerHigh,
+      appBar: AppBar(
+        leading: PageBackButton(),
+        title: Text('screenAlbum').tr(),
+      ),
+      body: Column(
+        children: [
+          Card(
+            margin: EdgeInsets.zero,
+            child: Row(
+              children: [
+                SizedBox(
+                  width: 80,
+                  height: 80,
+                  child: CircularProgressIndicator(
+                    value: _billing?.includedRatio ?? 0,
+                    strokeWidth: 8,
+                    backgroundColor:
+                        Theme.of(context).colorScheme.surfaceContainerHigh,
+                  ),
+                ).padding(all: 12),
+                const Gap(24),
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text('attachmentBillingUploaded').tr().bold(),
+                      Text(
+                        (_billing?.currentBytes ?? 0).formatBytes(decimals: 4),
+                        style: GoogleFonts.robotoMono(),
+                      ),
+                      Text('attachmentBillingDiscount').tr().bold(),
+                      Text(
+                        '${(_billing?.discountFileSize ?? 0).formatBytes(decimals: 2)} · ${((_billing?.includedRatio ?? 0) * 100).toStringAsFixed(2)}%',
+                        style: GoogleFonts.robotoMono(),
+                      ),
+                    ],
+                  ),
+                ),
+                Tooltip(
+                  message: 'attachmentBillingHint'.tr(),
+                  child: IconButton(
+                    icon: const Icon(Symbols.info),
+                    onPressed: () {},
+                  ),
+                ),
+              ],
+            ).padding(horizontal: 24, vertical: 8),
+          ).padding(horizontal: 8, top: 8),
+          Expanded(
+            child: InfiniteList(
+              padding: EdgeInsets.only(top: 8),
+              itemCount: _attachments.length,
+              isLoading: _isBusy,
+              hasReachedMax:
+                  _totalCount != null && _attachments.length >= _totalCount!,
+              onFetchData: _fetchAttachments,
+              itemBuilder: (context, index) {
+                final ele = _attachments[index];
+                return Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    ClipRRect(
+                      child: AspectRatio(
+                        aspectRatio: (ele.data['ratio'] ?? 1).toDouble(),
+                        child: AttachmentItem(
+                          data: ele,
+                          heroTag: _heroTags[index],
+                          onZoom: () {
+                            context.pushTransparentRoute(
+                              AttachmentZoomView(
+                                data: [ele],
+                              ),
+                              backgroundColor: Colors.black.withOpacity(0.7),
+                              rootNavigator: true,
+                            );
+                          },
+                        ),
+                      ),
                     ),
-                  ).padding(all: 12),
-                  const Gap(24),
-                  Expanded(
-                    child: Column(
+                    Row(
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
-                        Text('attachmentBillingUploaded').tr().bold(),
-                        Text(
-                          (_billing?.currentBytes ?? 0).formatBytes(decimals: 4),
-                          style: GoogleFonts.robotoMono(),
+                        Expanded(
+                          child: Column(
+                            mainAxisSize: MainAxisSize.min,
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              Text(ele.name),
+                              if (ele.alt != withoutExtension(ele.name))
+                                Text(ele.alt),
+                              Text(DateFormat().format(ele.createdAt)),
+                              const Gap(4),
+                              Text(ele.size.formatBytes()).fontSize(12),
+                            ],
+                          ).padding(horizontal: 16, vertical: 12),
                         ),
-                        Text('attachmentBillingDiscount').tr().bold(),
-                        Text(
-                          '${(_billing?.discountFileSize ?? 0).formatBytes(decimals: 2)} · ${((_billing?.includedRatio ?? 0) * 100).toStringAsFixed(2)}%',
-                          style: GoogleFonts.robotoMono(),
+                        Padding(
+                          padding: EdgeInsets.only(left: 12, right: 12, top: 4),
+                          child: IconButton(
+                            padding: EdgeInsets.zero,
+                            visualDensity: VisualDensity.compact,
+                            icon: const Icon(Symbols.info),
+                            onPressed: () {
+                              showModalBottomSheet(
+                                context: context,
+                                builder: (context) => AttachmentZoomDetailPopup(
+                                  data: ele,
+                                ),
+                              );
+                            },
+                          ),
                         ),
                       ],
                     ),
-                  ),
-                  Tooltip(
-                    message: 'attachmentBillingHint'.tr(),
-                    child: IconButton(
-                      icon: const Icon(Symbols.info),
-                      onPressed: () {},
-                    ),
-                  ),
-                ],
-              ).padding(horizontal: 24, vertical: 8),
-            ),
-          ),
-          SliverMasonryGrid.extent(
-            childCount: _attachments.length,
-            maxCrossAxisExtent: 320,
-            mainAxisSpacing: 4,
-            crossAxisSpacing: 4,
-            itemBuilder: (context, idx) {
-              final attachment = _attachments[idx];
-              return GestureDetector(
-                child: ClipRRect(
-                  child: AspectRatio(
-                    aspectRatio: attachment.metadata['ratio']?.toDouble() ?? 1,
-                    child: AttachmentItem(
-                      data: attachment,
-                      heroTag: _heroTags[idx],
-                    ),
-                  ),
-                ),
-                onTap: () {
-                  context.pushTransparentRoute(
-                    AttachmentZoomView(
-                      data: [attachment],
-                      heroTags: [_heroTags[idx]],
-                    ),
-                    backgroundColor: Colors.black.withOpacity(0.7),
-                    rootNavigator: true,
-                  );
-                },
-              );
-            },
-          ),
-          if (_isBusy)
-            SliverToBoxAdapter(
-              child: Padding(
-                padding: const EdgeInsets.all(24),
-                child: const CircularProgressIndicator(),
-              ).center(),
+                  ],
+                );
+              },
+              separatorBuilder: (_, __) => const Gap(8),
             ),
+          )
         ],
       ),
     );

lib/screens/auth/login.dart

@@ -160,6 +160,7 @@ class _LoginCheckScreenState extends State<_LoginCheckScreen> {
       sn.setTokenPair(atk, rtk);
       if (!mounted) return;
       final user = context.read<UserProvider>();
+      user.isAuthorized = true;
       await user.refreshUser();
       if (!mounted) return;
       final ws = context.read<WebSocketProvider>();

lib/screens/auth/register.dart

@@ -7,7 +7,7 @@ import 'package:material_symbols_icons/symbols.dart';
 import 'package:provider/provider.dart';
 import 'package:styled_widget/styled_widget.dart';
 import 'package:surface/providers/sn_network.dart';
-import 'package:surface/screens/captcha.dart';
+import 'package:surface/screens/captcha/captcha.dart';
 import 'package:surface/widgets/dialog.dart';
 import 'package:surface/widgets/navigation/app_scaffold.dart';
 import 'package:url_launcher/url_launcher_string.dart';
@@ -41,9 +41,9 @@ class _RegisterScreenState extends State<RegisterScreen> {
       return;
     }
 
-    final captchaTk = await Navigator.of(context, rootNavigator: true).push(
+    final captchaTk = await Navigator.of(context).push(
       MaterialPageRoute(
-        builder: (context) => TurnstileScreen(),
+        builder: (context) => CaptchaScreen(),
       ),
     );
     if (captchaTk == null) return;

lib/screens/captcha/captcha.dart

@@ -0,0 +1 @@
+export 'captcha_native.dart' if (dart.library.html) 'captcha_web.dart';

lib/screens/captcha/captcha_native.dart

@@ -5,19 +5,18 @@ import 'package:provider/provider.dart';
 import 'package:surface/providers/config.dart';
 import 'package:surface/widgets/navigation/app_scaffold.dart';
 
-class TurnstileScreen extends StatefulWidget {
-  const TurnstileScreen({
-    super.key,
-  });
+class CaptchaScreen extends StatefulWidget {
+  const CaptchaScreen({super.key});
 
   @override
-  State<TurnstileScreen> createState() => _TurnstileScreenState();
+  State<CaptchaScreen> createState() => _CaptchaScreenState();
 }
 
-class _TurnstileScreenState extends State<TurnstileScreen> {
+class _CaptchaScreenState extends State<CaptchaScreen> {
   @override
   Widget build(BuildContext context) {
     final cfg = context.read<ConfigProvider>();
+
     return AppScaffold(
       appBar: AppBar(title: Text("reCaptcha").tr()),
       body: InAppWebView(
@@ -35,4 +34,4 @@ class _TurnstileScreenState extends State<TurnstileScreen> {
       ),
     );
   }
-}
+}

lib/screens/captcha/captcha_web.dart

@@ -0,0 +1,55 @@
+// ignore: avoid_web_libraries_in_flutter
+import 'dart:html' as html;
+import 'dart:ui_web' as ui;
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:surface/providers/config.dart';
+import 'package:surface/widgets/navigation/app_scaffold.dart';
+
+class CaptchaScreen extends StatefulWidget {
+  const CaptchaScreen({super.key});
+
+  @override
+  State<CaptchaScreen> createState() => _CaptchaScreenState();
+}
+
+class _CaptchaScreenState extends State<CaptchaScreen> {
+  @override
+  void initState() {
+    super.initState();
+    _setupWebListener();
+  }
+
+  void _setupWebListener() {
+    html.window.onMessage.listen((event) {
+      if (event.data != null && event.data is String) {
+        final message = event.data as String;
+        if (message.startsWith("captcha_tk=")) {
+          String token = message.replaceFirst("captcha_tk=", "");
+          Navigator.pop(context, token);
+        }
+      }
+    });
+
+    final iframe = html.IFrameElement()
+      ..src = '${context.read<ConfigProvider>().serverUrl}/captcha'
+      ..style.border = 'none'
+      ..width = '100%'
+      ..height = '100%';
+
+    html.document.body!.append(iframe);
+    ui.platformViewRegistry.registerViewFactory(
+      'captcha-iframe',
+      (int viewId) => iframe,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AppScaffold(
+      appBar: AppBar(title: Text("reCaptcha").tr()),
+      body: HtmlElementView(viewType: 'captcha-iframe'),
+    );
+  }
+}

lib/screens/chat.dart

@@ -1,3 +1,5 @@
+import 'package:animations/animations.dart';
+import 'package:collection/collection.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_expandable_fab/flutter_expandable_fab.dart';
@@ -6,21 +8,22 @@ import 'package:go_router/go_router.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:provider/provider.dart';
-import 'package:responsive_framework/responsive_framework.dart';
+import 'package:styled_widget/styled_widget.dart';
 import 'package:surface/providers/channel.dart';
 import 'package:surface/providers/sn_network.dart';
+import 'package:surface/providers/sn_realm.dart';
 import 'package:surface/providers/user_directory.dart';
 import 'package:surface/providers/userinfo.dart';
-import 'package:surface/screens/chat/room.dart';
 import 'package:surface/types/chat.dart';
+import 'package:surface/types/realm.dart';
 import 'package:surface/widgets/account/account_image.dart';
 import 'package:surface/widgets/account/account_select.dart';
 import 'package:surface/widgets/app_bar_leading.dart';
 import 'package:surface/widgets/dialog.dart';
 import 'package:surface/widgets/loading_indicator.dart';
-import 'package:surface/widgets/navigation/app_background.dart';
 import 'package:surface/widgets/navigation/app_scaffold.dart';
 import 'package:surface/widgets/unauthorized_hint.dart';
+import 'package:surface/widgets/universal_image.dart';
 import 'package:uuid/uuid.dart';
 
 class ChatScreen extends StatefulWidget {
@@ -38,6 +41,7 @@ class _ChatScreenState extends State<ChatScreen> {
   List<SnChannel>? _channels;
   Map<int, SnChatMessage>? _lastMessages;
   Map<int, int>? _unreadCounts;
+  Map<int, int>? _unreadCountsGrouped;
 
   Future<void> _fetchWhatsNew() async {
     final sn = context.read<SnNetworkProvider>();
@@ -45,19 +49,48 @@ class _ChatScreenState extends State<ChatScreen> {
     if (resp.data == null) return;
     final List<dynamic> out = resp.data;
     setState(() {
-      _unreadCounts = {for (var v in out) v['channel_id']: v['count']};
+      _unreadCounts ??= {};
+      _unreadCountsGrouped ??= {};
+      for (var v in out) {
+        _unreadCounts![v['channel_id']] = v['count'];
+        final channel =
+            _channels?.firstWhereOrNull((ele) => ele.id == v['channel_id']);
+        if (channel != null) {
+          if (channel.realmId != null) {
+            _unreadCountsGrouped![channel.realmId!] ??= 0;
+            _unreadCountsGrouped![channel.realmId!] =
+                (_unreadCountsGrouped![channel.realmId!]! + v['count']).toInt();
+          }
+          if (channel.type == 1) {
+            _unreadCountsGrouped![0] ??= 0;
+            _unreadCountsGrouped![0] =
+                (_unreadCountsGrouped![0]! + v['count']).toInt();
+          }
+        }
+      }
     });
   }
 
-  void _refreshChannels({bool noRemote = false}) {
+  void _refreshChannels({bool withBoost = false, bool noRemote = false}) {
+    final ct = context.read<ChatChannelProvider>();
     final ua = context.read<UserProvider>();
     if (!ua.isAuthorized) {
       setState(() => _isBusy = false);
       return;
     }
 
+    if (!withBoost) {
+      if (!noRemote) {
+        ct.refreshAvailableChannels();
+      }
+    } else {
+      setState(() {
+        _channels = ct.availableChannels;
+      });
+    }
+
     final chan = context.read<ChatChannelProvider>();
-    chan.fetchChannels(noRemote: noRemote).listen((channels) async {
+    chan.fetchChannels(noRemote: true).listen((channels) async {
       final lastMessages = await chan.getLastMessages(channels);
       _lastMessages = {for (final val in lastMessages) val.channelId: val};
       channels.sort((a, b) {
@@ -99,6 +132,7 @@ class _ChatScreenState extends State<ChatScreen> {
       ..onDone(() {
         if (!mounted) return;
         setState(() => _isBusy = false);
+        _fetchWhatsNew();
       });
   }
 
@@ -130,40 +164,60 @@ class _ChatScreenState extends State<ChatScreen> {
     }
   }
 
-  SnChannel? _focusChannel;
-
   @override
   void initState() {
     super.initState();
-    _refreshChannels();
-    _fetchWhatsNew();
+    _refreshChannels(withBoost: true);
   }
 
   void _onTapChannel(SnChannel channel) {
-    final doExpand = ResponsiveBreakpoints.of(context).largerOrEqualTo(DESKTOP);
-
-    if (doExpand) {
-      setState(() => _focusChannel = channel);
-      return;
-    }
-    GoRouter.of(context).pushNamed(
-      'chatRoom',
-      pathParameters: {
-        'scope': channel.realm?.alias ?? 'global',
-        'alias': channel.alias,
-      },
-    ).then((value) {
-      if (mounted) {
-        _unreadCounts?[channel.id] = 0;
-        setState(() => _unreadCounts?[channel.id] = 0);
-        _refreshChannels(noRemote: true);
+    setState(() {
+      _unreadCounts?[channel.id] = 0;
+      if (channel.realmId != null) {
+        _unreadCountsGrouped?[channel.realmId!] =
+            (_unreadCountsGrouped?[channel.realmId!] ?? 0) -
+                (_unreadCounts?[channel.id] ?? 0);
+      }
+      if (channel.type == 1) {
+        _unreadCountsGrouped?[0] =
+            (_unreadCountsGrouped?[0] ?? 0) - (_unreadCounts?[channel.id] ?? 0);
       }
     });
+    if (ResponsiveScaffold.getIsExpand(context)) {
+      GoRouter.of(context).pushReplacementNamed(
+        'chatRoom',
+        pathParameters: {
+          'scope': channel.realm?.alias ?? 'global',
+          'alias': channel.alias,
+        },
+      ).then((value) {
+        if (mounted && value == true) {
+          _refreshChannels();
+        }
+      });
+    } else {
+      GoRouter.of(context).pushNamed(
+        'chatRoom',
+        pathParameters: {
+          'scope': channel.realm?.alias ?? 'global',
+          'alias': channel.alias,
+        },
+      ).then((value) {
+        if (mounted && value == true) {
+          _refreshChannels();
+        }
+      });
+    }
   }
 
+  SnRealm? _focusedRealm;
+  bool _isDirect = false;
+
   @override
   Widget build(BuildContext context) {
     final ua = context.read<UserProvider>();
+    final sn = context.read<SnNetworkProvider>();
+    final rel = context.read<SnRealmProvider>();
 
     if (!ua.isAuthorized) {
       return AppScaffold(
@@ -177,10 +231,8 @@ class _ChatScreenState extends State<ChatScreen> {
       );
     }
 
-    final doExpand = ResponsiveBreakpoints.of(context).largerOrEqualTo(DESKTOP);
-
-    final chatList = AppScaffold(
-      noBackground: doExpand,
+    return AppScaffold(
+      noBackground: ResponsiveScaffold.getIsExpand(context),
       appBar: AppBar(
         leading: AutoAppBarLeading(),
         title: Text('screenChat').tr(),
@@ -248,64 +300,198 @@ class _ChatScreenState extends State<ChatScreen> {
       body: Column(
         children: [
           LoadingIndicator(isActive: _isBusy),
-          Expanded(
-            child: MediaQuery.removePadding(
-              context: context,
-              removeTop: true,
+          if (_channels != null && ResponsiveScaffold.getIsExpand(context))
+            Expanded(
               child: RefreshIndicator(
-                onRefresh: () => Future.wait([
-                  Future.sync(() => _refreshChannels()),
-                  _fetchWhatsNew(),
-                ]),
-                child: ListView.builder(
-                  itemCount: _channels?.length ?? 0,
-                  itemBuilder: (context, idx) {
-                    final channel = _channels![idx];
-                    final lastMessage = _lastMessages?[channel.id];
+                onRefresh: () => Future.sync(() => _refreshChannels()),
+                child: Builder(builder: (context) {
+                  final scopeList = ListView(
+                    key: const Key('realm-list-view'),
+                    padding: EdgeInsets.zero,
+                    children: [
+                      ListTile(
+                        minTileHeight: 48,
+                        leading:
+                            const Icon(Symbols.inbox_text).padding(right: 4),
+                        contentPadding: EdgeInsets.only(left: 24, right: 24),
+                        title: Text('chatDirect').tr(),
+                        trailing: Row(
+                          mainAxisSize: MainAxisSize.min,
+                          crossAxisAlignment: CrossAxisAlignment.center,
+                          children: [
+                            if (_unreadCountsGrouped?[0] != null &&
+                                (_unreadCountsGrouped?[0] ?? 0) > 0)
+                              Badge(
+                                label: Text(
+                                  _unreadCountsGrouped![0].toString(),
+                                ),
+                              ),
+                          ],
+                        ),
+                        onTap: () {
+                          setState(() => _isDirect = true);
+                        },
+                      ),
+                      ...rel.availableRealms.map((ele) {
+                        return ListTile(
+                          minTileHeight: 48,
+                          contentPadding: EdgeInsets.only(left: 20, right: 24),
+                          leading: AccountImage(
+                            content: ele.avatar,
+                            radius: 16,
+                          ),
+                          trailing: Row(
+                            mainAxisSize: MainAxisSize.min,
+                            crossAxisAlignment: CrossAxisAlignment.center,
+                            children: [
+                              if (_unreadCountsGrouped?[ele.id] != null &&
+                                  (_unreadCountsGrouped?[ele.id] ?? 0) > 0)
+                                Badge(
+                                  label: Text(
+                                    _unreadCountsGrouped![ele.id].toString(),
+                                  ),
+                                ),
+                            ],
+                          ),
+                          title: Text(ele.name),
+                          onTap: () {
+                            setState(() => _focusedRealm = ele);
+                          },
+                        );
+                      }),
+                    ],
+                  );
 
-                    return _ChatChannelEntry(
-                      channel: channel,
-                      lastMessage: lastMessage,
-                      unreadCount: _unreadCounts?[channel.id],
-                      onTap: () {
-                        if (doExpand) {
-                          _unreadCounts?[channel.id] = 0;
-                          setState(() => _focusChannel = channel);
-                          return;
-                        }
-                        _onTapChannel(channel);
-                      },
-                    );
-                  },
+                  final directChatList = ListView(
+                    key: Key('direct-chat-list-view'),
+                    padding: EdgeInsets.zero,
+                    children: [
+                      ListTile(
+                        minTileHeight: 48,
+                        leading: const Icon(Symbols.arrow_left_alt),
+                        contentPadding: EdgeInsets.only(left: 24),
+                        title: Text('back').tr(),
+                        onTap: () {
+                          setState(() => _isDirect = false);
+                        },
+                      ),
+                      const Divider(height: 1),
+                      ..._channels!.where((ele) => ele.type == 1).map(
+                        (ele) {
+                          return _ChatChannelEntry(
+                            channel: ele,
+                            unreadCount: _unreadCounts?[ele.id],
+                            lastMessage: _lastMessages?[ele.id],
+                            isCompact: true,
+                            onTap: () => _onTapChannel(ele),
+                          );
+                        },
+                      )
+                    ],
+                  );
+
+                  final realmScopedChatList = _focusedRealm == null
+                      ? const SizedBox.shrink()
+                      : ListView(
+                          key: ValueKey(_focusedRealm),
+                          padding: EdgeInsets.zero,
+                          children: [
+                            if (_focusedRealm!.banner != null)
+                              AspectRatio(
+                                aspectRatio: 16 / 7,
+                                child: AutoResizeUniversalImage(
+                                  sn.getAttachmentUrl(
+                                    _focusedRealm!.banner!,
+                                  ),
+                                  fit: BoxFit.cover,
+                                ),
+                              ),
+                            ListTile(
+                              minTileHeight: 48,
+                              tileColor: Theme.of(context)
+                                  .colorScheme
+                                  .surfaceContainer,
+                              leading: AccountImage(
+                                content: _focusedRealm!.avatar,
+                                radius: 16,
+                              ),
+                              contentPadding: EdgeInsets.only(
+                                left: 20,
+                                right: 16,
+                              ),
+                              trailing: IconButton(
+                                icon: const Icon(Symbols.close),
+                                padding: EdgeInsets.zero,
+                                constraints: const BoxConstraints(),
+                                visualDensity: VisualDensity.compact,
+                                onPressed: () {
+                                  setState(() => _focusedRealm = null);
+                                },
+                              ),
+                              title: Text(_focusedRealm!.name),
+                            ),
+                            ...(_channels!
+                                .where(
+                                    (ele) => ele.realmId == _focusedRealm?.id)
+                                .map(
+                              (ele) {
+                                return _ChatChannelEntry(
+                                  channel: ele,
+                                  unreadCount: _unreadCounts?[ele.id],
+                                  lastMessage: _lastMessages?[ele.id],
+                                  onTap: () => _onTapChannel(ele),
+                                  isCompact: true,
+                                );
+                              },
+                            ))
+                          ],
+                        );
+
+                  return PageTransitionSwitcher(
+                    duration: const Duration(milliseconds: 300),
+                    transitionBuilder: (Widget child,
+                        Animation<double> primaryAnimation,
+                        Animation<double> secondaryAnimation) {
+                      return SharedAxisTransition(
+                        animation: primaryAnimation,
+                        secondaryAnimation: secondaryAnimation,
+                        fillColor: Colors.transparent,
+                        transitionType: SharedAxisTransitionType.horizontal,
+                        child: child,
+                      );
+                    },
+                    child: (_focusedRealm == null && !_isDirect)
+                        ? scopeList
+                        : _isDirect
+                            ? directChatList
+                            : realmScopedChatList,
+                  );
+                }),
+              ),
+            )
+          else if (_channels != null)
+            Expanded(
+              child: RefreshIndicator(
+                onRefresh: () => Future.sync(() => _refreshChannels()),
+                child: ListView(
+                  key: const Key('chat-list-view'),
+                  padding: EdgeInsets.zero,
+                  children: [
+                    ...(_channels!.map((ele) {
+                      return _ChatChannelEntry(
+                        channel: ele,
+                        unreadCount: _unreadCounts?[ele.id],
+                        lastMessage: _lastMessages?[ele.id],
+                        onTap: () => _onTapChannel(ele),
+                      );
+                    }))
+                  ],
                 ),
               ),
             ),
-          ),
         ],
       ),
     );
-
-    if (doExpand) {
-      return AppBackground(
-        isRoot: true,
-        child: Row(
-          children: [
-            SizedBox(width: 340, child: chatList),
-            const VerticalDivider(width: 1),
-            if (_focusChannel != null)
-              Expanded(
-                child: ChatRoomScreen(
-                  key: ValueKey(_focusChannel!.id),
-                  scope: _focusChannel!.realm?.alias ?? 'global',
-                  alias: _focusChannel!.alias,
-                ),
-              ),
-          ],
-        ),
-      );
-    }
-
-    return chatList;
   }
 }
 
@@ -314,11 +500,13 @@ class _ChatChannelEntry extends StatelessWidget {
   final int? unreadCount;
   final SnChatMessage? lastMessage;
   final Function? onTap;
+  final bool isCompact;
   const _ChatChannelEntry({
     required this.channel,
     this.unreadCount,
     this.lastMessage,
     this.onTap,
+    this.isCompact = false,
   });
 
   @override
@@ -337,6 +525,34 @@ class _ChatChannelEntry extends StatelessWidget {
         ? ud.getFromCache(otherMember.accountId)?.nick ?? channel.name
         : channel.name;
 
+    if (isCompact) {
+      return ListTile(
+        minTileHeight: 48,
+        contentPadding:
+            EdgeInsets.only(left: otherMember != null ? 20 : 24, right: 24),
+        leading: otherMember != null
+            ? AccountImage(
+                content: ud.getFromCache(otherMember.accountId)?.avatar,
+                radius: 16,
+              )
+            : const Icon(Symbols.tag),
+        trailing: Row(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            if (unreadCount != null && (unreadCount ?? 0) > 0)
+              Badge(
+                label: Text(unreadCount.toString()),
+              ),
+          ],
+        ),
+        title: Text(title),
+        onTap: () {
+          onTap?.call();
+        },
+      );
+    }
+
     return ListTile(
       title: Row(
         children: [
@@ -399,7 +615,7 @@ class _ChatChannelEntry extends StatelessWidget {
         content: otherMember != null
             ? ud.getFromCache(otherMember.accountId)?.avatar
             : channel.realm?.avatar,
-        fallbackWidget: const Icon(Symbols.chat, size: 20),
+        fallbackWidget: const Icon(Symbols.tag, size: 20),
       ),
       onTap: () => onTap?.call(),
     );

lib/screens/chat/call_room.dart

@@ -1,301 +0,0 @@
-import 'dart:math' as math;
-
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:gap/gap.dart';
-import 'package:livekit_client/livekit_client.dart' as livekit;
-import 'package:provider/provider.dart';
-import 'package:styled_widget/styled_widget.dart';
-import 'package:surface/providers/chat_call.dart';
-import 'package:surface/widgets/chat/call/call_controls.dart';
-import 'package:surface/widgets/chat/call/call_participant.dart';
-import 'package:surface/widgets/navigation/app_scaffold.dart';
-
-class CallRoomScreen extends StatefulWidget {
-  final String scope;
-  final String alias;
-
-  const CallRoomScreen({super.key, required this.scope, required this.alias});
-
-  @override
-  State<CallRoomScreen> createState() => _CallRoomScreenState();
-}
-
-class _CallRoomScreenState extends State<CallRoomScreen> {
-  int _layoutMode = 0;
-
-  void _switchLayout() {
-    if (_layoutMode < 1) {
-      setState(() => _layoutMode++);
-    } else {
-      setState(() => _layoutMode = 0);
-    }
-  }
-
-  Widget _buildListLayout() {
-    final call = context.read<ChatCallProvider>();
-    return Stack(
-      children: [
-        Container(
-          color: Theme.of(context).colorScheme.surfaceContainer.withOpacity(0.75),
-          child: call.focusTrack != null
-              ? InteractiveParticipantWidget(
-                  isFixedAvatar: false,
-                  participant: call.focusTrack!,
-                  onTap: () {},
-                )
-              : const SizedBox.shrink(),
-        ),
-        Positioned(
-          left: 0,
-          right: 0,
-          top: 0,
-          child: SizedBox(
-            height: 128,
-            child: ListView.builder(
-              scrollDirection: Axis.horizontal,
-              itemCount: math.max(0, call.participantTracks.length),
-              itemBuilder: (BuildContext context, int index) {
-                final track = call.participantTracks[index];
-                if (track.participant.sid == call.focusTrack?.participant.sid) {
-                  return Container();
-                }
-
-                return Padding(
-                  padding: const EdgeInsets.only(top: 8, left: 8),
-                  child: ClipRRect(
-                    borderRadius: const BorderRadius.all(Radius.circular(8)),
-                    child: InteractiveParticipantWidget(
-                      isFixedAvatar: true,
-                      width: 120,
-                      height: 120,
-                      color: Theme.of(context).cardColor,
-                      participant: track,
-                      onTap: () {
-                        if (track.participant.sid != call.focusTrack?.participant.sid) {
-                          call.setFocusTrack(track);
-                        }
-                      },
-                    ),
-                  ),
-                );
-              },
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  Widget _buildGridLayout() {
-    final call = context.read<ChatCallProvider>();
-
-    return LayoutBuilder(builder: (context, constraints) {
-      double screenWidth = constraints.maxWidth;
-      double screenHeight = constraints.maxHeight;
-
-      int columns = (math.sqrt(call.participantTracks.length)).ceil();
-      int rows = (call.participantTracks.length / columns).ceil();
-
-      double tileWidth = screenWidth / columns;
-      double tileHeight = screenHeight / rows;
-
-      return StyledWidget(GridView.builder(
-        gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-          crossAxisCount: columns,
-          childAspectRatio: tileWidth / tileHeight,
-          crossAxisSpacing: 8,
-          mainAxisSpacing: 8,
-        ),
-        itemCount: math.max(0, call.participantTracks.length),
-        itemBuilder: (BuildContext context, int index) {
-          final track = call.participantTracks[index];
-          return Card(
-            child: ClipRRect(
-              borderRadius: const BorderRadius.all(Radius.circular(8)),
-              child: InteractiveParticipantWidget(
-                color: Theme.of(context).colorScheme.surfaceContainerHigh.withOpacity(0.75),
-                participant: track,
-                onTap: () {
-                  if (track.participant.sid != call.focusTrack?.participant.sid) {
-                    call.setFocusTrack(track);
-                  }
-                },
-              ),
-            ),
-          );
-        },
-      )).padding(all: 8);
-    });
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    final call = context.read<ChatCallProvider>();
-
-    Future.delayed(Duration.zero, () {
-      call
-        ..setupRoom()
-        ..enableDurationUpdater();
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final call = context.read<ChatCallProvider>();
-
-    return ListenableBuilder(
-        listenable: call,
-        builder: (context, _) {
-          return AppScaffold(
-            appBar: AppBar(
-              title: RichText(
-                textAlign: TextAlign.center,
-                text: TextSpan(children: [
-                  TextSpan(
-                    text: 'call'.tr(),
-                    style: Theme.of(context).textTheme.titleLarge!.copyWith(
-                          color: Theme.of(context).appBarTheme.foregroundColor,
-                        ),
-                  ),
-                  const TextSpan(text: '\n'),
-                  TextSpan(
-                    text: call.lastDuration.toString(),
-                    style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                          color: Theme.of(context).appBarTheme.foregroundColor,
-                        ),
-                  ),
-                ]),
-              ),
-            ),
-            body: GestureDetector(
-              behavior: HitTestBehavior.translucent,
-              child: Column(
-                children: [
-                  SizedBox(
-                    width: MediaQuery.of(context).size.width,
-                    height: 64,
-                    child: Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      crossAxisAlignment: CrossAxisAlignment.center,
-                      children: [
-                        Builder(builder: (context) {
-                          final call = context.read<ChatCallProvider>();
-                          final connectionQuality =
-                              call.room.localParticipant?.connectionQuality ?? livekit.ConnectionQuality.unknown;
-                          return Expanded(
-                            child: Column(
-                              mainAxisSize: MainAxisSize.min,
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: [
-                                Row(
-                                  children: [
-                                    Text(
-                                      call.channel?.name ?? 'unknown'.tr(),
-                                      style: const TextStyle(
-                                        fontWeight: FontWeight.bold,
-                                      ),
-                                    ),
-                                    const Gap(6),
-                                    Text(call.lastDuration.toString())
-                                  ],
-                                ),
-                                Row(
-                                  children: [
-                                    Text(
-                                      {
-                                        livekit.ConnectionState.disconnected: 'callStatusDisconnected'.tr(),
-                                        livekit.ConnectionState.connected: 'callStatusConnected'.tr(),
-                                        livekit.ConnectionState.connecting: 'callStatusConnecting'.tr(),
-                                        livekit.ConnectionState.reconnecting: 'callStatusReconnecting'.tr(),
-                                      }[call.room.connectionState]!,
-                                    ),
-                                    const Gap(6),
-                                    if (connectionQuality != livekit.ConnectionQuality.unknown)
-                                      Icon(
-                                        {
-                                          livekit.ConnectionQuality.excellent: Icons.signal_cellular_alt,
-                                          livekit.ConnectionQuality.good: Icons.signal_cellular_alt_2_bar,
-                                          livekit.ConnectionQuality.poor: Icons.signal_cellular_alt_1_bar,
-                                        }[connectionQuality],
-                                        color: {
-                                          livekit.ConnectionQuality.excellent: Colors.green,
-                                          livekit.ConnectionQuality.good: Colors.orange,
-                                          livekit.ConnectionQuality.poor: Colors.red,
-                                        }[connectionQuality],
-                                        size: 16,
-                                      )
-                                    else
-                                      const SizedBox(
-                                        width: 12,
-                                        height: 12,
-                                        child: CircularProgressIndicator(
-                                          color: Colors.white,
-                                          strokeWidth: 2,
-                                        ),
-                                      ).padding(all: 3),
-                                  ],
-                                ),
-                              ],
-                            ),
-                          );
-                        }),
-                        Row(
-                          children: [
-                            IconButton(
-                              icon: _layoutMode == 0 ? const Icon(Icons.view_list) : const Icon(Icons.grid_view),
-                              onPressed: () {
-                                _switchLayout();
-                              },
-                            ),
-                          ],
-                        ),
-                      ],
-                    ).padding(left: 20, right: 16),
-                  ),
-                  Expanded(
-                    child: Material(
-                      color: Theme.of(context).colorScheme.surfaceContainerLow,
-                      child: Builder(
-                        builder: (context) {
-                          switch (_layoutMode) {
-                            case 1:
-                              return _buildGridLayout();
-                            default:
-                              return _buildListLayout();
-                          }
-                        },
-                      ),
-                    ),
-                  ),
-                  if (call.room.localParticipant != null)
-                    SizedBox(
-                      width: MediaQuery.of(context).size.width,
-                      child: ControlsWidget(
-                        call.room,
-                        call.room.localParticipant!,
-                      ),
-                    ),
-                ],
-              ),
-              onTap: () {},
-            ),
-          );
-        });
-  }
-
-  @override
-  void deactivate() {
-    final call = context.read<ChatCallProvider>();
-    call.disableDurationUpdater();
-    super.deactivate();
-  }
-
-  @override
-  void activate() {
-    final call = context.read<ChatCallProvider>();
-    call.enableDurationUpdater();
-    super.activate();
-  }
-}

lib/screens/chat/channel_detail.dart

@@ -220,6 +220,7 @@ class _ChannelDetailScreenState extends State<ChannelDetailScreen> {
     final isOwned = ua.isAuthorized && _channel?.accountId == ua.user?.id;
 
     return AppScaffold(
+      noBackground: ResponsiveScaffold.getIsExpand(context),
       appBar: AppBar(
         title: _channel != null ? Text(_channel!.name) : Text('loading').tr(),
       ),

lib/screens/chat/manage.dart

@@ -49,7 +49,8 @@ class _ChatManageScreenState extends State<ChatManageScreen> {
         resp.data?.map((e) => SnRealm.fromJson(e)) ?? [],
       );
       if (_editingChannel != null) {
-        _belongToRealm = _realms?.firstWhereOrNull((e) => e.id == _editingChannel!.realmId);
+        _belongToRealm =
+            _realms?.firstWhereOrNull((e) => e.id == _editingChannel!.realmId);
       }
     } catch (err) {
       if (mounted) context.showErrorDialog(err);
@@ -97,7 +98,8 @@ class _ChatManageScreenState extends State<ChatManageScreen> {
       'is_community': _isCommunity,
       if (_editingChannel != null && _belongToRealm == null)
         'new_belongs_realm': 'global'
-      else if (_editingChannel != null && _belongToRealm?.id != _editingChannel?.realm?.id)
+      else if (_editingChannel != null &&
+          _belongToRealm?.id != _editingChannel?.realm?.id)
         'new_belongs_realm': _belongToRealm!.alias,
     };
 
@@ -139,8 +141,11 @@ class _ChatManageScreenState extends State<ChatManageScreen> {
   @override
   Widget build(BuildContext context) {
     return AppScaffold(
+      noBackground: ResponsiveScaffold.getIsExpand(context),
       appBar: AppBar(
-        title: widget.editingChannelAlias != null ? Text('screenChatManage').tr() : Text('screenChatNew').tr(),
+        title: widget.editingChannelAlias != null
+            ? Text('screenChatManage').tr()
+            : Text('screenChatNew').tr(),
       ),
       body: SingleChildScrollView(
         child: Column(
@@ -152,7 +157,8 @@ class _ChatManageScreenState extends State<ChatManageScreen> {
                 leadingPadding: const EdgeInsets.only(left: 10, right: 20),
                 dividerColor: Colors.transparent,
                 content: Text(
-                  'channelEditingNotice'.tr(args: ['#${_editingChannel!.alias}']),
+                  'channelEditingNotice'
+                      .tr(args: ['#${_editingChannel!.alias}']),
                 ),
                 actions: [
                   TextButton(
@@ -192,12 +198,15 @@ class _ChatManageScreenState extends State<ChatManageScreen> {
                                   mainAxisSize: MainAxisSize.min,
                                   crossAxisAlignment: CrossAxisAlignment.start,
                                   children: [
-                                    Text(item.name).textStyle(Theme.of(context).textTheme.bodyMedium!),
+                                    Text(item.name).textStyle(Theme.of(context)
+                                        .textTheme
+                                        .bodyMedium!),
                                     Text(
                                       item.description,
                                       maxLines: 1,
                                       overflow: TextOverflow.ellipsis,
-                                    ).textStyle(Theme.of(context).textTheme.bodySmall!),
+                                    ).textStyle(
+                                        Theme.of(context).textTheme.bodySmall!),
                                   ],
                                 ),
                               ),
@@ -213,7 +222,8 @@ class _ChatManageScreenState extends State<ChatManageScreen> {
                         CircleAvatar(
                           radius: 16,
                           backgroundColor: Colors.transparent,
-                          foregroundColor: Theme.of(context).colorScheme.onSurface,
+                          foregroundColor:
+                              Theme.of(context).colorScheme.onSurface,
                           child: const Icon(Symbols.clear),
                         ),
                         const Gap(12),
@@ -222,7 +232,9 @@ class _ChatManageScreenState extends State<ChatManageScreen> {
                             mainAxisSize: MainAxisSize.min,
                             crossAxisAlignment: CrossAxisAlignment.start,
                             children: [
-                              Text('fieldChatBelongToRealmUnset').tr().textStyle(
+                              Text('fieldChatBelongToRealmUnset')
+                                  .tr()
+                                  .textStyle(
                                     Theme.of(context).textTheme.bodyMedium!,
                                   ),
                             ],
@@ -257,7 +269,8 @@ class _ChatManageScreenState extends State<ChatManageScreen> {
                     helperText: 'fieldChatAliasHint'.tr(),
                     helperMaxLines: 2,
                   ),
-                  onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                  onTapOutside: (_) =>
+                      FocusManager.instance.primaryFocus?.unfocus(),
                 ),
                 const Gap(4),
                 TextField(
@@ -266,7 +279,8 @@ class _ChatManageScreenState extends State<ChatManageScreen> {
                     border: const UnderlineInputBorder(),
                     labelText: 'fieldChatName'.tr(),
                   ),
-                  onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                  onTapOutside: (_) =>
+                      FocusManager.instance.primaryFocus?.unfocus(),
                 ),
                 const Gap(4),
                 TextField(
@@ -277,7 +291,8 @@ class _ChatManageScreenState extends State<ChatManageScreen> {
                     border: const UnderlineInputBorder(),
                     labelText: 'fieldChatDescription'.tr(),
                   ),
-                  onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
+                  onTapOutside: (_) =>
+                      FocusManager.instance.primaryFocus?.unfocus(),
                 ),
                 const Gap(12),
                 CheckboxListTile(

lib/screens/chat/room.dart

@@ -1,19 +1,20 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:developer';
+import 'dart:io';
 
-import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:go_router/go_router.dart';
+import 'package:jitsi_meet_flutter_sdk/jitsi_meet_flutter_sdk.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:provider/provider.dart';
 import 'package:styled_widget/styled_widget.dart';
 import 'package:surface/controllers/chat_message_controller.dart';
 import 'package:surface/controllers/post_write_controller.dart';
 import 'package:surface/providers/channel.dart';
-import 'package:surface/providers/chat_call.dart';
 import 'package:surface/providers/notification.dart';
 import 'package:surface/providers/sn_network.dart';
 import 'package:surface/providers/user_directory.dart';
@@ -21,13 +22,13 @@ import 'package:surface/providers/userinfo.dart';
 import 'package:surface/providers/websocket.dart';
 import 'package:surface/types/chat.dart';
 import 'package:surface/types/websocket.dart';
-import 'package:surface/widgets/chat/call/call_prejoin.dart';
 import 'package:surface/widgets/chat/chat_message.dart';
 import 'package:surface/widgets/chat/chat_message_input.dart';
 import 'package:surface/widgets/chat/chat_typing_indicator.dart';
 import 'package:surface/widgets/dialog.dart';
 import 'package:surface/widgets/loading_indicator.dart';
 import 'package:surface/widgets/navigation/app_scaffold.dart';
+import 'package:url_launcher/url_launcher_string.dart';
 import 'package:very_good_infinite_list/very_good_infinite_list.dart';
 
 class ChatRoomScreenExtra {
@@ -51,13 +52,11 @@ class ChatRoomScreen extends StatefulWidget {
 
 class _ChatRoomScreenState extends State<ChatRoomScreen> {
   bool _isBusy = false;
-  bool _isCalling = false;
   bool _isJoining = false;
 
   SnChannel? _channel;
   SnChannelMember? _currentMember;
   SnChannelMember? _otherMember;
-  SnChatCall? _ongoingCall;
 
   final GlobalKey<ChatMessageInputState> _inputGlobalKey = GlobalKey();
   late final ChatMessageController _messageController;
@@ -139,88 +138,35 @@ class _ChatRoomScreenState extends State<ChatRoomScreen> {
     }
   }
 
-  Future<void> _fetchOngoingCall() async {
-    setState(() => _isCalling = true);
-
-    try {
-      final sn = context.read<SnNetworkProvider>();
-      final resp = await sn.client.get(
-        '/cgi/im/channels/${_messageController.channel!.keyPath}/calls/ongoing',
-        options: Options(
-          validateStatus: (status) => status != null && status < 500,
-          receiveTimeout: const Duration(seconds: 60),
-          sendTimeout: const Duration(seconds: 60),
-        ),
-      );
-      if (resp.statusCode == 200) {
-        _ongoingCall = SnChatCall.fromJson(resp.data);
-      }
-    } catch (err) {
-      if (!mounted) return;
-      context.showErrorDialog(err);
-    } finally {
-      setState(() => _isCalling = false);
+  Future<void> _joinCall() async {
+    if (kIsWeb || !(Platform.isIOS || Platform.isAndroid)) {
+      return await _joinCallWeb();
     }
-  }
-
-  Future<void> _makeCall() async {
-    setState(() => _isCalling = true);
-
-    try {
-      final sn = context.read<SnNetworkProvider>();
-      await sn.client.post(
-        '/cgi/im/channels/${_messageController.channel!.keyPath}/calls',
-        options: Options(
-          sendTimeout: const Duration(seconds: 30),
-          receiveTimeout: const Duration(seconds: 30),
-        ),
-      );
-    } catch (err) {
-      if (!mounted) return;
-      if (_ongoingCall == null) {
-        // ignore the error because the call is already ongoing
-        context.showErrorDialog(err);
-      }
-    } finally {
-      setState(() => _isCalling = false);
-    }
-  }
-
-  Future<void> _endCall() async {
-    setState(() => _isCalling = true);
-
-    try {
-      final sn = context.read<SnNetworkProvider>();
-      await sn.client.delete(
-        '/cgi/im/channels/${_messageController.channel!.keyPath}/calls/ongoing',
-      );
-    } catch (err) {
-      if (!mounted) return;
-      context.showErrorDialog(err);
-    } finally {
-      setState(() => _isCalling = false);
-    }
-  }
-
-  Future<void> _onCallJoin() async {
-    await showModalBottomSheet(
-      context: context,
-      builder: (context) => ChatCallPrejoinPopup(
-        ongoingCall: _ongoingCall!,
-        channel: _channel!,
-        onJoin: _onCallResume,
+    final sn = context.read<SnNetworkProvider>();
+    final ua = context.read<UserProvider>();
+    final meet = JitsiMeet();
+    final confOpts = JitsiMeetConferenceOptions(
+      room: 'sn-chat-${_channel!.alias}-${_channel!.id}',
+      serverURL: 'https://meet.element.io',
+      configOverrides: {
+        "subject": _channel!.name,
+      },
+      userInfo: JitsiMeetUserInfo(
+        avatar: ua.user!.avatar.isNotEmpty
+            ? sn.getAttachmentUrl(ua.user!.avatar)
+            : null,
+        displayName: _currentMember!.nick ?? ua.user!.nick,
       ),
     );
+    meet.join(confOpts);
   }
 
-  void _onCallResume() {
-    GoRouter.of(context).pushNamed(
-      'chatCallRoom',
-      pathParameters: {
-        'scope': _channel!.realm?.alias ?? 'global',
-        'alias': _channel!.alias,
-      },
-    );
+  Future<void> _joinCallWeb() async {
+    final sn = context.read<SnNetworkProvider>();
+    final ua = context.read<UserProvider>();
+    final url =
+        '${sn.client.options.baseUrl}/meet/${_channel!.alias}-${_channel!.id}?tk=${await ua.atk}';
+    launchUrlString(url);
   }
 
   bool _checkMessageMergeable(SnChatMessage? a, SnChatMessage? b) {
@@ -248,10 +194,7 @@ class _ChatRoomScreenState extends State<ChatRoomScreen> {
         });
       }
 
-      await Future.wait([
-        _messageController.checkUpdate(),
-        _fetchOngoingCall(),
-      ]);
+      await _messageController.checkUpdate();
     });
   }
 
@@ -260,23 +203,6 @@ class _ChatRoomScreenState extends State<ChatRoomScreen> {
     super.initState();
     _messageController = ChatMessageController(context);
     _initializeChat();
-
-    _wsSubscription = _ws.pk.stream.listen((event) {
-      switch (event.method) {
-        case 'calls.new':
-          final payload = SnChatCall.fromJson(event.payload!);
-          if (payload.channelId == _channel?.id) {
-            setState(() => _ongoingCall = payload);
-          }
-          break;
-        case 'calls.end':
-          final payload = SnChatCall.fromJson(event.payload!);
-          if (payload.channelId == _channel?.id) {
-            setState(() => _ongoingCall = null);
-          }
-          break;
-      }
-    });
   }
 
   @override
@@ -300,10 +226,10 @@ class _ChatRoomScreenState extends State<ChatRoomScreen> {
 
   @override
   Widget build(BuildContext context) {
-    final call = context.watch<ChatCallProvider>();
     final ud = context.read<UserDirectoryProvider>();
 
     return AppScaffold(
+      noBackground: ResponsiveScaffold.getIsExpand(context),
       appBar: AppBar(
         title: Text(
           _channel?.type == 1
@@ -323,14 +249,9 @@ class _ChatRoomScreenState extends State<ChatRoomScreen> {
             ),
           if (_currentMember != null)
             IconButton(
-              icon: _ongoingCall == null
-                  ? const Icon(Symbols.call)
-                  : const Icon(Symbols.call_end),
-              onPressed: _isCalling
-                  ? null
-                  : _ongoingCall == null
-                      ? _makeCall
-                      : _endCall,
+              icon: const Icon(Symbols.video_call),
+              onPressed: _joinCall,
+              onLongPress: _joinCallWeb,
             ),
           IconButton(
             icon: const Icon(Symbols.more_vert),
@@ -358,28 +279,6 @@ class _ChatRoomScreenState extends State<ChatRoomScreen> {
               LoadingIndicator(
                 isActive: _isBusy || _messageController.isAggressiveLoading,
               ),
-              SingleChildScrollView(
-                physics: const NeverScrollableScrollPhysics(),
-                child: MaterialBanner(
-                  dividerColor: Colors.transparent,
-                  leading: const Icon(Symbols.call_received),
-                  content: Text('callOngoingNotice').tr().padding(top: 2),
-                  actions: [
-                    if (call.current == null)
-                      TextButton(
-                        onPressed: _onCallJoin,
-                        child: Text('callJoin').tr(),
-                      )
-                    else if (call.current?.channelId == _channel?.id)
-                      TextButton(
-                        onPressed: _onCallResume,
-                        child: Text('callResume').tr(),
-                      )
-                  ],
-                ),
-              ).height(_ongoingCall != null ? 54 : 0, animate: true).animate(
-                  const Duration(milliseconds: 300),
-                  Curves.fastLinearToSlowEaseIn),
               if (_currentMember == null && !_isBusy)
                 Expanded(
                   child: Center(

lib/screens/explore.dart

@@ -17,10 +17,9 @@ import 'package:surface/types/realm.dart';
 import 'package:surface/widgets/account/account_image.dart';
 import 'package:surface/widgets/app_bar_leading.dart';
 import 'package:surface/widgets/dialog.dart';
-import 'package:surface/widgets/feed/feed_news.dart';
+import 'package:surface/widgets/feed/feed_reader.dart';
 import 'package:surface/widgets/feed/feed_unknown.dart';
 import 'package:surface/widgets/navigation/app_scaffold.dart';
-import 'package:surface/widgets/post/fediverse_post_item.dart';
 import 'package:surface/widgets/post/post_item.dart';
 import 'package:very_good_infinite_list/very_good_infinite_list.dart';
 
@@ -157,6 +156,7 @@ class _ExploreScreenState extends State<ExploreScreen>
   Widget build(BuildContext context) {
     final cfg = context.watch<ConfigProvider>();
     return AppScaffold(
+      noBackground: ResponsiveScaffold.getIsExpand(context),
       floatingActionButtonLocation: ExpandableFab.location,
       floatingActionButton: ExpandableFab(
         key: _fabKey,
@@ -243,6 +243,8 @@ class _ExploreScreenState extends State<ExploreScreen>
                         GoRouter.of(context).pushNamed('postShuffle');
                       },
                     ),
+                    if (ResponsiveBreakpoints.of(context).largerThan(MOBILE))
+                      const Gap(48),
                     Expanded(
                       child: Center(
                         child: IconButton(
@@ -463,7 +465,7 @@ class _PostListWidgetState extends State<_PostListWidget> {
     final pt = context.read<SnPostContentProvider>();
     final result = await pt.getFeed(
       cursor: _feed
-          .where((ele) => !['reader.news'].contains(ele.type))
+          .where((ele) => !['reader.feed'].contains(ele.type))
           .lastOrNull
           ?.createdAt,
     );
@@ -534,6 +536,7 @@ class _PostListWidgetState extends State<_PostListWidget> {
             switch (ele.type) {
               case 'interactive.post':
                 return OpenablePostItem(
+                  useReplace: true,
                   data: SnPost.fromJson(ele.data),
                   maxWidth: 640,
                   onChanged: (data) {
@@ -545,12 +548,7 @@ class _PostListWidgetState extends State<_PostListWidget> {
                     refreshPosts();
                   },
                 );
-              case 'fediverse.post':
-                return FediversePostWidget(
-                  data: SnFediversePost.fromJson(ele.data),
-                  maxWidth: 640,
-                );
-              case 'reader.news':
+              case 'reader.feed':
                 return Center(
                   child: Container(
                     constraints: BoxConstraints(maxWidth: 640),

lib/screens/feed/feed_detail.dart

@@ -14,23 +14,23 @@ import 'package:surface/widgets/navigation/app_scaffold.dart';
 import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 
-class NewsDetailScreen extends StatefulWidget {
-  final String hash;
+class ReaderPageScreen extends StatefulWidget {
+  final String id;
 
-  const NewsDetailScreen({super.key, required this.hash});
+  const ReaderPageScreen({super.key, required this.id});
 
   @override
-  State<NewsDetailScreen> createState() => _NewsDetailScreenState();
+  State<ReaderPageScreen> createState() => _ReaderPageScreenState();
 }
 
-class _NewsDetailScreenState extends State<NewsDetailScreen> {
-  SnNewsArticle? _article;
+class _ReaderPageScreenState extends State<ReaderPageScreen> {
+  SnSubscriptionItem? _article;
 
   Future<void> _fetchArticle() async {
     try {
       final sn = context.read<SnNetworkProvider>();
-      final resp = await sn.client.get('/cgi/re/news/${widget.hash}');
-      _article = SnNewsArticle.fromJson(resp.data);
+      final resp = await sn.client.get('/cgi/re/subscriptions/${widget.id}');
+      _article = SnSubscriptionItem.fromJson(resp.data);
     } catch (err) {
       if (!mounted) return;
       context.showErrorDialog(err).then((_) {

lib/screens/friend.dart

@@ -10,7 +10,6 @@ import 'package:surface/providers/userinfo.dart';
 import 'package:surface/types/account.dart';
 import 'package:surface/widgets/account/account_image.dart';
 import 'package:surface/widgets/account/account_select.dart';
-import 'package:surface/widgets/app_bar_leading.dart';
 import 'package:surface/widgets/dialog.dart';
 import 'package:surface/widgets/loading_indicator.dart';
 import 'package:surface/widgets/navigation/app_scaffold.dart';
@@ -47,8 +46,7 @@ class _FriendScreenState extends State<FriendScreen> {
       final sn = context.read<SnNetworkProvider>();
       final resp = await sn.client.get('/cgi/id/users/me/relations?status=1');
       _relations = List<SnRelationship>.from(
-        resp.data?.map((e) => SnRelationship.fromJson(e)) ?? [],
-      );
+          resp.data?.map((e) => SnRelationship.fromJson(e)) ?? []);
     } catch (err) {
       if (!mounted) return;
       context.showErrorDialog(err);
@@ -67,8 +65,7 @@ class _FriendScreenState extends State<FriendScreen> {
       final sn = context.read<SnNetworkProvider>();
       final resp = await sn.client.get('/cgi/id/users/me/relations?status=0,3');
       _requests = List<SnRelationship>.from(
-        resp.data?.map((e) => SnRelationship.fromJson(e)) ?? [],
-      );
+          resp.data?.map((e) => SnRelationship.fromJson(e)) ?? []);
     } catch (err) {
       if (!mounted) return;
       context.showErrorDialog(err);
@@ -87,8 +84,7 @@ class _FriendScreenState extends State<FriendScreen> {
       final sn = context.read<SnNetworkProvider>();
       final resp = await sn.client.get('/cgi/id/users/me/relations?status=2');
       _blocks = List<SnRelationship>.from(
-        resp.data?.map((e) => SnRelationship.fromJson(e)) ?? [],
-      );
+          resp.data?.map((e) => SnRelationship.fromJson(e)) ?? []);
     } catch (err) {
       if (!mounted) return;
       context.showErrorDialog(err);
@@ -105,10 +101,7 @@ class _FriendScreenState extends State<FriendScreen> {
     try {
       final rel = context.read<SnRelationshipProvider>();
       await rel.updateRelationship(
-        relation.relatedId,
-        dstStatus,
-        relation.permNodes,
-      );
+          relation.relatedId, dstStatus, relation.permNodes);
       if (!mounted) return;
       _fetchRelations();
     } catch (err) {
@@ -122,9 +115,8 @@ class _FriendScreenState extends State<FriendScreen> {
   Future<void> _deleteRelation(SnRelationship relation) async {
     final confirm = await context.showConfirmDialog(
       'friendDelete'.tr(args: [relation.related?.nick ?? 'unknown'.tr()]),
-      'friendDeleteDescription'.tr(args: [
-        relation.related?.nick ?? 'unknown'.tr(),
-      ]),
+      'friendDeleteDescription'
+          .tr(args: [relation.related?.nick ?? 'unknown'.tr()]),
     );
     if (!confirm) return;
     if (!mounted) return;
@@ -146,9 +138,11 @@ class _FriendScreenState extends State<FriendScreen> {
 
   void _showRequests() {
     showModalBottomSheet(
-      context: context,
-      builder: (context) => _FriendshipListWidget(relations: _requests),
-    ).then((value) {
+            context: context,
+            builder: (context) => _FriendshipListWidget(relations: _requests))
+        .then((
+      value,
+    ) {
       if (value != null) {
         _fetchRequests();
         _fetchRelations();
@@ -158,9 +152,10 @@ class _FriendScreenState extends State<FriendScreen> {
 
   void _showBlocks() {
     showModalBottomSheet(
-      context: context,
-      builder: (context) => _FriendshipListWidget(relations: _blocks),
-    ).then((value) {
+        context: context,
+        builder: (context) => _FriendshipListWidget(relations: _blocks)).then((
+      value,
+    ) {
       if (value != null) {
         _fetchBlocks();
         _fetchRelations();
@@ -173,9 +168,8 @@ class _FriendScreenState extends State<FriendScreen> {
 
     try {
       final sn = context.read<SnNetworkProvider>();
-      await sn.client.post('/cgi/id/users/me/relations', data: {
-        'related': user.name,
-      });
+      await sn.client
+          .post('/cgi/id/users/me/relations', data: {'related': user.name});
       if (!mounted) return;
       context.showSnackbar('friendRequestSent'.tr());
     } catch (err) {
@@ -201,18 +195,16 @@ class _FriendScreenState extends State<FriendScreen> {
     if (!ua.isAuthorized) {
       return AppScaffold(
         appBar: AppBar(
-          leading: AutoAppBarLeading(),
+          leading: PageBackButton(),
           title: Text('screenFriend').tr(),
         ),
-        body: Center(
-          child: UnauthorizedHint(),
-        ),
+        body: Center(child: UnauthorizedHint()),
       );
     }
 
     return AppScaffold(
       appBar: AppBar(
-        leading: AutoAppBarLeading(),
+        leading: PageBackButton(),
         title: Text('screenFriend').tr(),
       ),
       floatingActionButton: FloatingActionButton(
@@ -220,9 +212,7 @@ class _FriendScreenState extends State<FriendScreen> {
         onPressed: () async {
           final user = await showModalBottomSheet<SnAccount?>(
             context: context,
-            builder: (context) => AccountSelect(
-              title: 'friendNew'.tr(),
-            ),
+            builder: (context) => AccountSelect(title: 'friendNew'.tr()),
           );
           if (!mounted) return;
           if (user == null) return;
@@ -235,9 +225,8 @@ class _FriendScreenState extends State<FriendScreen> {
           if (_requests.isNotEmpty)
             ListTile(
               title: Text('friendRequests').tr(),
-              subtitle: Text(
-                'friendRequestsDescription',
-              ).plural(_requests.length),
+              subtitle:
+                  Text('friendRequestsDescription').plural(_requests.length),
               contentPadding: const EdgeInsets.symmetric(horizontal: 24),
               leading: const Icon(Symbols.group_add),
               trailing: const Icon(Symbols.chevron_right),
@@ -246,31 +235,30 @@ class _FriendScreenState extends State<FriendScreen> {
           if (_blocks.isNotEmpty)
             ListTile(
               title: Text('friendBlocklist').tr(),
-              subtitle: Text(
-                'friendBlocklistDescription',
-              ).plural(_blocks.length),
+              subtitle:
+                  Text('friendBlocklistDescription').plural(_blocks.length),
               contentPadding: const EdgeInsets.symmetric(horizontal: 24),
               leading: const Icon(Symbols.block),
               trailing: const Icon(Symbols.chevron_right),
               onTap: _showBlocks,
             ),
-          if (_requests.isNotEmpty || _blocks.isNotEmpty) const Divider(height: 1),
+          if (_requests.isNotEmpty || _blocks.isNotEmpty)
+            const Divider(height: 1),
           Expanded(
             child: MediaQuery.removePadding(
               context: context,
               removeTop: true,
               child: RefreshIndicator(
-                onRefresh: () => Future.wait([
-                  _fetchRelations(),
-                  _fetchRequests(),
-                ]),
+                onRefresh: () =>
+                    Future.wait([_fetchRelations(), _fetchRequests()]),
                 child: ListView.builder(
                   itemCount: _relations.length,
                   itemBuilder: (context, index) {
                     final relation = _relations[index];
                     final other = relation.related;
                     return ListTile(
-                      contentPadding: const EdgeInsets.only(right: 24, left: 16),
+                      contentPadding:
+                          const EdgeInsets.only(right: 24, left: 16),
                       leading: AccountImage(content: other?.avatar),
                       title: Text(other?.nick ?? 'unknown'),
                       subtitle: Text(other?.nick ?? 'unknown'),
@@ -286,12 +274,16 @@ class _FriendScreenState extends State<FriendScreen> {
                               mainAxisAlignment: MainAxisAlignment.end,
                               children: [
                                 InkWell(
-                                  onTap: _isUpdating ? null : () => _changeRelation(relation, 2),
+                                  onTap: _isUpdating
+                                      ? null
+                                      : () => _changeRelation(relation, 2),
                                   child: Text('friendBlock').tr(),
                                 ),
                                 const Gap(8),
                                 InkWell(
-                                  onTap: _isUpdating ? null : () => _deleteRelation(relation),
+                                  onTap: _isUpdating
+                                      ? null
+                                      : () => _deleteRelation(relation),
                                   child: Text('friendDeleteAction').tr(),
                                 ),
                               ],
@@ -361,10 +353,7 @@ class _FriendshipListWidgetState extends State<_FriendshipListWidget> {
     try {
       final rel = context.read<SnRelationshipProvider>();
       await rel.updateRelationship(
-        relation.relatedId,
-        dstStatus,
-        relation.permNodes,
-      );
+          relation.relatedId, dstStatus, relation.permNodes);
       if (!mounted) return;
       Navigator.pop(context, true);
     } catch (err) {
@@ -378,9 +367,8 @@ class _FriendshipListWidgetState extends State<_FriendshipListWidget> {
   Future<void> _deleteRelation(SnRelationship relation) async {
     final confirm = await context.showConfirmDialog(
       'friendDelete'.tr(args: [relation.related?.nick ?? 'unknown'.tr()]),
-      'friendDeleteDescription'.tr(args: [
-        relation.related?.nick ?? 'unknown'.tr(),
-      ]),
+      'friendDeleteDescription'
+          .tr(args: [relation.related?.nick ?? 'unknown'.tr()]),
     );
     if (!confirm) return;
     if (!mounted) return;
@@ -420,7 +408,9 @@ class _FriendshipListWidgetState extends State<_FriendshipListWidget> {
               mainAxisAlignment: MainAxisAlignment.center,
               crossAxisAlignment: CrossAxisAlignment.end,
               children: [
-                Text(kFriendStatus[relation.status] ?? 'unknown').tr().opacity(0.75),
+                Text(kFriendStatus[relation.status] ?? 'unknown')
+                    .tr()
+                    .opacity(0.75),
                 if (relation.status == 0)
                   Row(
                     mainAxisAlignment: MainAxisAlignment.end,
@@ -441,7 +431,8 @@ class _FriendshipListWidgetState extends State<_FriendshipListWidget> {
                     mainAxisAlignment: MainAxisAlignment.end,
                     children: [
                       InkWell(
-                        onTap: _isBusy ? null : () => _changeRelation(relation, 1),
+                        onTap:
+                            _isBusy ? null : () => _changeRelation(relation, 1),
                         child: Text('friendUnblock').tr(),
                       ),
                       const Gap(8),

lib/screens/home.dart

@@ -18,7 +18,7 @@ import 'package:surface/providers/sn_network.dart';
 import 'package:surface/providers/special_day.dart';
 import 'package:surface/providers/userinfo.dart';
 import 'package:surface/providers/widget.dart';
-import 'package:surface/screens/captcha.dart';
+import 'package:surface/screens/captcha/captcha.dart';
 import 'package:surface/types/check_in.dart';
 import 'package:surface/types/post.dart';
 import 'package:surface/widgets/app_bar_leading.dart';
@@ -396,35 +396,44 @@ class _HomeDashServiceStatusState extends State<_HomeDashServiceStatus> {
                 : switch (_serviceStatus) {
                     ServiceStatus.operational => Row(
                         children: [
-                          const Icon(
+                          Icon(
                             Symbols.check,
                             size: 20,
+                            color: Colors.green[900],
                           ),
                           const Gap(10),
-                          Text('serviceStatusOperational').tr(),
+                          Text('serviceStatusOperational')
+                              .tr()
+                              .textColor(Colors.green[900]),
                         ],
                       ),
                     ServiceStatus.failed => Tooltip(
                         message: 'serviceStatusFailedDescription'.tr(),
                         child: Row(
                           children: [
-                            const Icon(
+                            Icon(
                               Symbols.dangerous,
                               size: 20,
+                              color: Colors.red[900],
                             ),
                             const Gap(10),
-                            Text('serviceStatusFailed').tr(),
+                            Text('serviceStatusFailed')
+                                .tr()
+                                .textColor(Colors.red[900]),
                           ],
                         ),
                       ),
                     _ => Row(
                         children: [
-                          const Icon(
+                          Icon(
                             Symbols.error,
                             size: 20,
+                            color: Colors.orange[900],
                           ),
                           const Gap(10),
-                          Text('serviceStatusDowngraded').tr(),
+                          Text('serviceStatusDowngraded')
+                              .tr()
+                              .textColor(Colors.orange[900]),
                         ],
                       ),
                   },
@@ -509,9 +518,9 @@ class _HomeDashCheckInWidgetState extends State<_HomeDashCheckInWidget> {
   }
 
   Future<void> _doCheckIn() async {
-    final captchaTk = await Navigator.of(context, rootNavigator: true).push(
+    final captchaTk = await Navigator.of(context).push(
       MaterialPageRoute(
-        builder: (context) => TurnstileScreen(),
+        builder: (context) => CaptchaScreen(),
       ),
     );
     if (captchaTk == null) return;
@@ -806,7 +815,7 @@ class _HomeDashNotificationWidgetState
               child: IconButton(
                 icon: const Icon(Symbols.arrow_right_alt),
                 onPressed: () {
-                  GoRouter.of(context).goNamed('notification');
+                  GoRouter.of(context).pushNamed('notification');
                 },
               ),
             ),

lib/screens/news/news_list.dart

@@ -1,239 +0,0 @@
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:gap/gap.dart';
-import 'package:go_router/go_router.dart';
-import 'package:html/parser.dart';
-import 'package:provider/provider.dart';
-import 'package:relative_time/relative_time.dart';
-import 'package:styled_widget/styled_widget.dart';
-import 'package:surface/providers/sn_network.dart';
-import 'package:surface/types/news.dart';
-import 'package:surface/widgets/app_bar_leading.dart';
-import 'package:surface/widgets/dialog.dart';
-import 'package:surface/widgets/navigation/app_scaffold.dart';
-import 'package:surface/widgets/universal_image.dart';
-import 'package:very_good_infinite_list/very_good_infinite_list.dart';
-
-class NewsScreen extends StatefulWidget {
-  const NewsScreen({super.key});
-
-  @override
-  State<NewsScreen> createState() => _NewsScreenState();
-}
-
-class _NewsScreenState extends State<NewsScreen> {
-  List<SnNewsSource>? _sources;
-
-  @override
-  initState() {
-    super.initState();
-    _fetchSources();
-  }
-
-  Future<void> _fetchSources() async {
-    try {
-      final sn = context.read<SnNetworkProvider>();
-      final resp = await sn.client.get('/cgi/re/well-known/sources');
-      _sources = List<SnNewsSource>.from(
-        resp.data?.map((e) => SnNewsSource.fromJson(e)) ?? [],
-      );
-    } catch (err) {
-      if (!mounted) return;
-      context.showErrorDialog(err);
-    } finally {
-      setState(() {});
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    if (_sources == null) {
-      return AppScaffold(
-        appBar: AppBar(
-          leading: AutoAppBarLeading(),
-          title: Text('screenNews').tr(),
-        ),
-        body: Center(
-          child: CircularProgressIndicator(),
-        ),
-      );
-    }
-
-    return DefaultTabController(
-      length: _sources!.length + 1,
-      child: AppScaffold(
-        body: NestedScrollView(
-          headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
-            return <Widget>[
-              SliverOverlapAbsorber(
-                handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
-                sliver: SliverAppBar(
-                  leading: AutoAppBarLeading(),
-                  title: Text('screenNews').tr(),
-                  floating: true,
-                  snap: true,
-                  bottom: TabBar(
-                    isScrollable: true,
-                    tabs: [
-                      Tab(child: Text('newsAllSources'.tr()).textColor(Theme.of(context).appBarTheme.foregroundColor)),
-                      for (final source in _sources!)
-                        Tab(
-                          child: Text(source.label).textColor(Theme.of(context).appBarTheme.foregroundColor),
-                        ),
-                    ],
-                  ),
-                ),
-              ),
-            ];
-          },
-          body: TabBarView(
-            children: [
-              _NewsArticleListWidget(allSources: _sources!),
-              for (final source in _sources!)
-                _NewsArticleListWidget(
-                  source: source.id,
-                  allSources: _sources!,
-                ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}
-
-class _NewsArticleListWidget extends StatefulWidget {
-  final String? source;
-  final List<SnNewsSource> allSources;
-
-  const _NewsArticleListWidget({this.source, required this.allSources});
-
-  @override
-  State<_NewsArticleListWidget> createState() => _NewsArticleListWidgetState();
-}
-
-class _NewsArticleListWidgetState extends State<_NewsArticleListWidget> {
-  bool _isBusy = false;
-
-  int? _totalCount;
-  final List<SnNewsArticle> _articles = List.empty(growable: true);
-
-  Future<void> _fetchArticles() async {
-    setState(() => _isBusy = true);
-
-    try {
-      final sn = context.read<SnNetworkProvider>();
-      final resp = await sn.client.get('/cgi/re/news', queryParameters: {
-        'take': 10,
-        'offset': _articles.length,
-        if (widget.source != null) 'source': widget.source,
-      });
-      _totalCount = resp.data['count'];
-      _articles.addAll(List<SnNewsArticle>.from(
-        resp.data['data']?.map((e) => SnNewsArticle.fromJson(e)) ?? [],
-      ));
-    } catch (err) {
-      if (!mounted) return;
-      context.showErrorDialog(err);
-    } finally {
-      setState(() => _isBusy = false);
-    }
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    _fetchArticles();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return MediaQuery.removePadding(
-      context: context,
-      removeTop: true,
-      child: Center(
-        child: Container(
-          constraints: BoxConstraints(maxWidth: 640),
-          child: RefreshIndicator(
-            onRefresh: _fetchArticles,
-            child: InfiniteList(
-              isLoading: _isBusy,
-              itemCount: _articles.length,
-              hasReachedMax: _totalCount != null && _articles.length >= _totalCount!,
-              onFetchData: () {
-                _fetchArticles();
-              },
-              itemBuilder: (context, index) {
-                final article = _articles[index];
-
-                final baseUri = Uri.parse(article.url);
-                final baseUrl = '${baseUri.scheme}://${baseUri.host}';
-
-                final htmlDescription = parse(article.description);
-                final date = article.publishedAt ?? article.createdAt;
-
-                return Card(
-                  child: InkWell(
-                    radius: 8,
-                    onTap: () {
-                      GoRouter.of(context).pushNamed(
-                        'newsDetail',
-                        pathParameters: {'hash': article.hash},
-                      );
-                    },
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        if (article.thumbnail.isNotEmpty && !article.thumbnail.endsWith('.svg'))
-                          ClipRRect(
-                            borderRadius: BorderRadius.only(
-                              topRight: Radius.circular(8),
-                              topLeft: Radius.circular(8),
-                            ),
-                            child: AspectRatio(
-                              aspectRatio: 16 / 9,
-                              child: Container(
-                                color: Theme.of(context).colorScheme.surfaceContainer,
-                                child: AutoResizeUniversalImage(
-                                  article.thumbnail.startsWith('http')
-                                      ? article.thumbnail
-                                      : '$baseUrl/${article.thumbnail}',
-                                ),
-                              ),
-                            ),
-                          ),
-                        const Gap(16),
-                        Text(article.title).textStyle(Theme.of(context).textTheme.titleLarge!).padding(horizontal: 16),
-                        const Gap(8),
-                        Text(htmlDescription.children.map((ele) => ele.text.trim()).join())
-                            .textStyle(Theme.of(context).textTheme.bodyMedium!)
-                            .padding(horizontal: 16),
-                        const Gap(8),
-                        Row(
-                          spacing: 2,
-                          children: [
-                            Text(widget.allSources.where((x) => x.id == article.source).first.label)
-                                .textStyle(Theme.of(context).textTheme.bodySmall!),
-                          ],
-                        ).opacity(0.75).padding(horizontal: 16),
-                        Row(
-                          spacing: 2,
-                          children: [
-                            Text(DateFormat().format(date)).textStyle(Theme.of(context).textTheme.bodySmall!),
-                            Text(' · ').textStyle(Theme.of(context).textTheme.bodySmall!).bold(),
-                            Text(RelativeTime(context).format(date)).textStyle(Theme.of(context).textTheme.bodySmall!),
-                          ],
-                        ).opacity(0.75).padding(horizontal: 16),
-                        const Gap(16),
-                      ],
-                    ),
-                  ),
-                );
-              },
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}

lib/screens/notification.dart

@@ -11,13 +11,10 @@ import 'package:styled_widget/styled_widget.dart';
 import 'package:surface/providers/notification.dart';
 import 'package:surface/providers/sn_network.dart';
 import 'package:surface/types/notification.dart';
-import 'package:surface/types/post.dart';
-import 'package:surface/widgets/app_bar_leading.dart';
 import 'package:surface/widgets/dialog.dart';
 import 'package:surface/widgets/loading_indicator.dart';
 import 'package:surface/widgets/markdown_content.dart';
 import 'package:surface/widgets/navigation/app_scaffold.dart';
-import 'package:surface/widgets/post/post_item.dart';
 import 'package:very_good_infinite_list/very_good_infinite_list.dart';
 
 import '../providers/userinfo.dart';
@@ -149,15 +146,16 @@ class _NotificationScreenState extends State<NotificationScreen> {
     if (!ua.isAuthorized) {
       return AppScaffold(
         appBar: AppBar(
-            leading: AutoAppBarLeading(),
-            title: Text('screenNotification').tr()),
+          leading: PageBackButton(),
+          title: Text('screenNotification').tr(),
+        ),
         body: Center(child: UnauthorizedHint()),
       );
     }
 
     return AppScaffold(
       appBar: AppBar(
-        leading: AutoAppBarLeading(),
+        leading: PageBackButton(),
         title: Text('screenNotification').tr(),
         actions: [
           IconButton(
@@ -218,34 +216,24 @@ class _NotificationScreenState extends State<NotificationScreen> {
                                   'interactive.subscription',
                                 ].contains(nty.topic) &&
                                 nty.metadata['related_post'] != null)
-                              GestureDetector(
-                                child: Container(
-                                  decoration: BoxDecoration(
-                                    borderRadius: const BorderRadius.all(
-                                        Radius.circular(8)),
-                                    border: Border.all(
-                                        color: Theme.of(context).dividerColor,
-                                        width: 1),
+                              TextButton(
+                                style: ButtonStyle(
+                                  padding: WidgetStatePropertyAll(
+                                    EdgeInsets.zero,
                                   ),
-                                  child: PostItem(
-                                    data: SnPost.fromJson(
-                                        nty.metadata['related_post']!),
-                                    showComments: false,
-                                    showReactions: false,
-                                    showMenu: false,
-                                  ).padding(vertical: 4),
+                                  visualDensity: VisualDensity.compact,
                                 ),
-                                onTap: () {
+                                child: Text('postReadMore').tr(),
+                                onPressed: () {
                                   GoRouter.of(context).pushNamed(
                                     'postDetail',
                                     pathParameters: {
-                                      'slug': nty
-                                          .metadata['related_post']!['id']
-                                          .toString()
+                                      'slug': nty.metadata['related_post']['id']
+                                          .toString(),
                                     },
                                   );
                                 },
-                              ).padding(top: 8),
+                              ),
                             const Gap(8),
                             Row(
                               children: [

lib/screens/post/post_detail.dart

@@ -12,7 +12,6 @@ import 'package:surface/providers/userinfo.dart';
 import 'package:surface/types/post.dart';
 import 'package:surface/widgets/dialog.dart';
 import 'package:surface/widgets/loading_indicator.dart';
-import 'package:surface/widgets/navigation/app_background.dart';
 import 'package:surface/widgets/navigation/app_scaffold.dart';
 import 'package:surface/widgets/post/post_comment_list.dart';
 import 'package:surface/widgets/post/post_item.dart';
@@ -66,115 +65,111 @@ class _PostDetailScreenState extends State<PostDetailScreen> {
 
     final double maxWidth = _data?.type == 'video' ? double.infinity : 640;
 
-    return AppBackground(
-      isRoot: widget.onBack != null,
-      child: AppScaffold(
-        appBar: AppBar(
-          leading: BackButton(
-            onPressed: () {
-              if (widget.onBack != null) {
-                widget.onBack!.call();
-              }
-              if (GoRouter.of(context).canPop()) {
-                GoRouter.of(context).pop(context);
-                return;
-              }
-              GoRouter.of(context).replaceNamed('explore');
-            },
-          ),
-          title: _data?.body['title'] != null
-              ? RichText(
-                  textAlign: TextAlign.center,
-                  text: TextSpan(children: [
-                    TextSpan(
-                      text: _data?.body['title'] ?? 'postNoun'.tr(),
-                      style: Theme.of(context).textTheme.titleLarge!.copyWith(
-                            color:
-                                Theme.of(context).appBarTheme.foregroundColor!,
-                          ),
-                    ),
-                    const TextSpan(text: '\n'),
-                    TextSpan(
-                      text: 'postDetail'.tr(),
-                      style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                            color:
-                                Theme.of(context).appBarTheme.foregroundColor!,
-                          ),
-                    ),
-                  ]),
-                  maxLines: 2,
-                  overflow: TextOverflow.ellipsis,
-                )
-              : Text('postDetail').tr(),
+    return AppScaffold(
+      noBackground: ResponsiveScaffold.getIsExpand(context),
+      appBar: AppBar(
+        leading: BackButton(
+          onPressed: () {
+            if (widget.onBack != null) {
+              widget.onBack!.call();
+            }
+            if (GoRouter.of(context).canPop()) {
+              GoRouter.of(context).pop(context);
+              return;
+            }
+            GoRouter.of(context).replaceNamed('explore');
+          },
         ),
-        body: CustomScrollView(
-          slivers: [
-            SliverToBoxAdapter(
-              child: LoadingIndicator(isActive: _isBusy),
-            ),
-            if (_data != null)
-              SliverToBoxAdapter(
-                child: PostItem(
-                  data: _data!,
-                  maxWidth: maxWidth,
-                  showComments: false,
-                  showFullPost: true,
-                  onChanged: (data) {
-                    setState(() => _data = data);
-                  },
-                  onDeleted: () {
-                    Navigator.pop(context);
-                  },
-                ),
-              ),
-            if (_data != null)
-              SliverToBoxAdapter(
-                child: Divider(height: 1).padding(top: 8),
-              ),
-            if (_data != null)
-              SliverToBoxAdapter(
-                child: Container(
-                  constraints: BoxConstraints(maxWidth: maxWidth),
-                  child: Row(
-                    crossAxisAlignment: CrossAxisAlignment.center,
-                    children: [
-                      const Icon(Symbols.comment, size: 24),
-                      const Gap(16),
-                      Text('postCommentsDetailed')
-                          .plural(_data!.metric.replyCount)
-                          .textStyle(Theme.of(context).textTheme.titleLarge!),
-                    ],
-                  ).padding(horizontal: 20, vertical: 12).center(),
-                ),
-              ),
-            if (_data != null && ua.isAuthorized)
-              SliverToBoxAdapter(
-                child: PostCommentQuickAction(
-                  parentPost: _data!,
-                  maxWidth: maxWidth,
-                  onPosted: () {
-                    setState(() {
-                      _data = _data!.copyWith(
-                        metric: _data!.metric.copyWith(
-                          replyCount: _data!.metric.replyCount + 1,
+        title: _data?.body['title'] != null
+            ? RichText(
+                textAlign: TextAlign.center,
+                text: TextSpan(children: [
+                  TextSpan(
+                    text: _data?.body['title'] ?? 'postNoun'.tr(),
+                    style: Theme.of(context).textTheme.titleLarge!.copyWith(
+                          color: Theme.of(context).appBarTheme.foregroundColor!,
                         ),
-                      );
-                    });
-                    _childListKey.currentState!.refresh();
-                  },
-                ),
+                  ),
+                  const TextSpan(text: '\n'),
+                  TextSpan(
+                    text: 'postDetail'.tr(),
+                    style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                          color: Theme.of(context).appBarTheme.foregroundColor!,
+                        ),
+                  ),
+                ]),
+                maxLines: 2,
+                overflow: TextOverflow.ellipsis,
+              )
+            : Text('postDetail').tr(),
+      ),
+      body: CustomScrollView(
+        slivers: [
+          SliverToBoxAdapter(
+            child: LoadingIndicator(isActive: _isBusy),
+          ),
+          if (_data != null)
+            SliverToBoxAdapter(
+              child: PostItem(
+                data: _data!,
+                maxWidth: maxWidth,
+                showComments: false,
+                showFullPost: true,
+                onChanged: (data) {
+                  setState(() => _data = data);
+                },
+                onDeleted: () {
+                  Navigator.pop(context);
+                },
               ),
-            if (_data != null) SliverGap(8),
-            if (_data != null)
-              PostCommentSliverList(
-                key: _childListKey,
+            ),
+          if (_data != null)
+            SliverToBoxAdapter(
+              child: Divider(height: 1).padding(top: 8),
+            ),
+          if (_data != null)
+            SliverToBoxAdapter(
+              child: Container(
+                constraints: BoxConstraints(maxWidth: maxWidth),
+                child: Row(
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  children: [
+                    const Icon(Symbols.comment, size: 24),
+                    const Gap(16),
+                    Text('postCommentsDetailed')
+                        .plural(_data!.metric.replyCount)
+                        .textStyle(Theme.of(context).textTheme.titleLarge!),
+                  ],
+                ).padding(horizontal: 20, vertical: 12).center(),
+              ),
+            ),
+          if (_data != null && ua.isAuthorized)
+            SliverToBoxAdapter(
+              child: PostCommentQuickAction(
                 parentPost: _data!,
                 maxWidth: maxWidth,
+                onPosted: () {
+                  setState(() {
+                    _data = _data!.copyWith(
+                      metric: _data!.metric.copyWith(
+                        replyCount: _data!.metric.replyCount + 1,
+                      ),
+                    );
+                  });
+                  _childListKey.currentState!.refresh();
+                },
               ),
-            if (_data != null)
-              SliverGap(math.max(MediaQuery.of(context).padding.bottom, 16)),
-          ],
-        ),
+            ),
+          if (_data != null) SliverGap(8),
+          if (_data != null)
+            PostCommentSliverList(
+              key: _childListKey,
+              parentPost: _data!,
+              maxWidth: maxWidth,
+            ),
+          if (_data != null)
+            SliverGap(math.max(MediaQuery.of(context).padding.bottom, 16)),
+        ],
       ),
     );
   }

lib/screens/post/post_editor.dart

@@ -6,7 +6,6 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_context_menu/flutter_context_menu.dart';
 import 'package:gap/gap.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hotkey_manager/hotkey_manager.dart';
@@ -16,7 +15,6 @@ import 'package:responsive_framework/responsive_framework.dart';
 import 'package:styled_widget/styled_widget.dart';
 import 'package:surface/controllers/post_write_controller.dart';
 import 'package:surface/providers/config.dart';
-import 'package:surface/providers/sn_attachment.dart';
 import 'package:surface/providers/sn_network.dart';
 import 'package:surface/providers/sn_realm.dart';
 import 'package:surface/types/attachment.dart';
@@ -25,8 +23,7 @@ import 'package:surface/types/realm.dart';
 import 'package:surface/widgets/account/account_image.dart';
 import 'package:surface/widgets/attachment/attachment_input.dart';
 import 'package:surface/widgets/attachment/attachment_item.dart';
-import 'package:surface/widgets/attachment/pending_attachment_alt.dart';
-import 'package:surface/widgets/attachment/pending_attachment_boost.dart';
+import 'package:surface/widgets/attachment/pending_attachment_actions.dart';
 import 'package:surface/widgets/loading_indicator.dart';
 import 'package:surface/widgets/markdown_content.dart';
 import 'package:surface/widgets/navigation/app_scaffold.dart';
@@ -346,9 +343,15 @@ class _PostEditorScreenState extends State<PostEditorScreen>
                     children: [
                       const Icon(Icons.edit, size: 16),
                       const Gap(10),
-                      Text('postEditingNotice').tr(args: [
-                        '@${_writeController.editingPost!.publisher.name}'
-                      ]),
+                      Expanded(
+                        child: Text(
+                          'postEditingNotice',
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
+                        ).tr(args: [
+                          '@${_writeController.editingPost!.publisher.name}'
+                        ]),
+                      ),
                     ],
                   ),
                 ),
@@ -452,7 +455,9 @@ class _PostEditorScreenState extends State<PostEditorScreen>
                           isBusy: _writeController.isBusy,
                           onUpload: (int idx) async {
                             await _writeController.uploadSingleAttachment(
-                                context, idx);
+                              context,
+                              idx,
+                            );
                           },
                           onInsertLink: (int idx) async {
                             _writeController.contentController.text +=
@@ -1100,7 +1105,7 @@ class _PostQuestionEditor extends StatelessWidget {
   }
 }
 
-class _PostVideoEditor extends StatelessWidget {
+class _PostVideoEditor extends StatefulWidget {
   final PostWriteController controller;
   final Function? onTapPublisher;
   final Function? onTapRealm;
@@ -1108,7 +1113,14 @@ class _PostVideoEditor extends StatelessWidget {
   const _PostVideoEditor(
       {required this.controller, this.onTapPublisher, this.onTapRealm});
 
-  void _selectVideo(BuildContext context) async {
+  @override
+  State<_PostVideoEditor> createState() => _PostVideoEditorState();
+}
+
+class _PostVideoEditorState extends State<_PostVideoEditor> {
+  final TextEditingController _streamUrlController = TextEditingController();
+
+  void _selectVideo() async {
     final video = await showDialog<SnAttachment?>(
       context: context,
       builder: (context) => AttachmentInputDialog(
@@ -1119,78 +1131,25 @@ class _PostVideoEditor extends StatelessWidget {
     );
     if (!context.mounted) return;
     if (video == null) return;
-    controller.setVideoAttachment(video);
+    widget.controller.setVideoAttachment(video);
   }
 
-  void _setAlt(BuildContext context) async {
-    if (controller.videoAttachment == null) return;
-
-    final result = await showDialog<SnAttachment?>(
-      context: context,
-      builder: (context) => PendingAttachmentAltDialog(
-          media: PostWriteMedia(controller.videoAttachment)),
-    );
-    if (result == null) return;
-
-    controller.setVideoAttachment(result);
+  @override
+  void initState() {
+    _streamUrlController.addListener(() {
+      if (_streamUrlController.text.isEmpty) {
+        widget.controller.setVideoUrl('');
+      } else {
+        widget.controller.setVideoUrl(_streamUrlController.text);
+      }
+    });
+    super.initState();
   }
 
-  Future<void> _createBoost(BuildContext context) async {
-    if (controller.videoAttachment == null) return;
-
-    final result = await showDialog<SnAttachmentBoost?>(
-      context: context,
-      builder: (context) => PendingAttachmentBoostDialog(
-          media: PostWriteMedia(controller.videoAttachment)),
-    );
-    if (result == null) return;
-
-    final newAttach = controller.videoAttachment!.copyWith(
-      boosts: [...controller.videoAttachment!.boosts, result],
-    );
-
-    controller.setVideoAttachment(newAttach);
-  }
-
-  void _setThumbnail(BuildContext context) async {
-    if (controller.videoAttachment == null) return;
-
-    final thumbnail = await showDialog<SnAttachment?>(
-      context: context,
-      builder: (context) => AttachmentInputDialog(
-        title: 'attachmentSetThumbnail'.tr(),
-        pool: 'interactive',
-        analyzeNow: true,
-      ),
-    );
-    if (thumbnail == null) return;
-    if (!context.mounted) return;
-
-    try {
-      final attach = context.read<SnAttachmentProvider>();
-      final newAttach = await attach.updateOne(
-        controller.videoAttachment!,
-        thumbnailId: thumbnail.id,
-      );
-      controller.setVideoAttachment(newAttach);
-    } catch (err) {
-      if (!context.mounted) return;
-      context.showErrorDialog(err);
-    }
-  }
-
-  Future<void> _deleteAttachment(BuildContext context) async {
-    if (controller.videoAttachment == null) return;
-
-    try {
-      final sn = context.read<SnNetworkProvider>();
-      await sn.client
-          .delete('/cgi/uc/attachments/${controller.videoAttachment!.id}');
-      controller.setVideoAttachment(null);
-    } catch (err) {
-      if (!context.mounted) return;
-      context.showErrorDialog(err);
-    }
+  @override
+  void dispose() {
+    _streamUrlController.dispose();
+    super.dispose();
   }
 
   @override
@@ -1208,10 +1167,10 @@ class _PostVideoEditor extends StatelessWidget {
                 borderRadius: const BorderRadius.all(Radius.circular(24)),
                 child: GestureDetector(
                   onTap: () {
-                    onTapPublisher?.call();
+                    widget.onTapPublisher?.call();
                   },
                   child: AccountImage(
-                    content: controller.publisher?.avatar,
+                    content: widget.controller.publisher?.avatar,
                   ),
                 ),
               ),
@@ -1221,10 +1180,10 @@ class _PostVideoEditor extends StatelessWidget {
                 borderRadius: const BorderRadius.all(Radius.circular(24)),
                 child: GestureDetector(
                   onTap: () {
-                    onTapRealm?.call();
+                    widget.onTapRealm?.call();
                   },
                   child: AccountImage(
-                    content: controller.realm?.avatar,
+                    content: widget.controller.realm?.avatar,
                     fallbackWidget: const Icon(Symbols.globe, size: 20),
                     radius: 14,
                   ),
@@ -1237,7 +1196,7 @@ class _PostVideoEditor extends StatelessWidget {
               children: [
                 const Gap(6),
                 TextField(
-                  controller: controller.titleController,
+                  controller: widget.controller.titleController,
                   decoration: InputDecoration.collapsed(
                     hintText: 'fieldPostTitle'.tr(),
                     border: InputBorder.none,
@@ -1248,7 +1207,7 @@ class _PostVideoEditor extends StatelessWidget {
                 ).padding(horizontal: 16),
                 const Gap(8),
                 TextField(
-                  controller: controller.descriptionController,
+                  controller: widget.controller.descriptionController,
                   decoration: InputDecoration.collapsed(
                     hintText: 'fieldPostDescription'.tr(),
                     border: InputBorder.none,
@@ -1260,66 +1219,52 @@ class _PostVideoEditor extends StatelessWidget {
                       FocusManager.instance.primaryFocus?.unfocus(),
                 ).padding(horizontal: 16),
                 const Gap(12),
-                Container(
-                  margin: const EdgeInsets.only(left: 16, right: 16),
-                  decoration: BoxDecoration(
-                    borderRadius: BorderRadius.circular(16),
-                    border: Border.all(color: Theme.of(context).dividerColor),
-                  ),
-                  child: ContextMenuRegion(
-                    contextMenu: ContextMenu(
-                      entries: [
-                        MenuItem(
-                          label: 'attachmentSetAlt'.tr(),
-                          icon: Symbols.description,
-                          onSelected: () {
-                            _setAlt(context);
-                          },
-                        ),
-                        MenuItem(
-                          label: 'attachmentBoost'.tr(),
-                          icon: Symbols.bolt,
-                          onSelected: () {
-                            _createBoost(context);
-                          },
-                        ),
-                        MenuItem(
-                          label: 'attachmentSetThumbnail'.tr(),
-                          icon: Symbols.image,
-                          onSelected: () {
-                            _setThumbnail(context);
-                          },
-                        ),
-                        MenuItem(
-                          label: 'attachmentCopyRandomId'.tr(),
-                          icon: Symbols.content_copy,
-                          onSelected: () {
-                            Clipboard.setData(ClipboardData(
-                                text: controller.videoAttachment!.rid));
-                          },
-                        ),
-                        MenuItem(
-                          label: 'delete'.tr(),
-                          icon: Symbols.delete,
-                          onSelected: () => _deleteAttachment(context),
-                        ),
-                        MenuItem(
-                          label: 'unlink'.tr(),
-                          icon: Symbols.link_off,
-                          onSelected: () {
-                            controller.setVideoAttachment(null);
-                          },
-                        ),
-                      ],
+                if (widget.controller.videoLive ||
+                    widget.controller.videoAttachment == null)
+                  TextField(
+                    controller: _streamUrlController,
+                    decoration: InputDecoration(
+                      labelText: 'fieldPostVideoUrl'.tr(),
+                      helperText: 'fieldPostVideoUrlDescription'.tr(),
+                      border: OutlineInputBorder(),
+                      isDense: true,
+                    ),
+                    onTapOutside: (_) =>
+                        FocusManager.instance.primaryFocus?.unfocus(),
+                  ).padding(horizontal: 16, bottom: 12, top: 2),
+                if (!widget.controller.videoLive &&
+                    _streamUrlController.text.isEmpty)
+                  Container(
+                    margin: const EdgeInsets.only(left: 16, right: 16),
+                    decoration: BoxDecoration(
+                      borderRadius: BorderRadius.circular(16),
+                      border: Border.all(color: Theme.of(context).dividerColor),
                     ),
                     child: InkWell(
                       borderRadius: BorderRadius.circular(16),
-                      onTap: controller.videoAttachment == null
-                          ? () => _selectVideo(context)
-                          : null,
+                      onTap: widget.controller.videoAttachment == null
+                          ? () => _selectVideo()
+                          : () {
+                              showModalBottomSheet(
+                                context: context,
+                                builder: (context) =>
+                                    PendingAttachmentActionSheet(
+                                  media: PostWriteMedia(
+                                    widget.controller.videoAttachment!,
+                                  ),
+                                ),
+                              ).then((value) async {
+                                if (value is PostWriteMedia) {
+                                  widget.controller
+                                      .setVideoAttachment(value.attachment);
+                                } else if (value == false) {
+                                  widget.controller.setVideoAttachment(null);
+                                }
+                              });
+                            },
                       child: AspectRatio(
                         aspectRatio: 16 / 9,
-                        child: controller.videoAttachment == null
+                        child: widget.controller.videoAttachment == null
                             ? Center(
                                 child: Row(
                                   mainAxisSize: MainAxisSize.min,
@@ -1335,13 +1280,21 @@ class _PostVideoEditor extends StatelessWidget {
                             : ClipRRect(
                                 borderRadius: BorderRadius.circular(16),
                                 child: AttachmentItem(
-                                  data: controller.videoAttachment!,
+                                  data: widget.controller.videoAttachment!,
                                   heroTag: const Uuid().v4(),
                                 ),
                               ),
                       ),
                     ),
                   ),
+                const Gap(8),
+                CheckboxListTile(
+                  secondary: const Icon(Symbols.live_tv),
+                  title: Text('postVideoLive').tr(),
+                  subtitle: Text('postVideoLiveDescription').tr(),
+                  value: widget.controller.videoLive,
+                  onChanged: (value) =>
+                      widget.controller.setVideoLive(value ?? false),
                 ),
               ],
             ),

lib/screens/post/post_shuffle.dart

@@ -28,11 +28,8 @@ class _PostShuffleScreenState extends State<PostShuffleScreen> {
     setState(() => _isBusy = true);
     try {
       final pt = context.read<SnPostContentProvider>();
-      final result = await pt.listPosts(
-        take: 10,
-        offset: _posts.length,
-        isShuffle: true,
-      );
+      final result =
+          await pt.listPosts(take: 10, offset: _posts.length, isShuffle: true);
       _posts.addAll(result.$1);
     } catch (err) {
       if (!mounted) return;
@@ -57,19 +54,14 @@ class _PostShuffleScreenState extends State<PostShuffleScreen> {
   @override
   Widget build(BuildContext context) {
     return AppScaffold(
-      appBar: AppBar(
-        title: Text('postShuffle').tr(),
-      ),
+      appBar: AppBar(title: Text('postShuffle').tr()),
       body: Stack(
         children: [
           Column(
             children: [
               if (_isBusy || _posts.isEmpty)
                 const Expanded(
-                  child: Center(
-                    child: CircularProgressIndicator(),
-                  ),
-                )
+                    child: Center(child: CircularProgressIndicator()))
               else
                 Expanded(
                   child: CardSwiper(
@@ -81,17 +73,21 @@ class _PostShuffleScreenState extends State<PostShuffleScreen> {
                       final ele = _posts[idx];
                       return SingleChildScrollView(
                         child: Center(
-                          child: OpenablePostItem(
-                            key: ValueKey(ele),
-                            data: ele,
-                            maxWidth: 640,
-                            onChanged: (ele) {
-                              _posts[idx] = ele;
-                              setState(() {});
-                            },
-                            onDeleted: () {
-                              _fetchPosts();
-                            },
+                          child: Card(
+                            color: Theme.of(context).colorScheme.surface,
+                            child: OpenablePostItem(
+                              key: ValueKey(ele),
+                              data: ele,
+                              maxWidth: 640,
+                              useReplace: true,
+                              onChanged: (ele) {
+                                _posts[idx] = ele;
+                                setState(() {});
+                              },
+                              onDeleted: () {
+                                _fetchPosts();
+                              },
+                            ).padding(all: 8),
                           ).padding(
                             all: 24,
                             bottom:

lib/screens/post/publisher_page.dart

@@ -38,7 +38,7 @@ class _PostPublisherScreenState extends State<PostPublisherScreen>
     with SingleTickerProviderStateMixin {
   late final ScrollController _scrollController = ScrollController();
   late final TabController _tabController =
-      TabController(length: 3, vsync: this);
+      TabController(length: 5, vsync: this);
 
   SnPublisher? _publisher;
   SnAccount? _account;
@@ -137,7 +137,7 @@ class _PostPublisherScreenState extends State<PostPublisherScreen>
 
   late final _appBarWidth = MediaQuery.of(context).size.width;
   late final _appBarHeight =
-      (_appBarWidth * kBannerAspectRatio).roundToDouble();
+      math.min((_appBarWidth * kBannerAspectRatio), 360).roundToDouble();
 
   void _updateAppBarBlur() {
     if (_scrollController.offset > _appBarHeight) return;
@@ -165,6 +165,8 @@ class _PostPublisherScreenState extends State<PostPublisherScreen>
         type: switch (_tabController.index) {
           1 => 'story',
           2 => 'article',
+          3 => 'question',
+          4 => 'video',
           _ => null,
         },
       );
@@ -284,6 +286,7 @@ class _PostPublisherScreenState extends State<PostPublisherScreen>
     final sn = context.read<SnNetworkProvider>();
 
     return AppScaffold(
+      noBackground: ResponsiveScaffold.getIsExpand(context),
       body: NestedScrollView(
         controller: _scrollController,
         headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
@@ -300,6 +303,7 @@ class _PostPublisherScreenState extends State<PostPublisherScreen>
                     ),
                     child: SliverAppBar(
                       expandedHeight: _appBarHeight,
+                      leading: const PageBackButton(),
                       title: _publisher == null
                           ? Text('loading').tr()
                           : RichText(
@@ -568,6 +572,18 @@ class _PostPublisherScreenState extends State<PostPublisherScreen>
                           color: Theme.of(context).colorScheme.onSurface,
                         ),
                       ),
+                      Tab(
+                        icon: Icon(
+                          Symbols.help,
+                          color: Theme.of(context).colorScheme.onSurface,
+                        ),
+                      ),
+                      Tab(
+                        icon: Icon(
+                          Symbols.video_call,
+                          color: Theme.of(context).colorScheme.onSurface,
+                        ),
+                      ),
                     ],
                   ),
                   SliverToBoxAdapter(child: const Divider(height: 1)),

lib/screens/realm/realm_discovery.dart

@@ -4,8 +4,10 @@ import 'package:gap/gap.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:provider/provider.dart';
 import 'package:styled_widget/styled_widget.dart';
+import 'package:surface/providers/channel.dart';
 import 'package:surface/providers/config.dart';
 import 'package:surface/providers/sn_network.dart';
+import 'package:surface/providers/sn_realm.dart';
 import 'package:surface/providers/userinfo.dart';
 import 'package:surface/types/chat.dart';
 import 'package:surface/types/realm.dart';
@@ -57,7 +59,9 @@ class _RealmDiscoveryScreenState extends State<RealmDiscoveryScreen> {
         title: Text('screenRealmDiscovery').tr(),
         actions: [
           IconButton(
-            icon: _isCompactView ? const Icon(Symbols.view_list) : const Icon(Symbols.view_module),
+            icon: _isCompactView
+                ? const Icon(Symbols.view_list)
+                : const Icon(Symbols.view_module),
             onPressed: () {
               setState(() => _isCompactView = !_isCompactView);
               context.read<ConfigProvider>().realmCompactView = _isCompactView;
@@ -117,7 +121,8 @@ class _RealmJoinPopupState extends State<_RealmJoinPopup> {
     try {
       setState(() => _isBusy = true);
       final sn = context.read<SnNetworkProvider>();
-      final resp = await sn.client.get('/cgi/im/channels/${widget.realm.alias}/public');
+      final resp =
+          await sn.client.get('/cgi/im/channels/${widget.realm.alias}/public');
       final out = List<SnChannel>.from(
         resp.data.map((e) => SnChannel.fromJson(e)).cast<SnChannel>(),
       );
@@ -135,10 +140,13 @@ class _RealmJoinPopupState extends State<_RealmJoinPopup> {
       setState(() => _isJoining = true);
       final sn = context.read<SnNetworkProvider>();
       final ua = context.read<UserProvider>();
-      await sn.client.post('/cgi/id/realms/${widget.realm.alias}/members', data: {
+      final rel = context.read<SnRealmProvider>();
+      await sn.client
+          .post('/cgi/id/realms/${widget.realm.alias}/members', data: {
         'related': ua.user?.name,
       });
       await _joinSelectedChannels();
+      rel.addAvailableRealm(widget.realm);
       if (!mounted) return;
       context.showSnackbar('realmJoined'.tr(args: [widget.realm.name]));
       Navigator.pop(context);
@@ -156,13 +164,20 @@ class _RealmJoinPopupState extends State<_RealmJoinPopup> {
       try {
         final sn = context.read<SnNetworkProvider>();
         final ua = context.read<UserProvider>();
-        await sn.client.post('/cgi/im/channels/${widget.realm.alias}/$channel/members', data: {
-          'related': ua.user?.name,
-        });
+        await sn.client.post(
+            '/cgi/im/channels/${widget.realm.alias}/$channel/members',
+            data: {
+              'related': ua.user?.name,
+            });
       } catch (err) {
         if (!mounted) return;
         context.showErrorDialog(err);
       }
+      final ct = context.read<ChatChannelProvider>();
+      for (final channel
+          in _channels!.where((ele) => _planJoinChannels.contains(ele.alias))) {
+        ct.addAvailableChannel(channel);
+      }
     }
   }
 
@@ -182,7 +197,8 @@ class _RealmJoinPopupState extends State<_RealmJoinPopup> {
           children: [
             const Icon(Symbols.group_add, size: 24),
             const Gap(16),
-            Text('realmJoin', style: Theme.of(context).textTheme.titleLarge).tr(),
+            Text('realmJoin', style: Theme.of(context).textTheme.titleLarge)
+                .tr(),
           ],
         ).padding(horizontal: 20, top: 16, bottom: 12),
         Row(
@@ -216,7 +232,8 @@ class _RealmJoinPopupState extends State<_RealmJoinPopup> {
         Container(
           width: double.infinity,
           color: Theme.of(context).colorScheme.surfaceContainerHigh,
-          child: Text('realmCommunityPublicChannelsHint'.tr(), style: Theme.of(context).textTheme.bodyMedium)
+          child: Text('realmCommunityPublicChannelsHint'.tr(),
+                  style: Theme.of(context).textTheme.bodyMedium)
               .padding(horizontal: 24, vertical: 8),
         ),
         Expanded(

lib/screens/settings.dart

@@ -80,6 +80,9 @@ class _SettingsScreenState extends State<SettingsScreen> {
   Widget build(BuildContext context) {
     final sn = context.read<SnNetworkProvider>();
     final dt = context.read<DatabaseProvider>();
+    final cfg = context.watch<ConfigProvider>();
+
+    final now = DateTime.now();
 
     return AppScaffold(
       appBar: AppBar(
@@ -322,20 +325,6 @@ class _SettingsScreenState extends State<SettingsScreen> {
                     setState(() {});
                   },
                 ),
-                CheckboxListTile(
-                  secondary: const Icon(Symbols.left_panel_close),
-                  title: Text('settingsDrawerPreferCollapse').tr(),
-                  subtitle:
-                      Text('settingsDrawerPreferCollapseDescription').tr(),
-                  contentPadding: const EdgeInsets.only(left: 24, right: 17),
-                  value: _prefs.getBool(kAppDrawerPreferCollapse) ?? false,
-                  onChanged: (value) {
-                    _prefs.setBool(kAppDrawerPreferCollapse, value ?? false);
-                    final cfg = context.read<ConfigProvider>();
-                    cfg.calcDrawerSize(context);
-                    setState(() {});
-                  },
-                ),
                 CheckboxListTile(
                   secondary: const Icon(Symbols.hide),
                   title: Text('settingsHideBottomNav').tr(),
@@ -349,6 +338,31 @@ class _SettingsScreenState extends State<SettingsScreen> {
                     setState(() {});
                   },
                 ),
+                CheckboxListTile(
+                  value: cfg.soundEffects,
+                  onChanged: (value) {
+                    cfg.soundEffects = value ?? false;
+                    setState(() {});
+                  },
+                  contentPadding: const EdgeInsets.only(left: 24, right: 17),
+                  title: Text('settingsSoundEffects').tr(),
+                  subtitle: Text('settingsSoundEffectsDescription').tr(),
+                  secondary: const Icon(Symbols.sound_sampler),
+                ),
+                if (!kIsWeb && !(Platform.isAndroid || Platform.isIOS))
+                  ListTile(
+                    leading: const Icon(Symbols.window),
+                    title: Text('settingsResetMemorizedWindowSize').tr(),
+                    subtitle:
+                        Text('settingsResetMemorizedWindowSizeDescription')
+                            .tr(),
+                    trailing: const Icon(Symbols.chevron_right),
+                    contentPadding: const EdgeInsets.only(left: 24, right: 24),
+                    onTap: () {
+                      final prefs = context.read<ConfigProvider>().prefs;
+                      prefs.remove(kAppWindowSize);
+                    },
+                  ),
                 ListTile(
                   leading: const Icon(Symbols.font_download),
                   title: Text('settingsCustomFonts').tr(),
@@ -741,6 +755,18 @@ class _SettingsScreenState extends State<SettingsScreen> {
                     GoRouter.of(context).pushNamed('about');
                   },
                 ),
+                if (now.day == 1 && now.month == 4)
+                  CheckboxListTile(
+                    title: Text('settingsAprilFoolFeatures').tr(),
+                    subtitle: Text('settingsAprilFoolFeaturesDescription').tr(),
+                    contentPadding: const EdgeInsets.only(left: 24, right: 17),
+                    secondary: const Icon(Symbols.new_releases),
+                    value: cfg.aprilFoolFeatures,
+                    onChanged: (value) {
+                      cfg.aprilFoolFeatures = value ?? false;
+                      setState(() {});
+                    },
+                  )
               ],
             ),
           ],

lib/screens/sharing.dart

@@ -50,6 +50,7 @@ class _AppSharingListenerState extends State<AppSharingListener> {
               Card(
                 child: Column(
                   children: [
+                    const SizedBox(width: double.infinity),
                     ListTile(
                       contentPadding:
                           const EdgeInsets.symmetric(horizontal: 24),

lib/screens/stickers.dart

@@ -9,7 +9,6 @@ import 'package:surface/providers/sn_network.dart';
 import 'package:surface/providers/sn_sticker.dart';
 import 'package:surface/providers/userinfo.dart';
 import 'package:surface/types/attachment.dart';
-import 'package:surface/widgets/app_bar_leading.dart';
 import 'package:surface/widgets/attachment/attachment_item.dart';
 import 'package:surface/widgets/dialog.dart';
 import 'package:surface/widgets/loading_indicator.dart';
@@ -134,7 +133,7 @@ class _StickerScreenState extends State<StickerScreen>
   Widget build(BuildContext context) {
     return AppScaffold(
       appBar: AppBar(
-        leading: AutoAppBarLeading(),
+        leading: PageBackButton(),
         title: Text('screenStickers').tr(),
         actions: [
           IconButton(

lib/screens/wallet.dart

@@ -45,10 +45,9 @@ class _WalletScreenState extends State<WalletScreen> {
   @override
   Widget build(BuildContext context) {
     return AppScaffold(
+      noBackground: ResponsiveScaffold.getIsExpand(context),
       appBar: AppBar(
-        leading: PageBackButton(),
-        title: Text('screenAccountWallet').tr(),
-      ),
+          leading: PageBackButton(), title: Text('screenAccountWallet').tr()),
       body: Column(
         children: [
           LoadingIndicator(isActive: _isBusy),
@@ -66,25 +65,36 @@ class _WalletScreenState extends State<WalletScreen> {
                 mainAxisSize: MainAxisSize.min,
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                  CircleAvatar(
-                    radius: 28,
-                    child: Icon(Symbols.wallet, size: 28),
-                  ),
-                  const Gap(12),
                   SizedBox(width: double.infinity),
                   Text(
                     NumberFormat.compactCurrency(
-                      locale: EasyLocalization.of(context)!.currentLocale.toString(),
+                      locale: EasyLocalization.of(context)!
+                          .currentLocale
+                          .toString(),
                       symbol: '${'walletCurrencyShort'.tr()} ',
                       decimalDigits: 2,
                     ).format(double.parse(_wallet!.balance)),
                     style: Theme.of(context).textTheme.titleLarge,
                   ),
                   Text('walletCurrency'.plural(double.parse(_wallet!.balance))),
+                  const Gap(16),
+                  Text(
+                    NumberFormat.compactCurrency(
+                      locale: EasyLocalization.of(context)!
+                          .currentLocale
+                          .toString(),
+                      symbol: '${'walletCurrencyGoldenShort'.tr()} ',
+                      decimalDigits: 2,
+                    ).format(double.parse(_wallet!.goldenBalance)),
+                    style: Theme.of(context).textTheme.titleLarge,
+                  ),
+                  Text('walletCurrencyGolden'
+                      .plural(double.parse(_wallet!.goldenBalance))),
                 ],
               ).padding(horizontal: 20, vertical: 24),
             ).padding(horizontal: 8, top: 16, bottom: 4),
-          if (_wallet != null) Expanded(child: _WalletTransactionList(myself: _wallet!)),
+          if (_wallet != null)
+            Expanded(child: _WalletTransactionList(myself: _wallet!)),
         ],
       ),
     );
@@ -109,14 +119,15 @@ class _WalletTransactionListState extends State<_WalletTransactionList> {
     try {
       setState(() => _isBusy = true);
       final sn = context.read<SnNetworkProvider>();
-      final resp = await sn.client.get('/cgi/wa/transactions/me', queryParameters: {
-        'take': 10,
-        'offset': _transactions.length,
-      });
-      _totalCount = resp.data['count'];
-      _transactions.addAll(
-        resp.data['data']?.map((e) => SnTransaction.fromJson(e)).cast<SnTransaction>() ?? [],
+      final resp = await sn.client.get(
+        '/cgi/wa/transactions/me',
+        queryParameters: {'take': 10, 'offset': _transactions.length},
       );
+      _totalCount = resp.data['count'];
+      _transactions.addAll(resp.data['data']
+              ?.map((e) => SnTransaction.fromJson(e))
+              .cast<SnTransaction>() ??
+          []);
     } catch (err) {
       if (!mounted) return;
       context.showErrorDialog(err);
@@ -141,7 +152,8 @@ class _WalletTransactionListState extends State<_WalletTransactionList> {
         child: InfiniteList(
           itemCount: _transactions.length,
           isLoading: _isBusy,
-          hasReachedMax: _totalCount != null && _transactions.length >= _totalCount!,
+          hasReachedMax:
+              _totalCount != null && _transactions.length >= _totalCount!,
           onFetchData: () {
             _fetchTransactions();
           },
@@ -149,7 +161,9 @@ class _WalletTransactionListState extends State<_WalletTransactionList> {
             final ele = _transactions[idx];
             final isIncoming = ele.payeeId == widget.myself.id;
             return ListTile(
-              leading: isIncoming ? const Icon(Symbols.call_received) : const Icon(Symbols.call_made),
+              leading: isIncoming
+                  ? const Icon(Symbols.call_received)
+                  : const Icon(Symbols.call_made),
               title: Text(
                 '${isIncoming ? '+' : '-'}${ele.amount} ${'walletCurrencyShort'.tr()}',
                 style: TextStyle(color: isIncoming ? Colors.green : Colors.red),
@@ -159,12 +173,26 @@ class _WalletTransactionListState extends State<_WalletTransactionList> {
                 children: [
                   Text(ele.remark),
                   const Gap(2),
-                  Text(
-                    DateFormat(
-                      null,
-                      EasyLocalization.of(context)!.currentLocale.toString(),
-                    ).format(ele.createdAt),
-                    style: Theme.of(context).textTheme.labelSmall,
+                  Row(
+                    children: [
+                      Text(
+                        'walletTransactionType${ele.currency.capitalize()}'
+                            .tr(),
+                        style: Theme.of(context).textTheme.labelSmall,
+                      ),
+                      Text(' · ')
+                          .textStyle(Theme.of(context).textTheme.labelSmall!)
+                          .padding(right: 4),
+                      Text(
+                        DateFormat(
+                                null,
+                                EasyLocalization.of(context)!
+                                    .currentLocale
+                                    .toString())
+                            .format(ele.createdAt),
+                        style: Theme.of(context).textTheme.labelSmall,
+                      ),
+                    ],
                   ),
                 ],
               ),
@@ -205,17 +233,14 @@ class _CreateWalletWidgetState extends State<_CreateWalletWidget> {
               autofocus: true,
               obscureText: true,
               controller: passwordController,
-              decoration: InputDecoration(
-                labelText: 'fieldPassword'.tr(),
-              ),
+              decoration: InputDecoration(labelText: 'fieldPassword'.tr()),
             ),
           ],
         ),
         actions: [
           TextButton(
-            onPressed: () => Navigator.of(ctx).pop(),
-            child: Text('cancel').tr(),
-          ),
+              onPressed: () => Navigator.of(ctx).pop(),
+              child: Text('cancel').tr()),
           TextButton(
             onPressed: () {
               Navigator.of(ctx).pop(passwordController.text);
@@ -234,9 +259,7 @@ class _CreateWalletWidgetState extends State<_CreateWalletWidget> {
     try {
       setState(() => _isBusy = true);
       final sn = context.read<SnNetworkProvider>();
-      await sn.client.post('/cgi/wa/wallets/me', data: {
-        'password': password,
-      });
+      await sn.client.post('/cgi/wa/wallets/me', data: {'password': password});
     } catch (err) {
       if (!mounted) return;
       context.showErrorDialog(err);
@@ -255,20 +278,20 @@ class _CreateWalletWidgetState extends State<_CreateWalletWidget> {
             mainAxisSize: MainAxisSize.min,
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              CircleAvatar(
-                radius: 28,
-                child: Icon(Symbols.add, size: 28),
-              ),
+              CircleAvatar(radius: 28, child: Icon(Symbols.add, size: 28)),
               const Gap(12),
-              Text('walletCreate', style: Theme.of(context).textTheme.titleLarge).tr(),
-              Text('walletCreateSubtitle', style: Theme.of(context).textTheme.bodyMedium).tr(),
+              Text('walletCreate',
+                      style: Theme.of(context).textTheme.titleLarge)
+                  .tr(),
+              Text('walletCreateSubtitle',
+                      style: Theme.of(context).textTheme.bodyMedium)
+                  .tr(),
               const Gap(8),
               Align(
                 alignment: Alignment.centerRight,
                 child: TextButton(
-                  onPressed: _isBusy ? null : () => _createWallet(),
-                  child: Text('next').tr(),
-                ),
+                    onPressed: _isBusy ? null : () => _createWallet(),
+                    child: Text('next').tr()),
               ),
             ],
           ).padding(horizontal: 20, vertical: 24),

lib/types/account.dart

@@ -22,6 +22,7 @@ abstract class SnAccount with _$SnAccount {
     required String language,
     required SnAccountProfile? profile,
     @Default([]) List<SnAccountBadge> badges,
+    @Default([]) List<SnPunishment> punishments,
     required DateTime? suspendedAt,
     required int? affiliatedId,
     required int? affiliatedTo,
@@ -184,3 +185,63 @@ abstract class SnActionEvent with _$SnActionEvent {
   factory SnActionEvent.fromJson(Map<String, Object?> json) =>
       _$SnActionEventFromJson(json);
 }
+
+@freezed
+abstract class SnProgram with _$SnProgram {
+  const factory SnProgram({
+    required int id,
+    required DateTime createdAt,
+    required DateTime updatedAt,
+    required DateTime? deletedAt,
+    required String name,
+    required String description,
+    required String alias,
+    required int expRequirement,
+    required Map<String, dynamic> price,
+    required Map<String, dynamic> badge,
+    required Map<String, dynamic> group,
+    required Map<String, dynamic> appearance,
+  }) = _SnProgram;
+
+  factory SnProgram.fromJson(Map<String, Object?> json) =>
+      _$SnProgramFromJson(json);
+}
+
+@freezed
+abstract class SnProgramMember with _$SnProgramMember {
+  const factory SnProgramMember({
+    required int id,
+    required DateTime createdAt,
+    required DateTime updatedAt,
+    required DateTime? deletedAt,
+    required DateTime lastPaid,
+    required SnAccount account,
+    required int accountId,
+    required SnProgram program,
+    required int programId,
+  }) = _SnProgramMember;
+
+  factory SnProgramMember.fromJson(Map<String, Object?> json) =>
+      _$SnProgramMemberFromJson(json);
+}
+
+@freezed
+abstract class SnPunishment with _$SnPunishment {
+  const factory SnPunishment({
+    required int id,
+    required DateTime createdAt,
+    required DateTime updatedAt,
+    required DateTime? deletedAt,
+    required String reason,
+    required int type,
+    @Default({}) Map<String, dynamic> permNodes,
+    required DateTime? expiredAt,
+    required SnAccount? account,
+    required int? accountId,
+    required SnAccount? moderator,
+    required int? moderatorId,
+  }) = _SnPunishment;
+
+  factory SnPunishment.fromJson(Map<String, Object?> json) =>
+      _$SnPunishmentFromJson(json);
+}

lib/types/account.g.dart

@@ -32,6 +32,10 @@ _SnAccount _$SnAccountFromJson(Map<String, dynamic> json) => _SnAccount(
               ?.map((e) => SnAccountBadge.fromJson(e as Map<String, dynamic>))
               .toList() ??
           const [],
+      punishments: (json['punishments'] as List<dynamic>?)
+              ?.map((e) => SnPunishment.fromJson(e as Map<String, dynamic>))
+              .toList() ??
+          const [],
       suspendedAt: json['suspended_at'] == null
           ? null
           : DateTime.parse(json['suspended_at'] as String),
@@ -57,6 +61,7 @@ Map<String, dynamic> _$SnAccountToJson(_SnAccount instance) =>
       'language': instance.language,
       'profile': instance.profile?.toJson(),
       'badges': instance.badges.map((e) => e.toJson()).toList(),
+      'punishments': instance.punishments.map((e) => e.toJson()).toList(),
       'suspended_at': instance.suspendedAt?.toIso8601String(),
       'affiliated_id': instance.affiliatedId,
       'affiliated_to': instance.affiliatedTo,
@@ -319,3 +324,104 @@ Map<String, dynamic> _$SnActionEventToJson(_SnActionEvent instance) =>
       'account': instance.account.toJson(),
       'account_id': instance.accountId,
     };
+
+_SnProgram _$SnProgramFromJson(Map<String, dynamic> json) => _SnProgram(
+      id: (json['id'] as num).toInt(),
+      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),
+      name: json['name'] as String,
+      description: json['description'] as String,
+      alias: json['alias'] as String,
+      expRequirement: (json['exp_requirement'] as num).toInt(),
+      price: json['price'] as Map<String, dynamic>,
+      badge: json['badge'] as Map<String, dynamic>,
+      group: json['group'] as Map<String, dynamic>,
+      appearance: json['appearance'] as Map<String, dynamic>,
+    );
+
+Map<String, dynamic> _$SnProgramToJson(_SnProgram instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'created_at': instance.createdAt.toIso8601String(),
+      'updated_at': instance.updatedAt.toIso8601String(),
+      'deleted_at': instance.deletedAt?.toIso8601String(),
+      'name': instance.name,
+      'description': instance.description,
+      'alias': instance.alias,
+      'exp_requirement': instance.expRequirement,
+      'price': instance.price,
+      'badge': instance.badge,
+      'group': instance.group,
+      'appearance': instance.appearance,
+    };
+
+_SnProgramMember _$SnProgramMemberFromJson(Map<String, dynamic> json) =>
+    _SnProgramMember(
+      id: (json['id'] as num).toInt(),
+      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),
+      lastPaid: DateTime.parse(json['last_paid'] as String),
+      account: SnAccount.fromJson(json['account'] as Map<String, dynamic>),
+      accountId: (json['account_id'] as num).toInt(),
+      program: SnProgram.fromJson(json['program'] as Map<String, dynamic>),
+      programId: (json['program_id'] as num).toInt(),
+    );
+
+Map<String, dynamic> _$SnProgramMemberToJson(_SnProgramMember instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'created_at': instance.createdAt.toIso8601String(),
+      'updated_at': instance.updatedAt.toIso8601String(),
+      'deleted_at': instance.deletedAt?.toIso8601String(),
+      'last_paid': instance.lastPaid.toIso8601String(),
+      'account': instance.account.toJson(),
+      'account_id': instance.accountId,
+      'program': instance.program.toJson(),
+      'program_id': instance.programId,
+    };
+
+_SnPunishment _$SnPunishmentFromJson(Map<String, dynamic> json) =>
+    _SnPunishment(
+      id: (json['id'] as num).toInt(),
+      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),
+      reason: json['reason'] as String,
+      type: (json['type'] as num).toInt(),
+      permNodes: json['perm_nodes'] as Map<String, dynamic>? ?? const {},
+      expiredAt: json['expired_at'] == null
+          ? null
+          : DateTime.parse(json['expired_at'] as String),
+      account: json['account'] == null
+          ? null
+          : SnAccount.fromJson(json['account'] as Map<String, dynamic>),
+      accountId: (json['account_id'] as num?)?.toInt(),
+      moderator: json['moderator'] == null
+          ? null
+          : SnAccount.fromJson(json['moderator'] as Map<String, dynamic>),
+      moderatorId: (json['moderator_id'] as num?)?.toInt(),
+    );
+
+Map<String, dynamic> _$SnPunishmentToJson(_SnPunishment instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'created_at': instance.createdAt.toIso8601String(),
+      'updated_at': instance.updatedAt.toIso8601String(),
+      'deleted_at': instance.deletedAt?.toIso8601String(),
+      'reason': instance.reason,
+      'type': instance.type,
+      'perm_nodes': instance.permNodes,
+      'expired_at': instance.expiredAt?.toIso8601String(),
+      'account': instance.account?.toJson(),
+      'account_id': instance.accountId,
+      'moderator': instance.moderator?.toJson(),
+      'moderator_id': instance.moderatorId,
+    };

lib/types/attachment.dart

@@ -1,4 +1,5 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:surface/types/account.dart';
 
 part 'attachment.freezed.dart';
 
@@ -29,6 +30,7 @@ abstract class SnAttachment with _$SnAttachment {
     required String hash,
     required int destination,
     required int refCount,
+    String? refUrl,
     @Default(0) int contentRating,
     @Default(0) int qualityRating,
     required DateTime? cleanedAt,
@@ -39,6 +41,7 @@ abstract class SnAttachment with _$SnAttachment {
     required int? refId,
     required SnAttachmentPool? pool,
     required int? poolId,
+    required SnAccount? account,
     required int accountId,
     int? thumbnailId,
     SnAttachment? thumbnail,
@@ -49,7 +52,8 @@ abstract class SnAttachment with _$SnAttachment {
     @Default({}) Map<String, dynamic> metadata,
   }) = _SnAttachment;
 
-  factory SnAttachment.fromJson(Map<String, Object?> json) => _$SnAttachmentFromJson(json);
+  factory SnAttachment.fromJson(Map<String, Object?> json) =>
+      _$SnAttachmentFromJson(json);
 
   Map<String, dynamic> get data => {
         ...metadata,
@@ -85,7 +89,8 @@ abstract class SnAttachmentFragment with _$SnAttachmentFragment {
     @Default([]) List<String> fileChunksMissing,
   }) = _SnAttachmentFragment;
 
-  factory SnAttachmentFragment.fromJson(Map<String, Object?> json) => _$SnAttachmentFragmentFromJson(json);
+  factory SnAttachmentFragment.fromJson(Map<String, Object?> json) =>
+      _$SnAttachmentFragmentFromJson(json);
 
   SnMediaType get mediaType => switch (mimetype.split('/').firstOrNull) {
         'image' => SnMediaType.image,
@@ -109,7 +114,8 @@ abstract class SnAttachmentPool with _$SnAttachmentPool {
     required int? accountId,
   }) = _SnAttachmentPool;
 
-  factory SnAttachmentPool.fromJson(Map<String, Object?> json) => _$SnAttachmentPoolFromJson(json);
+  factory SnAttachmentPool.fromJson(Map<String, Object?> json) =>
+      _$SnAttachmentPoolFromJson(json);
 }
 
 @freezed
@@ -122,7 +128,8 @@ abstract class SnAttachmentDestination with _$SnAttachmentDestination {
     required bool isBoost,
   }) = _SnAttachmentDestination;
 
-  factory SnAttachmentDestination.fromJson(Map<String, Object?> json) => _$SnAttachmentDestinationFromJson(json);
+  factory SnAttachmentDestination.fromJson(Map<String, Object?> json) =>
+      _$SnAttachmentDestinationFromJson(json);
 }
 
 @freezed
@@ -139,7 +146,8 @@ abstract class SnAttachmentBoost with _$SnAttachmentBoost {
     required int account,
   }) = _SnAttachmentBoost;
 
-  factory SnAttachmentBoost.fromJson(Map<String, Object?> json) => _$SnAttachmentBoostFromJson(json);
+  factory SnAttachmentBoost.fromJson(Map<String, Object?> json) =>
+      _$SnAttachmentBoostFromJson(json);
 }
 
 @freezed
@@ -158,7 +166,8 @@ abstract class SnSticker with _$SnSticker {
     required int accountId,
   }) = _SnSticker;
 
-  factory SnSticker.fromJson(Map<String, Object?> json) => _$SnStickerFromJson(json);
+  factory SnSticker.fromJson(Map<String, Object?> json) =>
+      _$SnStickerFromJson(json);
 }
 
 @freezed
@@ -175,7 +184,8 @@ abstract class SnStickerPack with _$SnStickerPack {
     required int accountId,
   }) = _SnStickerPack;
 
-  factory SnStickerPack.fromJson(Map<String, Object?> json) => _$SnStickerPackFromJson(json);
+  factory SnStickerPack.fromJson(Map<String, Object?> json) =>
+      _$SnStickerPackFromJson(json);
 }
 
 @freezed
@@ -186,5 +196,6 @@ abstract class SnAttachmentBilling with _$SnAttachmentBilling {
     required double includedRatio,
   }) = _SnAttachmentBilling;
 
-  factory SnAttachmentBilling.fromJson(Map<String, Object?> json) => _$SnAttachmentBillingFromJson(json);
+  factory SnAttachmentBilling.fromJson(Map<String, Object?> json) =>
+      _$SnAttachmentBillingFromJson(json);
 }

lib/types/attachment.freezed.dart

@@ -28,6 +28,7 @@ mixin _$SnAttachment {
   String get hash;
   int get destination;
   int get refCount;
+  String? get refUrl;
   int get contentRating;
   int get qualityRating;
   DateTime? get cleanedAt;
@@ -38,6 +39,7 @@ mixin _$SnAttachment {
   int? get refId;
   SnAttachmentPool? get pool;
   int? get poolId;
+  SnAccount? get account;
   int get accountId;
   int? get thumbnailId;
   SnAttachment? get thumbnail;
@@ -82,6 +84,7 @@ mixin _$SnAttachment {
                 other.destination == destination) &&
             (identical(other.refCount, refCount) ||
                 other.refCount == refCount) &&
+            (identical(other.refUrl, refUrl) || other.refUrl == refUrl) &&
             (identical(other.contentRating, contentRating) ||
                 other.contentRating == contentRating) &&
             (identical(other.qualityRating, qualityRating) ||
@@ -98,6 +101,7 @@ mixin _$SnAttachment {
             (identical(other.refId, refId) || other.refId == refId) &&
             (identical(other.pool, pool) || other.pool == pool) &&
             (identical(other.poolId, poolId) || other.poolId == poolId) &&
+            (identical(other.account, account) || other.account == account) &&
             (identical(other.accountId, accountId) ||
                 other.accountId == accountId) &&
             (identical(other.thumbnailId, thumbnailId) ||
@@ -130,6 +134,7 @@ mixin _$SnAttachment {
         hash,
         destination,
         refCount,
+        refUrl,
         contentRating,
         qualityRating,
         cleanedAt,
@@ -140,6 +145,7 @@ mixin _$SnAttachment {
         refId,
         pool,
         poolId,
+        account,
         accountId,
         thumbnailId,
         thumbnail,
@@ -152,7 +158,7 @@ mixin _$SnAttachment {
 
   @override
   String toString() {
-    return 'SnAttachment(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, rid: $rid, uuid: $uuid, size: $size, name: $name, alt: $alt, mimetype: $mimetype, hash: $hash, destination: $destination, refCount: $refCount, contentRating: $contentRating, qualityRating: $qualityRating, cleanedAt: $cleanedAt, isAnalyzed: $isAnalyzed, isSelfRef: $isSelfRef, isIndexable: $isIndexable, ref: $ref, refId: $refId, pool: $pool, poolId: $poolId, accountId: $accountId, thumbnailId: $thumbnailId, thumbnail: $thumbnail, compressedId: $compressedId, compressed: $compressed, boosts: $boosts, usermeta: $usermeta, metadata: $metadata)';
+    return 'SnAttachment(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, rid: $rid, uuid: $uuid, size: $size, name: $name, alt: $alt, mimetype: $mimetype, hash: $hash, destination: $destination, refCount: $refCount, refUrl: $refUrl, contentRating: $contentRating, qualityRating: $qualityRating, cleanedAt: $cleanedAt, isAnalyzed: $isAnalyzed, isSelfRef: $isSelfRef, isIndexable: $isIndexable, ref: $ref, refId: $refId, pool: $pool, poolId: $poolId, account: $account, accountId: $accountId, thumbnailId: $thumbnailId, thumbnail: $thumbnail, compressedId: $compressedId, compressed: $compressed, boosts: $boosts, usermeta: $usermeta, metadata: $metadata)';
   }
 }
 
@@ -176,6 +182,7 @@ abstract mixin class $SnAttachmentCopyWith<$Res> {
       String hash,
       int destination,
       int refCount,
+      String? refUrl,
       int contentRating,
       int qualityRating,
       DateTime? cleanedAt,
@@ -186,6 +193,7 @@ abstract mixin class $SnAttachmentCopyWith<$Res> {
       int? refId,
       SnAttachmentPool? pool,
       int? poolId,
+      SnAccount? account,
       int accountId,
       int? thumbnailId,
       SnAttachment? thumbnail,
@@ -197,6 +205,7 @@ abstract mixin class $SnAttachmentCopyWith<$Res> {
 
   $SnAttachmentCopyWith<$Res>? get ref;
   $SnAttachmentPoolCopyWith<$Res>? get pool;
+  $SnAccountCopyWith<$Res>? get account;
   $SnAttachmentCopyWith<$Res>? get thumbnail;
   $SnAttachmentCopyWith<$Res>? get compressed;
 }
@@ -226,6 +235,7 @@ class _$SnAttachmentCopyWithImpl<$Res> implements $SnAttachmentCopyWith<$Res> {
     Object? hash = null,
     Object? destination = null,
     Object? refCount = null,
+    Object? refUrl = freezed,
     Object? contentRating = null,
     Object? qualityRating = null,
     Object? cleanedAt = freezed,
@@ -236,6 +246,7 @@ class _$SnAttachmentCopyWithImpl<$Res> implements $SnAttachmentCopyWith<$Res> {
     Object? refId = freezed,
     Object? pool = freezed,
     Object? poolId = freezed,
+    Object? account = freezed,
     Object? accountId = null,
     Object? thumbnailId = freezed,
     Object? thumbnail = freezed,
@@ -298,6 +309,10 @@ class _$SnAttachmentCopyWithImpl<$Res> implements $SnAttachmentCopyWith<$Res> {
           ? _self.refCount
           : refCount // ignore: cast_nullable_to_non_nullable
               as int,
+      refUrl: freezed == refUrl
+          ? _self.refUrl
+          : refUrl // ignore: cast_nullable_to_non_nullable
+              as String?,
       contentRating: null == contentRating
           ? _self.contentRating
           : contentRating // ignore: cast_nullable_to_non_nullable
@@ -338,6 +353,10 @@ class _$SnAttachmentCopyWithImpl<$Res> implements $SnAttachmentCopyWith<$Res> {
           ? _self.poolId
           : poolId // ignore: cast_nullable_to_non_nullable
               as int?,
+      account: freezed == account
+          ? _self.account
+          : account // ignore: cast_nullable_to_non_nullable
+              as SnAccount?,
       accountId: null == accountId
           ? _self.accountId
           : accountId // ignore: cast_nullable_to_non_nullable
@@ -401,6 +420,20 @@ class _$SnAttachmentCopyWithImpl<$Res> implements $SnAttachmentCopyWith<$Res> {
     });
   }
 
+  /// Create a copy of SnAttachment
+  /// 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));
+    });
+  }
+
   /// Create a copy of SnAttachment
   /// with the given fields replaced by the non-null parameter values.
   @override
@@ -447,6 +480,7 @@ class _SnAttachment extends SnAttachment {
       required this.hash,
       required this.destination,
       required this.refCount,
+      this.refUrl,
       this.contentRating = 0,
       this.qualityRating = 0,
       required this.cleanedAt,
@@ -457,6 +491,7 @@ class _SnAttachment extends SnAttachment {
       required this.refId,
       required this.pool,
       required this.poolId,
+      required this.account,
       required this.accountId,
       this.thumbnailId,
       this.thumbnail,
@@ -499,6 +534,8 @@ class _SnAttachment extends SnAttachment {
   @override
   final int refCount;
   @override
+  final String? refUrl;
+  @override
   @JsonKey()
   final int contentRating;
   @override
@@ -521,6 +558,8 @@ class _SnAttachment extends SnAttachment {
   @override
   final int? poolId;
   @override
+  final SnAccount? account;
+  @override
   final int accountId;
   @override
   final int? thumbnailId;
@@ -596,6 +635,7 @@ class _SnAttachment extends SnAttachment {
                 other.destination == destination) &&
             (identical(other.refCount, refCount) ||
                 other.refCount == refCount) &&
+            (identical(other.refUrl, refUrl) || other.refUrl == refUrl) &&
             (identical(other.contentRating, contentRating) ||
                 other.contentRating == contentRating) &&
             (identical(other.qualityRating, qualityRating) ||
@@ -612,6 +652,7 @@ class _SnAttachment extends SnAttachment {
             (identical(other.refId, refId) || other.refId == refId) &&
             (identical(other.pool, pool) || other.pool == pool) &&
             (identical(other.poolId, poolId) || other.poolId == poolId) &&
+            (identical(other.account, account) || other.account == account) &&
             (identical(other.accountId, accountId) ||
                 other.accountId == accountId) &&
             (identical(other.thumbnailId, thumbnailId) ||
@@ -644,6 +685,7 @@ class _SnAttachment extends SnAttachment {
         hash,
         destination,
         refCount,
+        refUrl,
         contentRating,
         qualityRating,
         cleanedAt,
@@ -654,6 +696,7 @@ class _SnAttachment extends SnAttachment {
         refId,
         pool,
         poolId,
+        account,
         accountId,
         thumbnailId,
         thumbnail,
@@ -666,7 +709,7 @@ class _SnAttachment extends SnAttachment {
 
   @override
   String toString() {
-    return 'SnAttachment(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, rid: $rid, uuid: $uuid, size: $size, name: $name, alt: $alt, mimetype: $mimetype, hash: $hash, destination: $destination, refCount: $refCount, contentRating: $contentRating, qualityRating: $qualityRating, cleanedAt: $cleanedAt, isAnalyzed: $isAnalyzed, isSelfRef: $isSelfRef, isIndexable: $isIndexable, ref: $ref, refId: $refId, pool: $pool, poolId: $poolId, accountId: $accountId, thumbnailId: $thumbnailId, thumbnail: $thumbnail, compressedId: $compressedId, compressed: $compressed, boosts: $boosts, usermeta: $usermeta, metadata: $metadata)';
+    return 'SnAttachment(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, rid: $rid, uuid: $uuid, size: $size, name: $name, alt: $alt, mimetype: $mimetype, hash: $hash, destination: $destination, refCount: $refCount, refUrl: $refUrl, contentRating: $contentRating, qualityRating: $qualityRating, cleanedAt: $cleanedAt, isAnalyzed: $isAnalyzed, isSelfRef: $isSelfRef, isIndexable: $isIndexable, ref: $ref, refId: $refId, pool: $pool, poolId: $poolId, account: $account, accountId: $accountId, thumbnailId: $thumbnailId, thumbnail: $thumbnail, compressedId: $compressedId, compressed: $compressed, boosts: $boosts, usermeta: $usermeta, metadata: $metadata)';
   }
 }
 
@@ -692,6 +735,7 @@ abstract mixin class _$SnAttachmentCopyWith<$Res>
       String hash,
       int destination,
       int refCount,
+      String? refUrl,
       int contentRating,
       int qualityRating,
       DateTime? cleanedAt,
@@ -702,6 +746,7 @@ abstract mixin class _$SnAttachmentCopyWith<$Res>
       int? refId,
       SnAttachmentPool? pool,
       int? poolId,
+      SnAccount? account,
       int accountId,
       int? thumbnailId,
       SnAttachment? thumbnail,
@@ -716,6 +761,8 @@ abstract mixin class _$SnAttachmentCopyWith<$Res>
   @override
   $SnAttachmentPoolCopyWith<$Res>? get pool;
   @override
+  $SnAccountCopyWith<$Res>? get account;
+  @override
   $SnAttachmentCopyWith<$Res>? get thumbnail;
   @override
   $SnAttachmentCopyWith<$Res>? get compressed;
@@ -747,6 +794,7 @@ class __$SnAttachmentCopyWithImpl<$Res>
     Object? hash = null,
     Object? destination = null,
     Object? refCount = null,
+    Object? refUrl = freezed,
     Object? contentRating = null,
     Object? qualityRating = null,
     Object? cleanedAt = freezed,
@@ -757,6 +805,7 @@ class __$SnAttachmentCopyWithImpl<$Res>
     Object? refId = freezed,
     Object? pool = freezed,
     Object? poolId = freezed,
+    Object? account = freezed,
     Object? accountId = null,
     Object? thumbnailId = freezed,
     Object? thumbnail = freezed,
@@ -819,6 +868,10 @@ class __$SnAttachmentCopyWithImpl<$Res>
           ? _self.refCount
           : refCount // ignore: cast_nullable_to_non_nullable
               as int,
+      refUrl: freezed == refUrl
+          ? _self.refUrl
+          : refUrl // ignore: cast_nullable_to_non_nullable
+              as String?,
       contentRating: null == contentRating
           ? _self.contentRating
           : contentRating // ignore: cast_nullable_to_non_nullable
@@ -859,6 +912,10 @@ class __$SnAttachmentCopyWithImpl<$Res>
           ? _self.poolId
           : poolId // ignore: cast_nullable_to_non_nullable
               as int?,
+      account: freezed == account
+          ? _self.account
+          : account // ignore: cast_nullable_to_non_nullable
+              as SnAccount?,
       accountId: null == accountId
           ? _self.accountId
           : accountId // ignore: cast_nullable_to_non_nullable
@@ -922,6 +979,20 @@ class __$SnAttachmentCopyWithImpl<$Res>
     });
   }
 
+  /// Create a copy of SnAttachment
+  /// 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));
+    });
+  }
+
   /// Create a copy of SnAttachment
   /// with the given fields replaced by the non-null parameter values.
   @override

lib/types/attachment.g.dart

@@ -23,6 +23,7 @@ _SnAttachment _$SnAttachmentFromJson(Map<String, dynamic> json) =>
       hash: json['hash'] as String,
       destination: (json['destination'] as num).toInt(),
       refCount: (json['ref_count'] as num).toInt(),
+      refUrl: json['ref_url'] as String?,
       contentRating: (json['content_rating'] as num?)?.toInt() ?? 0,
       qualityRating: (json['quality_rating'] as num?)?.toInt() ?? 0,
       cleanedAt: json['cleaned_at'] == null
@@ -39,6 +40,9 @@ _SnAttachment _$SnAttachmentFromJson(Map<String, dynamic> json) =>
           ? null
           : SnAttachmentPool.fromJson(json['pool'] as Map<String, dynamic>),
       poolId: (json['pool_id'] as num?)?.toInt(),
+      account: json['account'] == null
+          ? null
+          : SnAccount.fromJson(json['account'] as Map<String, dynamic>),
       accountId: (json['account_id'] as num).toInt(),
       thumbnailId: (json['thumbnail_id'] as num?)?.toInt(),
       thumbnail: json['thumbnail'] == null
@@ -72,6 +76,7 @@ Map<String, dynamic> _$SnAttachmentToJson(_SnAttachment instance) =>
       'hash': instance.hash,
       'destination': instance.destination,
       'ref_count': instance.refCount,
+      'ref_url': instance.refUrl,
       'content_rating': instance.contentRating,
       'quality_rating': instance.qualityRating,
       'cleaned_at': instance.cleanedAt?.toIso8601String(),
@@ -82,6 +87,7 @@ Map<String, dynamic> _$SnAttachmentToJson(_SnAttachment instance) =>
       'ref_id': instance.refId,
       'pool': instance.pool?.toJson(),
       'pool_id': instance.poolId,
+      'account': instance.account?.toJson(),
       'account_id': instance.accountId,
       'thumbnail_id': instance.thumbnailId,
       'thumbnail': instance.thumbnail?.toJson(),

lib/types/chat.dart

@@ -1,5 +1,4 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:livekit_client/livekit_client.dart';
 import 'package:surface/types/account.dart';
 import 'package:surface/types/attachment.dart';
 import 'package:surface/types/realm.dart';
@@ -116,24 +115,3 @@ abstract class SnChatCall with _$SnChatCall {
   factory SnChatCall.fromJson(Map<String, dynamic> json) =>
       _$SnChatCallFromJson(json);
 }
-
-// Call stuff
-
-enum ParticipantStatsType {
-  unknown,
-  localAudioSender,
-  localVideoSender,
-  remoteAudioReceiver,
-  remoteVideoReceiver,
-}
-
-class ParticipantTrack {
-  ParticipantTrack(
-      {required this.participant,
-      required this.videoTrack,
-      required this.isScreenShare});
-
-  VideoTrack? videoTrack;
-  Participant participant;
-  bool isScreenShare;
-}

lib/types/news.dart

@@ -4,35 +4,43 @@ part 'news.freezed.dart';
 part 'news.g.dart';
 
 @freezed
-abstract class SnNewsSource with _$SnNewsSource {
-  const factory SnNewsSource({
-    required String id,
-    required String label,
-    required String type,
-    required String source,
-    required int depth,
-    required bool enabled,
-  }) = _SnNewsSource;
-
-  factory SnNewsSource.fromJson(Map<String, dynamic> json) => _$SnNewsSourceFromJson(json);
-}
-
-@freezed
-abstract class SnNewsArticle with _$SnNewsArticle {
-  const factory SnNewsArticle({
+abstract class SnSubscriptionFeed with _$SnSubscriptionFeed {
+  const factory SnSubscriptionFeed({
     required int id,
     required DateTime createdAt,
     required DateTime updatedAt,
-    required dynamic deletedAt,
+    required DateTime? deletedAt,
+    required String url,
+    required bool isEnabled,
+    required bool isFullContent,
+    required int pullInterval,
+    required String adapter,
+    required int? accountId,
+    required DateTime? lastFetchedAt,
+  }) = _SnSubscriptionFeed;
+
+  factory SnSubscriptionFeed.fromJson(Map<String, dynamic> json) =>
+      _$SnSubscriptionFeedFromJson(json);
+}
+
+@freezed
+abstract class SnSubscriptionItem with _$SnSubscriptionItem {
+  const factory SnSubscriptionItem({
+    required int id,
+    required DateTime createdAt,
+    required DateTime updatedAt,
+    required DateTime? deletedAt,
     required String thumbnail,
     required String title,
     required String description,
     required String content,
     required String url,
     required String hash,
-    required String source,
+    required int feedId,
+    required SnSubscriptionFeed feed,
     required DateTime? publishedAt,
-  }) = _SnNewsArticle;
+  }) = _SnSubscriptionItem;
 
-  factory SnNewsArticle.fromJson(Map<String, dynamic> json) => _$SnNewsArticleFromJson(json);
+  factory SnSubscriptionItem.fromJson(Map<String, dynamic> json) =>
+      _$SnSubscriptionItemFromJson(json);
 }

lib/types/news.freezed.dart

@@ -14,149 +14,224 @@ part of 'news.dart';
 T _$identity<T>(T value) => value;
 
 /// @nodoc
-mixin _$SnNewsSource {
-  String get id;
-  String get label;
-  String get type;
-  String get source;
-  int get depth;
-  bool get enabled;
+mixin _$SnSubscriptionFeed {
+  int get id;
+  DateTime get createdAt;
+  DateTime get updatedAt;
+  DateTime? get deletedAt;
+  String get url;
+  bool get isEnabled;
+  bool get isFullContent;
+  int get pullInterval;
+  String get adapter;
+  int? get accountId;
+  DateTime? get lastFetchedAt;
 
-  /// Create a copy of SnNewsSource
+  /// Create a copy of SnSubscriptionFeed
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $SnNewsSourceCopyWith<SnNewsSource> get copyWith =>
-      _$SnNewsSourceCopyWithImpl<SnNewsSource>(
-          this as SnNewsSource, _$identity);
+  $SnSubscriptionFeedCopyWith<SnSubscriptionFeed> get copyWith =>
+      _$SnSubscriptionFeedCopyWithImpl<SnSubscriptionFeed>(
+          this as SnSubscriptionFeed, _$identity);
 
-  /// Serializes this SnNewsSource to a JSON map.
+  /// Serializes this SnSubscriptionFeed to a JSON map.
   Map<String, dynamic> toJson();
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is SnNewsSource &&
+            other is SnSubscriptionFeed &&
             (identical(other.id, id) || other.id == id) &&
-            (identical(other.label, label) || other.label == label) &&
-            (identical(other.type, type) || other.type == type) &&
-            (identical(other.source, source) || other.source == source) &&
-            (identical(other.depth, depth) || other.depth == depth) &&
-            (identical(other.enabled, enabled) || other.enabled == enabled));
+            (identical(other.createdAt, createdAt) ||
+                other.createdAt == createdAt) &&
+            (identical(other.updatedAt, updatedAt) ||
+                other.updatedAt == updatedAt) &&
+            (identical(other.deletedAt, deletedAt) ||
+                other.deletedAt == deletedAt) &&
+            (identical(other.url, url) || other.url == url) &&
+            (identical(other.isEnabled, isEnabled) ||
+                other.isEnabled == isEnabled) &&
+            (identical(other.isFullContent, isFullContent) ||
+                other.isFullContent == isFullContent) &&
+            (identical(other.pullInterval, pullInterval) ||
+                other.pullInterval == pullInterval) &&
+            (identical(other.adapter, adapter) || other.adapter == adapter) &&
+            (identical(other.accountId, accountId) ||
+                other.accountId == accountId) &&
+            (identical(other.lastFetchedAt, lastFetchedAt) ||
+                other.lastFetchedAt == lastFetchedAt));
   }
 
   @JsonKey(includeFromJson: false, includeToJson: false)
   @override
-  int get hashCode =>
-      Object.hash(runtimeType, id, label, type, source, depth, enabled);
+  int get hashCode => Object.hash(
+      runtimeType,
+      id,
+      createdAt,
+      updatedAt,
+      deletedAt,
+      url,
+      isEnabled,
+      isFullContent,
+      pullInterval,
+      adapter,
+      accountId,
+      lastFetchedAt);
 
   @override
   String toString() {
-    return 'SnNewsSource(id: $id, label: $label, type: $type, source: $source, depth: $depth, enabled: $enabled)';
+    return 'SnSubscriptionFeed(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, url: $url, isEnabled: $isEnabled, isFullContent: $isFullContent, pullInterval: $pullInterval, adapter: $adapter, accountId: $accountId, lastFetchedAt: $lastFetchedAt)';
   }
 }
 
 /// @nodoc
-abstract mixin class $SnNewsSourceCopyWith<$Res> {
-  factory $SnNewsSourceCopyWith(
-          SnNewsSource value, $Res Function(SnNewsSource) _then) =
-      _$SnNewsSourceCopyWithImpl;
+abstract mixin class $SnSubscriptionFeedCopyWith<$Res> {
+  factory $SnSubscriptionFeedCopyWith(
+          SnSubscriptionFeed value, $Res Function(SnSubscriptionFeed) _then) =
+      _$SnSubscriptionFeedCopyWithImpl;
   @useResult
   $Res call(
-      {String id,
-      String label,
-      String type,
-      String source,
-      int depth,
-      bool enabled});
+      {int id,
+      DateTime createdAt,
+      DateTime updatedAt,
+      DateTime? deletedAt,
+      String url,
+      bool isEnabled,
+      bool isFullContent,
+      int pullInterval,
+      String adapter,
+      int? accountId,
+      DateTime? lastFetchedAt});
 }
 
 /// @nodoc
-class _$SnNewsSourceCopyWithImpl<$Res> implements $SnNewsSourceCopyWith<$Res> {
-  _$SnNewsSourceCopyWithImpl(this._self, this._then);
+class _$SnSubscriptionFeedCopyWithImpl<$Res>
+    implements $SnSubscriptionFeedCopyWith<$Res> {
+  _$SnSubscriptionFeedCopyWithImpl(this._self, this._then);
 
-  final SnNewsSource _self;
-  final $Res Function(SnNewsSource) _then;
+  final SnSubscriptionFeed _self;
+  final $Res Function(SnSubscriptionFeed) _then;
 
-  /// Create a copy of SnNewsSource
+  /// Create a copy of SnSubscriptionFeed
   /// 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? type = null,
-    Object? source = null,
-    Object? depth = null,
-    Object? enabled = null,
+    Object? createdAt = null,
+    Object? updatedAt = null,
+    Object? deletedAt = freezed,
+    Object? url = null,
+    Object? isEnabled = null,
+    Object? isFullContent = null,
+    Object? pullInterval = null,
+    Object? adapter = null,
+    Object? accountId = freezed,
+    Object? lastFetchedAt = 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,
-      type: null == type
-          ? _self.type
-          : type // ignore: cast_nullable_to_non_nullable
-              as String,
-      source: null == source
-          ? _self.source
-          : source // ignore: cast_nullable_to_non_nullable
-              as String,
-      depth: null == depth
-          ? _self.depth
-          : depth // ignore: cast_nullable_to_non_nullable
               as int,
-      enabled: null == enabled
-          ? _self.enabled
-          : enabled // ignore: cast_nullable_to_non_nullable
+      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?,
+      url: null == url
+          ? _self.url
+          : url // ignore: cast_nullable_to_non_nullable
+              as String,
+      isEnabled: null == isEnabled
+          ? _self.isEnabled
+          : isEnabled // ignore: cast_nullable_to_non_nullable
               as bool,
+      isFullContent: null == isFullContent
+          ? _self.isFullContent
+          : isFullContent // ignore: cast_nullable_to_non_nullable
+              as bool,
+      pullInterval: null == pullInterval
+          ? _self.pullInterval
+          : pullInterval // ignore: cast_nullable_to_non_nullable
+              as int,
+      adapter: null == adapter
+          ? _self.adapter
+          : adapter // ignore: cast_nullable_to_non_nullable
+              as String,
+      accountId: freezed == accountId
+          ? _self.accountId
+          : accountId // ignore: cast_nullable_to_non_nullable
+              as int?,
+      lastFetchedAt: freezed == lastFetchedAt
+          ? _self.lastFetchedAt
+          : lastFetchedAt // ignore: cast_nullable_to_non_nullable
+              as DateTime?,
     ));
   }
 }
 
 /// @nodoc
 @JsonSerializable()
-class _SnNewsSource implements SnNewsSource {
-  const _SnNewsSource(
+class _SnSubscriptionFeed implements SnSubscriptionFeed {
+  const _SnSubscriptionFeed(
       {required this.id,
-      required this.label,
-      required this.type,
-      required this.source,
-      required this.depth,
-      required this.enabled});
-  factory _SnNewsSource.fromJson(Map<String, dynamic> json) =>
-      _$SnNewsSourceFromJson(json);
+      required this.createdAt,
+      required this.updatedAt,
+      required this.deletedAt,
+      required this.url,
+      required this.isEnabled,
+      required this.isFullContent,
+      required this.pullInterval,
+      required this.adapter,
+      required this.accountId,
+      required this.lastFetchedAt});
+  factory _SnSubscriptionFeed.fromJson(Map<String, dynamic> json) =>
+      _$SnSubscriptionFeedFromJson(json);
 
   @override
-  final String id;
+  final int id;
   @override
-  final String label;
+  final DateTime createdAt;
   @override
-  final String type;
+  final DateTime updatedAt;
   @override
-  final String source;
+  final DateTime? deletedAt;
   @override
-  final int depth;
+  final String url;
   @override
-  final bool enabled;
+  final bool isEnabled;
+  @override
+  final bool isFullContent;
+  @override
+  final int pullInterval;
+  @override
+  final String adapter;
+  @override
+  final int? accountId;
+  @override
+  final DateTime? lastFetchedAt;
 
-  /// Create a copy of SnNewsSource
+  /// Create a copy of SnSubscriptionFeed
   /// with the given fields replaced by the non-null parameter values.
   @override
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  _$SnNewsSourceCopyWith<_SnNewsSource> get copyWith =>
-      __$SnNewsSourceCopyWithImpl<_SnNewsSource>(this, _$identity);
+  _$SnSubscriptionFeedCopyWith<_SnSubscriptionFeed> get copyWith =>
+      __$SnSubscriptionFeedCopyWithImpl<_SnSubscriptionFeed>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$SnNewsSourceToJson(
+    return _$SnSubscriptionFeedToJson(
       this,
     );
   }
@@ -165,129 +240,185 @@ class _SnNewsSource implements SnNewsSource {
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _SnNewsSource &&
+            other is _SnSubscriptionFeed &&
             (identical(other.id, id) || other.id == id) &&
-            (identical(other.label, label) || other.label == label) &&
-            (identical(other.type, type) || other.type == type) &&
-            (identical(other.source, source) || other.source == source) &&
-            (identical(other.depth, depth) || other.depth == depth) &&
-            (identical(other.enabled, enabled) || other.enabled == enabled));
+            (identical(other.createdAt, createdAt) ||
+                other.createdAt == createdAt) &&
+            (identical(other.updatedAt, updatedAt) ||
+                other.updatedAt == updatedAt) &&
+            (identical(other.deletedAt, deletedAt) ||
+                other.deletedAt == deletedAt) &&
+            (identical(other.url, url) || other.url == url) &&
+            (identical(other.isEnabled, isEnabled) ||
+                other.isEnabled == isEnabled) &&
+            (identical(other.isFullContent, isFullContent) ||
+                other.isFullContent == isFullContent) &&
+            (identical(other.pullInterval, pullInterval) ||
+                other.pullInterval == pullInterval) &&
+            (identical(other.adapter, adapter) || other.adapter == adapter) &&
+            (identical(other.accountId, accountId) ||
+                other.accountId == accountId) &&
+            (identical(other.lastFetchedAt, lastFetchedAt) ||
+                other.lastFetchedAt == lastFetchedAt));
   }
 
   @JsonKey(includeFromJson: false, includeToJson: false)
   @override
-  int get hashCode =>
-      Object.hash(runtimeType, id, label, type, source, depth, enabled);
+  int get hashCode => Object.hash(
+      runtimeType,
+      id,
+      createdAt,
+      updatedAt,
+      deletedAt,
+      url,
+      isEnabled,
+      isFullContent,
+      pullInterval,
+      adapter,
+      accountId,
+      lastFetchedAt);
 
   @override
   String toString() {
-    return 'SnNewsSource(id: $id, label: $label, type: $type, source: $source, depth: $depth, enabled: $enabled)';
+    return 'SnSubscriptionFeed(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, url: $url, isEnabled: $isEnabled, isFullContent: $isFullContent, pullInterval: $pullInterval, adapter: $adapter, accountId: $accountId, lastFetchedAt: $lastFetchedAt)';
   }
 }
 
 /// @nodoc
-abstract mixin class _$SnNewsSourceCopyWith<$Res>
-    implements $SnNewsSourceCopyWith<$Res> {
-  factory _$SnNewsSourceCopyWith(
-          _SnNewsSource value, $Res Function(_SnNewsSource) _then) =
-      __$SnNewsSourceCopyWithImpl;
+abstract mixin class _$SnSubscriptionFeedCopyWith<$Res>
+    implements $SnSubscriptionFeedCopyWith<$Res> {
+  factory _$SnSubscriptionFeedCopyWith(
+          _SnSubscriptionFeed value, $Res Function(_SnSubscriptionFeed) _then) =
+      __$SnSubscriptionFeedCopyWithImpl;
   @override
   @useResult
   $Res call(
-      {String id,
-      String label,
-      String type,
-      String source,
-      int depth,
-      bool enabled});
+      {int id,
+      DateTime createdAt,
+      DateTime updatedAt,
+      DateTime? deletedAt,
+      String url,
+      bool isEnabled,
+      bool isFullContent,
+      int pullInterval,
+      String adapter,
+      int? accountId,
+      DateTime? lastFetchedAt});
 }
 
 /// @nodoc
-class __$SnNewsSourceCopyWithImpl<$Res>
-    implements _$SnNewsSourceCopyWith<$Res> {
-  __$SnNewsSourceCopyWithImpl(this._self, this._then);
+class __$SnSubscriptionFeedCopyWithImpl<$Res>
+    implements _$SnSubscriptionFeedCopyWith<$Res> {
+  __$SnSubscriptionFeedCopyWithImpl(this._self, this._then);
 
-  final _SnNewsSource _self;
-  final $Res Function(_SnNewsSource) _then;
+  final _SnSubscriptionFeed _self;
+  final $Res Function(_SnSubscriptionFeed) _then;
 
-  /// Create a copy of SnNewsSource
+  /// Create a copy of SnSubscriptionFeed
   /// 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? type = null,
-    Object? source = null,
-    Object? depth = null,
-    Object? enabled = null,
+    Object? createdAt = null,
+    Object? updatedAt = null,
+    Object? deletedAt = freezed,
+    Object? url = null,
+    Object? isEnabled = null,
+    Object? isFullContent = null,
+    Object? pullInterval = null,
+    Object? adapter = null,
+    Object? accountId = freezed,
+    Object? lastFetchedAt = freezed,
   }) {
-    return _then(_SnNewsSource(
+    return _then(_SnSubscriptionFeed(
       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,
-      type: null == type
-          ? _self.type
-          : type // ignore: cast_nullable_to_non_nullable
-              as String,
-      source: null == source
-          ? _self.source
-          : source // ignore: cast_nullable_to_non_nullable
-              as String,
-      depth: null == depth
-          ? _self.depth
-          : depth // ignore: cast_nullable_to_non_nullable
               as int,
-      enabled: null == enabled
-          ? _self.enabled
-          : enabled // ignore: cast_nullable_to_non_nullable
+      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?,
+      url: null == url
+          ? _self.url
+          : url // ignore: cast_nullable_to_non_nullable
+              as String,
+      isEnabled: null == isEnabled
+          ? _self.isEnabled
+          : isEnabled // ignore: cast_nullable_to_non_nullable
               as bool,
+      isFullContent: null == isFullContent
+          ? _self.isFullContent
+          : isFullContent // ignore: cast_nullable_to_non_nullable
+              as bool,
+      pullInterval: null == pullInterval
+          ? _self.pullInterval
+          : pullInterval // ignore: cast_nullable_to_non_nullable
+              as int,
+      adapter: null == adapter
+          ? _self.adapter
+          : adapter // ignore: cast_nullable_to_non_nullable
+              as String,
+      accountId: freezed == accountId
+          ? _self.accountId
+          : accountId // ignore: cast_nullable_to_non_nullable
+              as int?,
+      lastFetchedAt: freezed == lastFetchedAt
+          ? _self.lastFetchedAt
+          : lastFetchedAt // ignore: cast_nullable_to_non_nullable
+              as DateTime?,
     ));
   }
 }
 
 /// @nodoc
-mixin _$SnNewsArticle {
+mixin _$SnSubscriptionItem {
   int get id;
   DateTime get createdAt;
   DateTime get updatedAt;
-  dynamic get deletedAt;
+  DateTime? get deletedAt;
   String get thumbnail;
   String get title;
   String get description;
   String get content;
   String get url;
   String get hash;
-  String get source;
+  int get feedId;
+  SnSubscriptionFeed get feed;
   DateTime? get publishedAt;
 
-  /// Create a copy of SnNewsArticle
+  /// Create a copy of SnSubscriptionItem
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $SnNewsArticleCopyWith<SnNewsArticle> get copyWith =>
-      _$SnNewsArticleCopyWithImpl<SnNewsArticle>(
-          this as SnNewsArticle, _$identity);
+  $SnSubscriptionItemCopyWith<SnSubscriptionItem> get copyWith =>
+      _$SnSubscriptionItemCopyWithImpl<SnSubscriptionItem>(
+          this as SnSubscriptionItem, _$identity);
 
-  /// Serializes this SnNewsArticle to a JSON map.
+  /// Serializes this SnSubscriptionItem to a JSON map.
   Map<String, dynamic> toJson();
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is SnNewsArticle &&
+            other is SnSubscriptionItem &&
             (identical(other.id, id) || other.id == id) &&
             (identical(other.createdAt, createdAt) ||
                 other.createdAt == createdAt) &&
             (identical(other.updatedAt, updatedAt) ||
                 other.updatedAt == updatedAt) &&
-            const DeepCollectionEquality().equals(other.deletedAt, deletedAt) &&
+            (identical(other.deletedAt, deletedAt) ||
+                other.deletedAt == deletedAt) &&
             (identical(other.thumbnail, thumbnail) ||
                 other.thumbnail == thumbnail) &&
             (identical(other.title, title) || other.title == title) &&
@@ -296,7 +427,8 @@ mixin _$SnNewsArticle {
             (identical(other.content, content) || other.content == content) &&
             (identical(other.url, url) || other.url == url) &&
             (identical(other.hash, hash) || other.hash == hash) &&
-            (identical(other.source, source) || other.source == source) &&
+            (identical(other.feedId, feedId) || other.feedId == feedId) &&
+            (identical(other.feed, feed) || other.feed == feed) &&
             (identical(other.publishedAt, publishedAt) ||
                 other.publishedAt == publishedAt));
   }
@@ -308,52 +440,56 @@ mixin _$SnNewsArticle {
       id,
       createdAt,
       updatedAt,
-      const DeepCollectionEquality().hash(deletedAt),
+      deletedAt,
       thumbnail,
       title,
       description,
       content,
       url,
       hash,
-      source,
+      feedId,
+      feed,
       publishedAt);
 
   @override
   String toString() {
-    return 'SnNewsArticle(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, thumbnail: $thumbnail, title: $title, description: $description, content: $content, url: $url, hash: $hash, source: $source, publishedAt: $publishedAt)';
+    return 'SnSubscriptionItem(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, thumbnail: $thumbnail, title: $title, description: $description, content: $content, url: $url, hash: $hash, feedId: $feedId, feed: $feed, publishedAt: $publishedAt)';
   }
 }
 
 /// @nodoc
-abstract mixin class $SnNewsArticleCopyWith<$Res> {
-  factory $SnNewsArticleCopyWith(
-          SnNewsArticle value, $Res Function(SnNewsArticle) _then) =
-      _$SnNewsArticleCopyWithImpl;
+abstract mixin class $SnSubscriptionItemCopyWith<$Res> {
+  factory $SnSubscriptionItemCopyWith(
+          SnSubscriptionItem value, $Res Function(SnSubscriptionItem) _then) =
+      _$SnSubscriptionItemCopyWithImpl;
   @useResult
   $Res call(
       {int id,
       DateTime createdAt,
       DateTime updatedAt,
-      dynamic deletedAt,
+      DateTime? deletedAt,
       String thumbnail,
       String title,
       String description,
       String content,
       String url,
       String hash,
-      String source,
+      int feedId,
+      SnSubscriptionFeed feed,
       DateTime? publishedAt});
+
+  $SnSubscriptionFeedCopyWith<$Res> get feed;
 }
 
 /// @nodoc
-class _$SnNewsArticleCopyWithImpl<$Res>
-    implements $SnNewsArticleCopyWith<$Res> {
-  _$SnNewsArticleCopyWithImpl(this._self, this._then);
+class _$SnSubscriptionItemCopyWithImpl<$Res>
+    implements $SnSubscriptionItemCopyWith<$Res> {
+  _$SnSubscriptionItemCopyWithImpl(this._self, this._then);
 
-  final SnNewsArticle _self;
-  final $Res Function(SnNewsArticle) _then;
+  final SnSubscriptionItem _self;
+  final $Res Function(SnSubscriptionItem) _then;
 
-  /// Create a copy of SnNewsArticle
+  /// Create a copy of SnSubscriptionItem
   /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
@@ -368,7 +504,8 @@ class _$SnNewsArticleCopyWithImpl<$Res>
     Object? content = null,
     Object? url = null,
     Object? hash = null,
-    Object? source = null,
+    Object? feedId = null,
+    Object? feed = null,
     Object? publishedAt = freezed,
   }) {
     return _then(_self.copyWith(
@@ -387,7 +524,7 @@ class _$SnNewsArticleCopyWithImpl<$Res>
       deletedAt: freezed == deletedAt
           ? _self.deletedAt
           : deletedAt // ignore: cast_nullable_to_non_nullable
-              as dynamic,
+              as DateTime?,
       thumbnail: null == thumbnail
           ? _self.thumbnail
           : thumbnail // ignore: cast_nullable_to_non_nullable
@@ -412,22 +549,36 @@ class _$SnNewsArticleCopyWithImpl<$Res>
           ? _self.hash
           : hash // ignore: cast_nullable_to_non_nullable
               as String,
-      source: null == source
-          ? _self.source
-          : source // ignore: cast_nullable_to_non_nullable
-              as String,
+      feedId: null == feedId
+          ? _self.feedId
+          : feedId // ignore: cast_nullable_to_non_nullable
+              as int,
+      feed: null == feed
+          ? _self.feed
+          : feed // ignore: cast_nullable_to_non_nullable
+              as SnSubscriptionFeed,
       publishedAt: freezed == publishedAt
           ? _self.publishedAt
           : publishedAt // ignore: cast_nullable_to_non_nullable
               as DateTime?,
     ));
   }
+
+  /// Create a copy of SnSubscriptionItem
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $SnSubscriptionFeedCopyWith<$Res> get feed {
+    return $SnSubscriptionFeedCopyWith<$Res>(_self.feed, (value) {
+      return _then(_self.copyWith(feed: value));
+    });
+  }
 }
 
 /// @nodoc
 @JsonSerializable()
-class _SnNewsArticle implements SnNewsArticle {
-  const _SnNewsArticle(
+class _SnSubscriptionItem implements SnSubscriptionItem {
+  const _SnSubscriptionItem(
       {required this.id,
       required this.createdAt,
       required this.updatedAt,
@@ -438,10 +589,11 @@ class _SnNewsArticle implements SnNewsArticle {
       required this.content,
       required this.url,
       required this.hash,
-      required this.source,
+      required this.feedId,
+      required this.feed,
       required this.publishedAt});
-  factory _SnNewsArticle.fromJson(Map<String, dynamic> json) =>
-      _$SnNewsArticleFromJson(json);
+  factory _SnSubscriptionItem.fromJson(Map<String, dynamic> json) =>
+      _$SnSubscriptionItemFromJson(json);
 
   @override
   final int id;
@@ -450,7 +602,7 @@ class _SnNewsArticle implements SnNewsArticle {
   @override
   final DateTime updatedAt;
   @override
-  final dynamic deletedAt;
+  final DateTime? deletedAt;
   @override
   final String thumbnail;
   @override
@@ -464,21 +616,23 @@ class _SnNewsArticle implements SnNewsArticle {
   @override
   final String hash;
   @override
-  final String source;
+  final int feedId;
+  @override
+  final SnSubscriptionFeed feed;
   @override
   final DateTime? publishedAt;
 
-  /// Create a copy of SnNewsArticle
+  /// Create a copy of SnSubscriptionItem
   /// with the given fields replaced by the non-null parameter values.
   @override
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  _$SnNewsArticleCopyWith<_SnNewsArticle> get copyWith =>
-      __$SnNewsArticleCopyWithImpl<_SnNewsArticle>(this, _$identity);
+  _$SnSubscriptionItemCopyWith<_SnSubscriptionItem> get copyWith =>
+      __$SnSubscriptionItemCopyWithImpl<_SnSubscriptionItem>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$SnNewsArticleToJson(
+    return _$SnSubscriptionItemToJson(
       this,
     );
   }
@@ -487,13 +641,14 @@ class _SnNewsArticle implements SnNewsArticle {
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _SnNewsArticle &&
+            other is _SnSubscriptionItem &&
             (identical(other.id, id) || other.id == id) &&
             (identical(other.createdAt, createdAt) ||
                 other.createdAt == createdAt) &&
             (identical(other.updatedAt, updatedAt) ||
                 other.updatedAt == updatedAt) &&
-            const DeepCollectionEquality().equals(other.deletedAt, deletedAt) &&
+            (identical(other.deletedAt, deletedAt) ||
+                other.deletedAt == deletedAt) &&
             (identical(other.thumbnail, thumbnail) ||
                 other.thumbnail == thumbnail) &&
             (identical(other.title, title) || other.title == title) &&
@@ -502,7 +657,8 @@ class _SnNewsArticle implements SnNewsArticle {
             (identical(other.content, content) || other.content == content) &&
             (identical(other.url, url) || other.url == url) &&
             (identical(other.hash, hash) || other.hash == hash) &&
-            (identical(other.source, source) || other.source == source) &&
+            (identical(other.feedId, feedId) || other.feedId == feedId) &&
+            (identical(other.feed, feed) || other.feed == feed) &&
             (identical(other.publishedAt, publishedAt) ||
                 other.publishedAt == publishedAt));
   }
@@ -514,54 +670,59 @@ class _SnNewsArticle implements SnNewsArticle {
       id,
       createdAt,
       updatedAt,
-      const DeepCollectionEquality().hash(deletedAt),
+      deletedAt,
       thumbnail,
       title,
       description,
       content,
       url,
       hash,
-      source,
+      feedId,
+      feed,
       publishedAt);
 
   @override
   String toString() {
-    return 'SnNewsArticle(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, thumbnail: $thumbnail, title: $title, description: $description, content: $content, url: $url, hash: $hash, source: $source, publishedAt: $publishedAt)';
+    return 'SnSubscriptionItem(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, thumbnail: $thumbnail, title: $title, description: $description, content: $content, url: $url, hash: $hash, feedId: $feedId, feed: $feed, publishedAt: $publishedAt)';
   }
 }
 
 /// @nodoc
-abstract mixin class _$SnNewsArticleCopyWith<$Res>
-    implements $SnNewsArticleCopyWith<$Res> {
-  factory _$SnNewsArticleCopyWith(
-          _SnNewsArticle value, $Res Function(_SnNewsArticle) _then) =
-      __$SnNewsArticleCopyWithImpl;
+abstract mixin class _$SnSubscriptionItemCopyWith<$Res>
+    implements $SnSubscriptionItemCopyWith<$Res> {
+  factory _$SnSubscriptionItemCopyWith(
+          _SnSubscriptionItem value, $Res Function(_SnSubscriptionItem) _then) =
+      __$SnSubscriptionItemCopyWithImpl;
   @override
   @useResult
   $Res call(
       {int id,
       DateTime createdAt,
       DateTime updatedAt,
-      dynamic deletedAt,
+      DateTime? deletedAt,
       String thumbnail,
       String title,
       String description,
       String content,
       String url,
       String hash,
-      String source,
+      int feedId,
+      SnSubscriptionFeed feed,
       DateTime? publishedAt});
+
+  @override
+  $SnSubscriptionFeedCopyWith<$Res> get feed;
 }
 
 /// @nodoc
-class __$SnNewsArticleCopyWithImpl<$Res>
-    implements _$SnNewsArticleCopyWith<$Res> {
-  __$SnNewsArticleCopyWithImpl(this._self, this._then);
+class __$SnSubscriptionItemCopyWithImpl<$Res>
+    implements _$SnSubscriptionItemCopyWith<$Res> {
+  __$SnSubscriptionItemCopyWithImpl(this._self, this._then);
 
-  final _SnNewsArticle _self;
-  final $Res Function(_SnNewsArticle) _then;
+  final _SnSubscriptionItem _self;
+  final $Res Function(_SnSubscriptionItem) _then;
 
-  /// Create a copy of SnNewsArticle
+  /// Create a copy of SnSubscriptionItem
   /// with the given fields replaced by the non-null parameter values.
   @override
   @pragma('vm:prefer-inline')
@@ -576,10 +737,11 @@ class __$SnNewsArticleCopyWithImpl<$Res>
     Object? content = null,
     Object? url = null,
     Object? hash = null,
-    Object? source = null,
+    Object? feedId = null,
+    Object? feed = null,
     Object? publishedAt = freezed,
   }) {
-    return _then(_SnNewsArticle(
+    return _then(_SnSubscriptionItem(
       id: null == id
           ? _self.id
           : id // ignore: cast_nullable_to_non_nullable
@@ -595,7 +757,7 @@ class __$SnNewsArticleCopyWithImpl<$Res>
       deletedAt: freezed == deletedAt
           ? _self.deletedAt
           : deletedAt // ignore: cast_nullable_to_non_nullable
-              as dynamic,
+              as DateTime?,
       thumbnail: null == thumbnail
           ? _self.thumbnail
           : thumbnail // ignore: cast_nullable_to_non_nullable
@@ -620,16 +782,30 @@ class __$SnNewsArticleCopyWithImpl<$Res>
           ? _self.hash
           : hash // ignore: cast_nullable_to_non_nullable
               as String,
-      source: null == source
-          ? _self.source
-          : source // ignore: cast_nullable_to_non_nullable
-              as String,
+      feedId: null == feedId
+          ? _self.feedId
+          : feedId // ignore: cast_nullable_to_non_nullable
+              as int,
+      feed: null == feed
+          ? _self.feed
+          : feed // ignore: cast_nullable_to_non_nullable
+              as SnSubscriptionFeed,
       publishedAt: freezed == publishedAt
           ? _self.publishedAt
           : publishedAt // ignore: cast_nullable_to_non_nullable
               as DateTime?,
     ));
   }
+
+  /// Create a copy of SnSubscriptionItem
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $SnSubscriptionFeedCopyWith<$Res> get feed {
+    return $SnSubscriptionFeedCopyWith<$Res>(_self.feed, (value) {
+      return _then(_self.copyWith(feed: value));
+    });
+  }
 }
 
 // dart format on

lib/types/news.g.dart

@@ -6,56 +6,74 @@ part of 'news.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_SnNewsSource _$SnNewsSourceFromJson(Map<String, dynamic> json) =>
-    _SnNewsSource(
-      id: json['id'] as String,
-      label: json['label'] as String,
-      type: json['type'] as String,
-      source: json['source'] as String,
-      depth: (json['depth'] as num).toInt(),
-      enabled: json['enabled'] as bool,
-    );
-
-Map<String, dynamic> _$SnNewsSourceToJson(_SnNewsSource instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'label': instance.label,
-      'type': instance.type,
-      'source': instance.source,
-      'depth': instance.depth,
-      'enabled': instance.enabled,
-    };
-
-_SnNewsArticle _$SnNewsArticleFromJson(Map<String, dynamic> json) =>
-    _SnNewsArticle(
+_SnSubscriptionFeed _$SnSubscriptionFeedFromJson(Map<String, dynamic> json) =>
+    _SnSubscriptionFeed(
       id: (json['id'] as num).toInt(),
       createdAt: DateTime.parse(json['created_at'] as String),
       updatedAt: DateTime.parse(json['updated_at'] as String),
-      deletedAt: json['deleted_at'],
+      deletedAt: json['deleted_at'] == null
+          ? null
+          : DateTime.parse(json['deleted_at'] as String),
+      url: json['url'] as String,
+      isEnabled: json['is_enabled'] as bool,
+      isFullContent: json['is_full_content'] as bool,
+      pullInterval: (json['pull_interval'] as num).toInt(),
+      adapter: json['adapter'] as String,
+      accountId: (json['account_id'] as num?)?.toInt(),
+      lastFetchedAt: json['last_fetched_at'] == null
+          ? null
+          : DateTime.parse(json['last_fetched_at'] as String),
+    );
+
+Map<String, dynamic> _$SnSubscriptionFeedToJson(_SnSubscriptionFeed instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'created_at': instance.createdAt.toIso8601String(),
+      'updated_at': instance.updatedAt.toIso8601String(),
+      'deleted_at': instance.deletedAt?.toIso8601String(),
+      'url': instance.url,
+      'is_enabled': instance.isEnabled,
+      'is_full_content': instance.isFullContent,
+      'pull_interval': instance.pullInterval,
+      'adapter': instance.adapter,
+      'account_id': instance.accountId,
+      'last_fetched_at': instance.lastFetchedAt?.toIso8601String(),
+    };
+
+_SnSubscriptionItem _$SnSubscriptionItemFromJson(Map<String, dynamic> json) =>
+    _SnSubscriptionItem(
+      id: (json['id'] as num).toInt(),
+      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),
       thumbnail: json['thumbnail'] as String,
       title: json['title'] as String,
       description: json['description'] as String,
       content: json['content'] as String,
       url: json['url'] as String,
       hash: json['hash'] as String,
-      source: json['source'] as String,
+      feedId: (json['feed_id'] as num).toInt(),
+      feed: SnSubscriptionFeed.fromJson(json['feed'] as Map<String, dynamic>),
       publishedAt: json['published_at'] == null
           ? null
           : DateTime.parse(json['published_at'] as String),
     );
 
-Map<String, dynamic> _$SnNewsArticleToJson(_SnNewsArticle instance) =>
+Map<String, dynamic> _$SnSubscriptionItemToJson(_SnSubscriptionItem instance) =>
     <String, dynamic>{
       'id': instance.id,
       'created_at': instance.createdAt.toIso8601String(),
       'updated_at': instance.updatedAt.toIso8601String(),
-      'deleted_at': instance.deletedAt,
+      'deleted_at': instance.deletedAt?.toIso8601String(),
       'thumbnail': instance.thumbnail,
       'title': instance.title,
       'description': instance.description,
       'content': instance.content,
       'url': instance.url,
       'hash': instance.hash,
-      'source': instance.source,
+      'feed_id': instance.feedId,
+      'feed': instance.feed.toJson(),
       'published_at': instance.publishedAt?.toIso8601String(),
     };

lib/types/post.dart

@@ -1,4 +1,5 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:surface/types/account.dart';
 import 'package:surface/types/attachment.dart';
 import 'package:surface/types/poll.dart';
 import 'package:surface/types/realm.dart';
@@ -26,6 +27,7 @@ abstract class SnPost with _$SnPost {
     required int? replyId,
     required int? repostId,
     required int? realmId,
+    required SnRealm? realm,
     required SnPost? replyTo,
     required SnPost? repostTo,
     required List<int>? visibleUsersList,
@@ -43,9 +45,9 @@ abstract class SnPost with _$SnPost {
     @Default(0) int totalAggregatedViews,
     required int publisherId,
     required int? pollId,
+    required SnPoll? poll,
     required SnPublisher publisher,
     required SnMetric metric,
-    SnPostPreload? preload,
   }) = _SnPost;
 
   factory SnPost.fromJson(Map<String, Object?> json) => _$SnPostFromJson(json);
@@ -146,6 +148,7 @@ abstract class SnPublisher with _$SnPublisher {
     required int totalDownvote,
     required int? realmId,
     required int accountId,
+    required SnAccount? account,
   }) = _SnPublisher;
 
   factory SnPublisher.fromJson(Map<String, Object?> json) =>
@@ -178,41 +181,3 @@ abstract class SnFeedEntry with _$SnFeedEntry {
   factory SnFeedEntry.fromJson(Map<String, dynamic> json) =>
       _$SnFeedEntryFromJson(json);
 }
-
-@freezed
-abstract class SnFediversePost with _$SnFediversePost {
-  const factory SnFediversePost({
-    required int id,
-    required DateTime createdAt,
-    required DateTime updatedAt,
-    required DateTime? deletedAt,
-    required String identifier,
-    required String origin,
-    required String content,
-    required String language,
-    required List<String> images,
-    required SnFediverseUser user,
-    required int userId,
-  }) = _SnFediversePost;
-
-  factory SnFediversePost.fromJson(Map<String, Object?> json) =>
-      _$SnFediversePostFromJson(json);
-}
-
-@freezed
-abstract class SnFediverseUser with _$SnFediverseUser {
-  const factory SnFediverseUser({
-    required int id,
-    required DateTime createdAt,
-    required DateTime updatedAt,
-    required DateTime? deletedAt,
-    required String identifier,
-    required String origin,
-    required String avatar,
-    required String name,
-    required String nick,
-  }) = _SnFediverseUser;
-
-  factory SnFediverseUser.fromJson(Map<String, dynamic> json) =>
-      _$SnFediverseUserFromJson(json);
-}

lib/types/post.g.dart

@@ -32,6 +32,9 @@ _SnPost _$SnPostFromJson(Map<String, dynamic> json) => _SnPost(
       replyId: (json['reply_id'] as num?)?.toInt(),
       repostId: (json['repost_id'] as num?)?.toInt(),
       realmId: (json['realm_id'] as num?)?.toInt(),
+      realm: json['realm'] == null
+          ? null
+          : SnRealm.fromJson(json['realm'] as Map<String, dynamic>),
       replyTo: json['reply_to'] == null
           ? null
           : SnPost.fromJson(json['reply_to'] as Map<String, dynamic>),
@@ -68,12 +71,12 @@ _SnPost _$SnPostFromJson(Map<String, dynamic> json) => _SnPost(
           (json['total_aggregated_views'] as num?)?.toInt() ?? 0,
       publisherId: (json['publisher_id'] as num).toInt(),
       pollId: (json['poll_id'] as num?)?.toInt(),
+      poll: json['poll'] == null
+          ? null
+          : SnPoll.fromJson(json['poll'] as Map<String, dynamic>),
       publisher:
           SnPublisher.fromJson(json['publisher'] as Map<String, dynamic>),
       metric: SnMetric.fromJson(json['metric'] as Map<String, dynamic>),
-      preload: json['preload'] == null
-          ? null
-          : SnPostPreload.fromJson(json['preload'] as Map<String, dynamic>),
     );
 
 Map<String, dynamic> _$SnPostToJson(_SnPost instance) => <String, dynamic>{
@@ -92,6 +95,7 @@ Map<String, dynamic> _$SnPostToJson(_SnPost instance) => <String, dynamic>{
       'reply_id': instance.replyId,
       'repost_id': instance.repostId,
       'realm_id': instance.realmId,
+      'realm': instance.realm?.toJson(),
       'reply_to': instance.replyTo?.toJson(),
       'repost_to': instance.repostTo?.toJson(),
       'visible_users_list': instance.visibleUsersList,
@@ -109,9 +113,9 @@ Map<String, dynamic> _$SnPostToJson(_SnPost instance) => <String, dynamic>{
       'total_aggregated_views': instance.totalAggregatedViews,
       'publisher_id': instance.publisherId,
       'poll_id': instance.pollId,
+      'poll': instance.poll?.toJson(),
       'publisher': instance.publisher.toJson(),
       'metric': instance.metric.toJson(),
-      'preload': instance.preload?.toJson(),
     };
 
 _SnPostTag _$SnPostTagFromJson(Map<String, dynamic> json) => _SnPostTag(
@@ -241,6 +245,9 @@ _SnPublisher _$SnPublisherFromJson(Map<String, dynamic> json) => _SnPublisher(
       totalDownvote: (json['total_downvote'] as num).toInt(),
       realmId: (json['realm_id'] as num?)?.toInt(),
       accountId: (json['account_id'] as num).toInt(),
+      account: json['account'] == null
+          ? null
+          : SnAccount.fromJson(json['account'] as Map<String, dynamic>),
     );
 
 Map<String, dynamic> _$SnPublisherToJson(_SnPublisher instance) =>
@@ -259,6 +266,7 @@ Map<String, dynamic> _$SnPublisherToJson(_SnPublisher instance) =>
       'total_downvote': instance.totalDownvote,
       'realm_id': instance.realmId,
       'account_id': instance.accountId,
+      'account': instance.account?.toJson(),
     };
 
 _SnSubscription _$SnSubscriptionFromJson(Map<String, dynamic> json) =>
@@ -295,64 +303,3 @@ Map<String, dynamic> _$SnFeedEntryToJson(_SnFeedEntry instance) =>
       'data': instance.data,
       'created_at': instance.createdAt.toIso8601String(),
     };
-
-_SnFediversePost _$SnFediversePostFromJson(Map<String, dynamic> json) =>
-    _SnFediversePost(
-      id: (json['id'] as num).toInt(),
-      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),
-      identifier: json['identifier'] as String,
-      origin: json['origin'] as String,
-      content: json['content'] as String,
-      language: json['language'] as String,
-      images:
-          (json['images'] as List<dynamic>).map((e) => e as String).toList(),
-      user: SnFediverseUser.fromJson(json['user'] as Map<String, dynamic>),
-      userId: (json['user_id'] as num).toInt(),
-    );
-
-Map<String, dynamic> _$SnFediversePostToJson(_SnFediversePost instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'created_at': instance.createdAt.toIso8601String(),
-      'updated_at': instance.updatedAt.toIso8601String(),
-      'deleted_at': instance.deletedAt?.toIso8601String(),
-      'identifier': instance.identifier,
-      'origin': instance.origin,
-      'content': instance.content,
-      'language': instance.language,
-      'images': instance.images,
-      'user': instance.user.toJson(),
-      'user_id': instance.userId,
-    };
-
-_SnFediverseUser _$SnFediverseUserFromJson(Map<String, dynamic> json) =>
-    _SnFediverseUser(
-      id: (json['id'] as num).toInt(),
-      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),
-      identifier: json['identifier'] as String,
-      origin: json['origin'] as String,
-      avatar: json['avatar'] as String,
-      name: json['name'] as String,
-      nick: json['nick'] as String,
-    );
-
-Map<String, dynamic> _$SnFediverseUserToJson(_SnFediverseUser instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'created_at': instance.createdAt.toIso8601String(),
-      'updated_at': instance.updatedAt.toIso8601String(),
-      'deleted_at': instance.deletedAt?.toIso8601String(),
-      'identifier': instance.identifier,
-      'origin': instance.origin,
-      'avatar': instance.avatar,
-      'name': instance.name,
-      'nick': instance.nick,
-    };

lib/types/reaction.dart

@@ -17,4 +17,5 @@ const Map<String, ReactInfo> kTemplateReactions = {
   'party': ReactInfo(icon: '🎉', attitude: 1),
   'joy': ReactInfo(icon: '🤣', attitude: 1),
   'pray': ReactInfo(icon: '🙏', attitude: 1),
+  'heart': ReactInfo(icon: '❤️', attitude: 1),
 };

lib/types/wallet.dart

@@ -11,6 +11,7 @@ abstract class SnWallet with _$SnWallet {
     required DateTime updatedAt,
     required DateTime? deletedAt,
     required String balance,
+    required String goldenBalance,
     required String password,
     required int accountId,
   }) = _SnWallet;
@@ -27,6 +28,7 @@ abstract class SnTransaction with _$SnTransaction {
     required DateTime? deletedAt,
     required String remark,
     required String amount,
+    required String currency,
     required SnWallet? payer,
     required SnWallet? payee,
     required int? payerId,