🚀 Launch 3.0.0+109

🐛 bunch of bugs fixes

.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: Build Release
 on:
   push:
     tags:
-      - '*'
+      - "*"
   workflow_dispatch:
 
 jobs:
@@ -59,6 +59,7 @@ jobs:
           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
+          sudo apt-get install -y libsecret-1
       - run: flutter pub get
       - run: flutter build linux
       - name: Archive production artifacts
@@ -80,4 +81,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: build-output-linux-appimage
-          path: './*.AppImage*'
+          path: "./*.AppImage*"

android/app/build.gradle.kts

@@ -1,3 +1,6 @@
+import java.util.Properties
+import java.io.FileInputStream
+
 plugins {
     id("com.android.application")
     // START: FlutterFire Configuration
@@ -8,6 +11,12 @@ plugins {
     id("dev.flutter.flutter-gradle-plugin")
 }
 
+val keystoreProperties = Properties()
+val keystorePropertiesFile = rootProject.file("key.properties")
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(FileInputStream(keystorePropertiesFile))
+}
+
 android {
     namespace = "dev.solsynth.solian"
     compileSdk = flutter.compileSdkVersion
@@ -31,23 +40,28 @@ android {
     }
 
     signingConfigs {
-        release {
-            keyAlias = keystoreProperties['keyAlias']
-            keyPassword = keystoreProperties['keyPassword']
-            storeFile = keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
-            storePassword = keystoreProperties['storePassword']
+        create("release") {
+            keyAlias = keystoreProperties["keyAlias"] as String
+            keyPassword = keystoreProperties["keyPassword"] as String
+            storeFile = keystoreProperties["storeFile"]?.let { file(it) }
+            storePassword = keystoreProperties["storePassword"] as String
         }
     }
 
     buildTypes {
         release {
             signingConfig = signingConfigs.getByName("release")
-            minifyEnabled = true
-            shrinkResources = true
         }
     }
 }
 
+dependencies {
+    implementation("com.google.android.material:material:1.12.0")
+    implementation("com.github.bumptech.glide:glide:4.16.0")
+    implementation("com.squareup.okhttp3:okhttp:4.12.0")
+    implementation("com.google.firebase:firebase-messaging-ktx")
+}
+
 flutter {
     source = "../.."
 }

android/app/src/main/AndroidManifest.xml

@@ -23,7 +23,7 @@
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:launchMode="singleInstance"
+            android:launchMode="singleTask"
             android:taskAffinity=""
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
@@ -41,6 +41,43 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            
+            <!-- Share Intent Filters -->
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="image/*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND_MULTIPLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="image/*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="video/*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND_MULTIPLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="video/*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="application/*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND_MULTIPLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="application/*" />
+            </intent-filter>
         </activity>
 
         <!-- Sign in with Apple -->
@@ -58,6 +95,19 @@
             </intent-filter>
         </activity>
 
+        <receiver
+            android:name=".receiver.ReplyReceiver"
+            android:enabled="true"
+            android:exported="true" />
+
+        <service
+            android:name=".service.MessagingService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="dev.solsynth.solian.provider"

android/app/src/main/kotlin/com/example/solian/MainActivity.kt

@@ -1,14 +0,0 @@
-package dev.solsynth.solian
-
-import io.flutter.embedding.android.FlutterActivity
-import io.flutter.embedding.engine.FlutterEngine
-import io.flutter.plugins.sharedpreferences.LegacySharedPreferencesPlugin
-
-class MainActivity : FlutterActivity()
-{
-    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
-        super.configureFlutterEngine(flutterEngine)
-        // https://github.com/flutter/flutter/issues/153075#issuecomment-2693189362
-        flutterEngine.plugins.add(LegacySharedPreferencesPlugin())
-    }
-}

android/app/src/main/kotlin/dev/solsynth/solian/MainActivity.kt

@@ -0,0 +1,39 @@
+package dev.solsynth.solian
+
+import android.content.Intent
+import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.engine.FlutterEngine
+import io.flutter.plugin.common.MethodChannel
+import io.flutter.plugins.sharedpreferences.LegacySharedPreferencesPlugin
+
+class MainActivity : FlutterActivity()
+{
+    private val CHANNEL = "dev.solsynth.solian/notifications"
+
+    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
+        super.configureFlutterEngine(flutterEngine)
+        // https://github.com/flutter/flutter/issues/153075#issuecomment-2693189362
+        flutterEngine.plugins.add(LegacySharedPreferencesPlugin())
+
+        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL).setMethodCallHandler { call, result ->
+            if (call.method == "initialLink") {
+                val roomId = intent.getStringExtra("room_id")
+                if (roomId != null) {
+                    result.success("/rooms/$roomId")
+                } else {
+                    result.success(null)
+                }
+            } else {
+                result.notImplemented()
+            }
+        }
+    }
+
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        val roomId = intent.getStringExtra("room_id")
+        if (roomId != null) {
+            MethodChannel(flutterEngine!!.dartExecutor.binaryMessenger, CHANNEL).invokeMethod("newLink", "/rooms/$roomId")
+        }
+    }
+}

android/app/src/main/kotlin/dev/solsynth/solian/network/ApiClient.kt

@@ -0,0 +1,47 @@
+package dev.solsynth.solian.network
+
+import android.content.Context
+import android.content.SharedPreferences
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
+import okhttp3.Response
+import org.json.JSONObject
+import java.io.IOException
+
+class ApiClient(private val context: Context) {
+    private val client = OkHttpClient()
+    private val sharedPreferences: SharedPreferences = context.getSharedPreferences("FlutterSharedPreferences", Context.MODE_PRIVATE)
+
+    fun sendMessage(roomId: String, message: String, replyTo: String, callback: (Boolean) -> Unit) {
+        val token = sharedPreferences.getString("flutter.token", null)
+        if (token == null) {
+            callback(false)
+            return
+        }
+
+        val json = JSONObject().apply {
+            put("content", message)
+            put("reply_to", replyTo)
+        }
+        val body = json.toString().toRequestBody("application/json; charset=utf-8".toMediaType())
+        val request = Request.Builder()
+            .url("https://solian.dev/api/rooms/$roomId/messages")
+            .header("Authorization", "Bearer $token")
+            .post(body)
+            .build()
+
+        client.newCall(request).enqueue(object : Callback {
+            override fun onFailure(call: Call, e: IOException) {
+                callback(false)
+            }
+
+            override fun onResponse(call: Call, response: Response) {
+                callback(response.isSuccessful)
+            }
+        })
+    }
+}

android/app/src/main/kotlin/dev/solsynth/solian/receiver/ReplyReceiver.kt

@@ -0,0 +1,27 @@
+package dev.solsynth.solian.receiver
+
+import android.app.NotificationManager
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import androidx.core.app.RemoteInput
+import dev.solsynth.solian.network.ApiClient
+
+class ReplyReceiver : BroadcastReceiver() {
+    override fun onReceive(context: Context, intent: Intent) {
+        val remoteInput = RemoteInput.getResultsFromIntent(intent)
+        if (remoteInput != null) {
+            val replyText = remoteInput.getCharSequence("key_text_reply").toString()
+            val roomId = intent.getStringExtra("room_id")
+            val messageId = intent.getStringExtra("message_id")
+            val notificationId = intent.getIntExtra("notification_id", 0)
+
+            if (roomId != null && messageId != null) {
+                ApiClient(context).sendMessage(roomId, replyText, messageId) {
+                    val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+                    notificationManager.cancel(notificationId)
+                }
+            }
+        }
+    }
+}

android/app/src/main/kotlin/dev/solsynth/solian/service/MessagingService.kt

@@ -0,0 +1,102 @@
+package dev.solsynth.solian.service
+
+import android.app.PendingIntent
+import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
+import android.os.Build
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.RemoteInput
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.target.CustomTarget
+import com.bumptech.glide.request.transition.Transition
+import com.google.firebase.messaging.FirebaseMessagingService
+import com.google.firebase.messaging.RemoteMessage
+import dev.solsynth.solian.MainActivity
+import dev.solsynth.solian.receiver.ReplyReceiver
+import org.json.JSONObject
+
+class MessagingService: FirebaseMessagingService() {
+    override fun onMessageReceived(remoteMessage: RemoteMessage) {
+        val type = remoteMessage.data["type"]
+        if (type == "messages.new") {
+            handleMessageNotification(remoteMessage)
+        } else {
+            // Handle other notification types
+        }
+    }
+
+    private fun handleMessageNotification(remoteMessage: RemoteMessage) {
+        val data = remoteMessage.data
+        val metaString = data["meta"] ?: return
+        val meta = JSONObject(metaString)
+
+        val pfp = meta.optString("pfp", null)
+        val roomId = meta.optString("room_id", null)
+        val messageId = meta.optString("message_id", null)
+
+        val notificationId = System.currentTimeMillis().toInt()
+
+        val replyLabel = "Reply"
+        val remoteInput = RemoteInput.Builder("key_text_reply")
+            .setLabel(replyLabel)
+            .build()
+
+        val replyIntent = Intent(this, ReplyReceiver::class.java).apply {
+            putExtra("room_id", roomId)
+            putExtra("message_id", messageId)
+            putExtra("notification_id", notificationId)
+        }
+
+        val pendingIntentFlags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        } else {
+            PendingIntent.FLAG_UPDATE_CURRENT
+        }
+
+        val replyPendingIntent = PendingIntent.getBroadcast(
+            applicationContext,
+            notificationId,
+            replyIntent,
+            pendingIntentFlags
+        )
+
+        val action = NotificationCompat.Action.Builder(
+            android.R.drawable.ic_menu_send,
+            replyLabel,
+            replyPendingIntent
+        )
+            .addRemoteInput(remoteInput)
+            .build()
+
+        val intent = Intent(this, MainActivity::class.java)
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+        intent.putExtra("room_id", roomId)
+        val pendingIntent = PendingIntent.getActivity(this, 0, intent, pendingIntentFlags)
+
+        val notificationBuilder = NotificationCompat.Builder(this, "messages")
+            .setSmallIcon(android.R.drawable.ic_dialog_info)
+            .setContentTitle(remoteMessage.notification?.title)
+            .setContentText(remoteMessage.notification?.body)
+            .setPriority(NotificationCompat.PRIORITY_HIGH)
+            .setContentIntent(pendingIntent)
+            .addAction(action)
+
+        if (pfp != null) {
+            Glide.with(applicationContext)
+                .asBitmap()
+                .load(pfp)
+                .into(object : CustomTarget<Bitmap>() {
+                    override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>?) {
+                        notificationBuilder.setLargeIcon(resource)
+                        NotificationManagerCompat.from(applicationContext).notify(notificationId, notificationBuilder.build())
+                    }
+
+                    override fun onLoadCleared(placeholder: Drawable?) {}
+                })
+        } else {
+            NotificationManagerCompat.from(this).notify(notificationId, notificationBuilder.build())
+        }
+    }
+}

android/app/src/main/res/values-night/styles.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
-    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+    <style name="LaunchTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
@@ -16,7 +16,7 @@
          running.
 
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
-    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+    <style name="NormalTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
 </resources>

android/app/src/main/res/values/styles.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
-    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+    <style name="LaunchTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
@@ -16,7 +16,7 @@
          running.
 
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
-    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+    <style name="NormalTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
 </resources>

assets/i18n/en-US.json

@@ -48,6 +48,28 @@
   "deletePublisherHint": "Are you sure to delete this publisher? This will also deleted all the post and collections under this publisher.",
   "somethingWentWrong": "Something went wrong...",
   "deletePost": "Delete Post",
+  "safetyReport": "Report",
+  "safetyReportTitle": "Safety Report",
+  "safetyReportDescription": "Help us keep the community safe by reporting inappropriate content or behavior.",
+  "safetyReportType": "Report Type",
+  "safetyReportReason": "Additional Details",
+  "safetyReportReasonHint": "Please provide more details about the issue...",
+  "safetyReportSubmit": "Submit Report",
+  "safetyReportSubmitting": "Submitting...",
+  "safetyReportSuccess": "Report submitted successfully. Thank you for helping keep our community safe.",
+  "safetyReportError": "Failed to submit report. Please try again.",
+  "safetyReportReasonRequired": "Please provide details about the issue",
+  "safetyReportTypeSpam": "Spam or Misleading",
+  "safetyReportTypeHarassment": "Harassment or Abuse",
+  "safetyReportTypeHateSpeech": "Hate Speech",
+  "safetyReportTypeViolence": "Violence or Threats",
+  "safetyReportTypeAdultContent": "Adult Content",
+  "safetyReportTypeIntellectualProperty": "Intellectual Property Violation",
+  "safetyReportTypeOther": "Other",
+  "safetyReportTypeInappropriate": "Inappropriate Content",
+  "safetyReportTypeCopyright": "Copyright Violation",
+  "safetyReportSuccessTitle": "Report Submitted",
+  "safetyReportErrorTitle": "Error",
   "deletePostHint": "Are you sure to delete this post?",
   "copyLink": "Copy Link",
   "postCreateAccountTitle": "Thanks for joining!",
@@ -76,6 +98,8 @@
   "explore": "Explore",
   "exploreFilterSubscriptions": "Subscriptions",
   "exploreFilterFriends": "Friends",
+  "discover": "Discover",
+  "joinRealm": "Join Realm",
   "account": "Account",
   "name": "Name",
   "slug": "Slug",
@@ -383,15 +407,15 @@
   "lastActiveAt": "Last active at {}",
   "authDeviceLogout": "Logout",
   "authDeviceLogoutHint": "Are you sure you want to logout this device? This will also disable the push notification to this device.",
+  "typingHint": {
+    "one": "{} is typing...",
+    "other": "{} are typing..."
+  },
   "authDeviceEditLabel": "Edit Label",
   "authDeviceLabelTitle": "Edit Device Label",
   "authDeviceLabelHint": "Enter a name for this device",
   "authDeviceSwipeEditHint": "Swipe left to edit label",
   "authDeviceSwipeLogoutHint": "Swipe right to logout device",
-  "typingHint": {
-    "one": "{} is typing...",
-    "other": "{} are typing..."
-  },
   "settingsAppearance": "Appearance",
   "settingsServer": "Server",
   "settingsBehavior": "Behavior",
@@ -410,6 +434,8 @@
   "articleDrafts": "Article drafts",
   "postDrafts": "Post drafts",
   "saveDraft": "Save draft",
+  "draftSaved": "Draft saved",
+  "draftSaveFailed": "Failed to save draft",
   "clearAllDrafts": "Clear All Drafts",
   "clearAllDraftsConfirm": "Are you sure you want to delete all drafts? This action cannot be undone.",
   "clearAll": "Clear All",
@@ -441,6 +467,7 @@
   "contactMethodDelete": "Delete Contact",
   "contactMethodNew": "New Contact Method",
   "contactMethodContentEmpty": "Contact content cannot be empty",
+  "postContentEmpty": "Post content cannot be empty",
   "contactMethodVerificationSent": "Verification code sent to your contact method",
   "contactMethodVerificationNeeded": "The contact method is added, but not verified yet. You can verify it by tapping it and select verify.",
   "accountContactMethod": "Contact Methods",
@@ -540,5 +567,67 @@
   "orderId": "Order ID",
   "enterOrderId": "Enter your order ID",
   "restore": "Restore",
-  "keyboardShortcuts": "Keyboard Shortcuts"
+  "keyboardShortcuts": "Keyboard Shortcuts",
+  "share": "Share",
+  "sharePost": "Share Post",
+  "quickActions": "Quick Actions",
+  "post": "Post",
+  "copy": "Copy",
+  "sendToChat": "Send to Chat",
+  "failedToShareToPost": "Failed to share to post: {}",
+  "shareToChatComingSoon": "Share to chat functionality coming soon",
+  "failedToShareToChat": "Failed to share to chat: {}",
+  "shareToSpecificChatComingSoon": "Share to {} coming soon",
+  "directChat": "Direct Chat",
+  "systemShareComingSoon": "System share functionality coming soon",
+  "failedToShareToSystem": "Failed to share to system: {}",
+  "failedToCopy": "Failed to copy: {}",
+  "noChatRoomsAvailable": "No chat rooms available",
+  "failedToLoadChats": "Failed to load chats",
+  "contentToShare": "Content to share:",
+  "unknownChat": "Unknown Chat",
+  "addAdditionalMessage": "Add additional message...",
+  "uploadingFiles": "Uploading files...",
+  "sharedSuccessfully": "Shared successfully!",
+  "shareSuccess": "Shared successfully!",
+  "shareToSpecificChatSuccess": "Shared to {} successfully!",
+  "wouldYouLikeToGoToChat": "Would you like to go to the chat?",
+  "no": "No",
+  "yes": "Yes",
+  "navigateToChat": "Navigate to Chat",
+  "wouldYouLikeToNavigateToChat": "Would you like to navigate to the chat?",
+  "abuseReport": "Report",
+  "abuseReportTitle": "Report Content",
+  "abuseReportDescription": "Help us keep the community safe by reporting inappropriate content or behavior.",
+  "abuseReportType": "Report Type",
+  "abuseReportReason": "Additional Details",
+  "abuseReportReasonHint": "Please provide more details about the issue...",
+  "abuseReportSubmit": "Submit Report",
+  "abuseReportSuccess": "Report submitted successfully. Thank you for helping keep our community safe.",
+  "abuseReportError": "Failed to submit report. Please try again.",
+  "abuseReportReasonRequired": "Please provide details about the issue",
+  "abuseReportSuccessTitle": "Report Submitted",
+  "abuseReportErrorTitle": "Error",
+  "abuseReportTypeSpam": "Spam or Misleading",
+  "abuseReportTypeHarassment": "Harassment or Abuse",
+  "abuseReportTypeInappropriate": "Inappropriate Content",
+  "abuseReportTypeViolence": "Violence or Threats",
+  "abuseReportTypeCopyright": "Copyright Violation",
+  "abuseReportTypeImpersonation": "Impersonation",
+  "abuseReportTypeOffensiveContent": "Offensive Content",
+  "abuseReportTypePrivacyViolation": "Privacy Violation",
+  "abuseReportTypeIllegalContent": "Illegal Content",
+  "abuseReportTypeOther": "Other",
+  "tags": "Tags",
+  "tagsHint": "Enter tags, separated by commas",
+  "categories": "Categories",
+  "categoriesHint": "Enter categories, separated by commas",
+  "chatNotJoined": "You have not joined this chat yet.",
+  "chatUnableJoin": "You can't join this chat due to it's access control settings.",
+  "chatJoin": "Join the Chat",
+  "realmJoin": "Join the Realm",
+  "realmJoinSuccess": "Successfully joined the realm.",
+  "discoverRealms": "Discover Realms",
+  "discoverPublishers": "Discover Publishers",
+  "search": "Search"
 }

assets/i18n/zh-CN.json

@@ -319,5 +319,38 @@
   "processingPayment": "处理付款中...",
   "pleaseWait": "请稍候",
   "paymentFailed": "付款失败，请重试。",
-  "paymentSuccess": "付款成功完成！"
+  "paymentSuccess": "付款成功完成！",
+  "drafts": "草稿",
+  "noDrafts": "暂无草稿",
+  "articleDrafts": "文章草稿",
+  "postDrafts": "帖子草稿",
+  "saveDraft": "保存草稿",
+  "draftSaved": "草稿已保存",
+  "draftSaveFailed": "保存草稿失败",
+  "clearAllDrafts": "清空所有草稿",
+  "clearAllDraftsConfirm": "确定要删除所有草稿吗？此操作无法撤销。",
+  "clearAll": "清空全部",
+  "untitled": "无标题",
+  "noContent": "无内容",
+  "justNow": "刚刚",
+  "minutesAgo": "{} 分钟前",
+  "hoursAgo": "{} 小时前",
+  "postContentEmpty": "帖子内容不能为空",
+  "share": "分享",
+  "quickActions": "快捷操作",
+  "post": "帖子",
+  "copy": "复制",
+  "sendToChat": "发送到聊天",
+  "failedToShareToPost": "分享到帖子失败：{}",
+  "shareToChatComingSoon": "聊天分享功能即将推出",
+  "failedToShareToChat": "分享到聊天失败：{}",
+  "shareToSpecificChatComingSoon": "分享到 {} 即将推出",
+  "directChat": "私聊",
+  "systemShareComingSoon": "系统分享功能即将推出",
+  "failedToShareToSystem": "系统分享失败：{}",
+  "copiedToClipboard": "已复制到剪贴板",
+  "failedToCopy": "复制失败：{}",
+  "noChatRoomsAvailable": "没有可用的聊天室",
+  "failedToLoadChats": "加载聊天失败",
+  "unknownChat": "未知聊天"
 }

assets/i18n/zh-TW.json

@@ -334,5 +334,38 @@
   "membershipFeatureAllNova": "所有新星功能",
   "membershipFeatureExclusiveContent": "獨家內容",
   "membershipFeatureVipSupport": "VIP 支援",
-  "membershipCurrentBadge": "目前"
+  "membershipCurrentBadge": "目前",
+  "drafts": "草稿",
+  "noDrafts": "暫無草稿",
+  "articleDrafts": "文章草稿",
+  "postDrafts": "貼文草稿",
+  "saveDraft": "儲存草稿",
+  "draftSaved": "草稿已儲存",
+  "draftSaveFailed": "儲存草稿失敗",
+  "clearAllDrafts": "清空所有草稿",
+  "clearAllDraftsConfirm": "確定要刪除所有草稿嗎？此操作無法復原。",
+  "clearAll": "清空全部",
+  "untitled": "無標題",
+  "noContent": "無內容",
+  "justNow": "剛剛",
+  "minutesAgo": "{} 分鐘前",
+  "hoursAgo": "{} 小時前",
+  "postContentEmpty": "貼文內容不能為空",
+  "share": "分享",
+  "quickActions": "快速操作",
+  "post": "貼文",
+  "copy": "複製",
+  "sendToChat": "傳送到聊天",
+  "failedToShareToPost": "分享到貼文失敗：{}",
+  "shareToChatComingSoon": "聊天分享功能即將推出",
+  "failedToShareToChat": "分享到聊天失敗：{}",
+  "shareToSpecificChatComingSoon": "分享到 {} 即將推出",
+  "directChat": "私人聊天",
+  "systemShareComingSoon": "系統分享功能即將推出",
+  "failedToShareToSystem": "系統分享失敗：{}",
+  "copiedToClipboard": "已複製到剪貼簿",
+  "failedToCopy": "複製失敗：{}",
+  "noChatRoomsAvailable": "沒有可用的聊天室",
+  "failedToLoadChats": "載入聊天失敗",
+  "unknownChat": "未知聊天"
 }

crowdin.yml

@@ -0,0 +1,2 @@
+bundles:
+  - 6

ios/Podfile

@@ -44,6 +44,10 @@ target 'Runner' do
     pod 'Kingfisher', '~> 8.0'
     pod 'Alamofire'
   end
+
+  target 'SolianShareExtension' do
+    inherit! :search_paths
+  end
 end
 
 post_install do |installer|

ios/Podfile.lock

@@ -84,7 +84,7 @@ PODS:
     - Flutter
   - flutter_platform_alert (0.0.1):
     - Flutter
-  - flutter_secure_storage (3.3.1):
+  - flutter_secure_storage (6.0.0):
     - Flutter
   - flutter_timezone (0.0.1):
     - Flutter
@@ -156,12 +156,16 @@ PODS:
     - Flutter
     - FlutterMacOS
   - PromisesObjC (2.4.0)
+  - receive_sharing_intent (1.8.1):
+    - Flutter
   - record_ios (1.0.0):
     - Flutter
   - SAMKeychain (1.5.3)
   - SDWebImage (5.21.1):
     - SDWebImage/Core (= 5.21.1)
   - SDWebImage/Core (5.21.1)
+  - share_plus (0.0.1):
+    - Flutter
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -231,7 +235,9 @@ DEPENDENCIES:
   - 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`)
+  - receive_sharing_intent (from `.symlinks/plugins/receive_sharing_intent/ios`)
   - record_ios (from `.symlinks/plugins/record_ios/ios`)
+  - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - sign_in_with_apple (from `.symlinks/plugins/sign_in_with_apple/ios`)
   - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
@@ -314,8 +320,12 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/pasteboard/ios"
   path_provider_foundation:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
+  receive_sharing_intent:
+    :path: ".symlinks/plugins/receive_sharing_intent/ios"
   record_ios:
     :path: ".symlinks/plugins/record_ios/ios"
+  share_plus:
+    :path: ".symlinks/plugins/share_plus/ios"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   sign_in_with_apple:
@@ -352,7 +362,7 @@ SPEC CHECKSUMS:
   flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
   flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
   flutter_platform_alert: bf3b5fcd4ac14bd637e20527e9c471633071afd3
-  flutter_secure_storage: 50035aef357c5a8bdd67fd6bc81370d46efc4d16
+  flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
   flutter_timezone: 7c838e17ffd4645d261e87037e5bebf6d38fe544
   flutter_udid: f7c3884e6ec2951efe4f9de082257fc77c4d15e9
   flutter_webrtc: fd0d3bdef8766a0736dbbe2e5b7e85f1f3c52117
@@ -373,9 +383,11 @@ SPEC CHECKSUMS:
   pasteboard: 49088aeb6119d51f976a421db60d8e1ab079b63c
   path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
+  receive_sharing_intent: 222384f00ffe7e952bbfabaa9e3967cb87e5fe00
   record_ios: fee1c924aa4879b882ebca2b4bce6011bcfc3d8b
   SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
   SDWebImage: f29024626962457f3470184232766516dee8dfea
+  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
   shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
   sign_in_with_apple: c5dcc141574c8c54d5ac99dd2163c0c72ad22418
   sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
@@ -388,6 +400,6 @@ SPEC CHECKSUMS:
   wakelock_plus: e29112ab3ef0b318e58cfa5c32326458be66b556
   WebRTC-SDK: dff00a3892bc570b6014e046297782084071657e
 
-PODFILE CHECKSUM: 0c13198c20d0416ef589aeb2e1dac5c50262254f
+PODFILE CHECKSUM: f6df17c2a0cbd7af89692fd3877231eaea40230f
 
 COCOAPODS: 1.16.2

ios/Runner.xcodeproj/project.pbxproj

@@ -10,6 +10,7 @@
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
+		73C305D82E0BE878009035B9 /* SolianShareExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 73C305CE2E0BE878009035B9 /* SolianShareExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		73CDD6812DEC00480059D95D /* SolianNotificationService.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 73CDD67A2DEC00480059D95D /* SolianNotificationService.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		73D4264B2DEB815D006C0AAE /* NotifyDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73D4264A2DEB815D006C0AAE /* NotifyDelegate.swift */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
@@ -18,6 +19,7 @@
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
 		B87C0E607033790E71B54D73 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6D834CA86410B09796B312B /* Pods_Runner.framework */; };
+		D174D53FF3E8EA943491A5CC /* Pods_SolianShareExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B40764A2C4CC0E7DC70A0D3 /* Pods_SolianShareExtension.framework */; };
 		D1772CE196985AE8E8C9F2E5 /* Pods_SolianNotificationService.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 39FE4CC6223F0D3C0E1FFD04 /* Pods_SolianNotificationService.framework */; };
 		E7A0B456EF7AAA71D1397081 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9AE244813FCDFAA941430393 /* GoogleService-Info.plist */; };
 /* End PBXBuildFile section */
@@ -30,6 +32,13 @@
 			remoteGlobalIDString = 97C146ED1CF9000F007C117D;
 			remoteInfo = Runner;
 		};
+		73C305D62E0BE878009035B9 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 97C146E61CF9000F007C117D /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 73C305CD2E0BE878009035B9;
+			remoteInfo = SolianShareExtension;
+		};
 		73CDD67F2DEC00480059D95D /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 97C146E61CF9000F007C117D /* Project object */;
@@ -46,6 +55,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 13;
 			files = (
+				73C305D82E0BE878009035B9 /* SolianShareExtension.appex in Embed Foundation Extensions */,
 				73CDD6812DEC00480059D95D /* SolianNotificationService.appex in Embed Foundation Extensions */,
 			);
 			name = "Embed Foundation Extensions";
@@ -68,9 +78,11 @@
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
 		14DFD79BE7C26E51B117583C /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
+		17FAB080A9C53193ABD9C15B /* Pods-SolianShareExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SolianShareExtension.debug.xcconfig"; path = "Target Support Files/Pods-SolianShareExtension/Pods-SolianShareExtension.debug.xcconfig"; sourceTree = "<group>"; };
 		192FDACE67D7CB6AED15C634 /* Pods-NotificationService.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NotificationService.debug.xcconfig"; path = "Target Support Files/Pods-NotificationService/Pods-NotificationService.debug.xcconfig"; sourceTree = "<group>"; };
 		1C14F71D23E4371602065522 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		252A83CE6862573BB856ED8E /* Pods-NotificationService.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NotificationService.release.xcconfig"; path = "Target Support Files/Pods-NotificationService/Pods-NotificationService.release.xcconfig"; sourceTree = "<group>"; };
+		27C66EFB5A705F1A822C3EB0 /* Pods-SolianShareExtension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SolianShareExtension.release.xcconfig"; path = "Target Support Files/Pods-SolianShareExtension/Pods-SolianShareExtension.release.xcconfig"; sourceTree = "<group>"; };
 		29812C17FFBE7DBBC7203981 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		2D2457F8B2E6EF9C0F935035 /* Pods-NotificationService.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NotificationService.profile.xcconfig"; path = "Target Support Files/Pods-NotificationService/Pods-NotificationService.profile.xcconfig"; sourceTree = "<group>"; };
 		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
@@ -79,11 +91,13 @@
 		3A1C47BD29CC6AC2587D4DBE /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		737E920B2DB6A9FF00BE9CDB /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
+		73C305CE2E0BE878009035B9 /* SolianShareExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = SolianShareExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		73CDD67A2DEC00480059D95D /* SolianNotificationService.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = SolianNotificationService.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		73D4264A2DEB815D006C0AAE /* NotifyDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotifyDelegate.swift; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
+		7B40764A2C4CC0E7DC70A0D3 /* Pods_SolianShareExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SolianShareExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		8B40620B1EEBB09456406A3C /* Pods-SolianNotificationService.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SolianNotificationService.profile.xcconfig"; path = "Target Support Files/Pods-SolianNotificationService/Pods-SolianNotificationService.profile.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
@@ -94,6 +108,7 @@
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		9AE244813FCDFAA941430393 /* GoogleService-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Runner/GoogleService-Info.plist"; sourceTree = "<group>"; };
 		A499FDB2082EB000933AA8C5 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		A85FF612AE7623A9934E57CE /* Pods-SolianShareExtension.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SolianShareExtension.profile.xcconfig"; path = "Target Support Files/Pods-SolianShareExtension/Pods-SolianShareExtension.profile.xcconfig"; sourceTree = "<group>"; };
 		AA0CA8A3E15DEE023BB27438 /* Pods_NotificationService.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NotificationService.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B93771F2A63E4148DC6142F7 /* Pods-SolianNotificationService.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SolianNotificationService.release.xcconfig"; path = "Target Support Files/Pods-SolianNotificationService/Pods-SolianNotificationService.release.xcconfig"; sourceTree = "<group>"; };
 		E6B10A9A85BECA2E576C91FF /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
@@ -102,6 +117,13 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
+		73C305DC2E0BE878009035B9 /* Exceptions for "SolianShareExtension" folder in "SolianShareExtension" target */ = {
+			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
+			membershipExceptions = (
+				Info.plist,
+			);
+			target = 73C305CD2E0BE878009035B9 /* SolianShareExtension */;
+		};
 		73CDD6822DEC00480059D95D /* Exceptions for "SolianNotificationService" folder in "SolianNotificationService" target */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
@@ -128,6 +150,14 @@
 			path = Services;
 			sourceTree = "<group>";
 		};
+		73C305CF2E0BE878009035B9 /* SolianShareExtension */ = {
+			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+				73C305DC2E0BE878009035B9 /* Exceptions for "SolianShareExtension" folder in "SolianShareExtension" target */,
+			);
+			path = SolianShareExtension;
+			sourceTree = "<group>";
+		};
 		73CDD67B2DEC00480059D95D /* SolianNotificationService */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
 			exceptions = (
@@ -147,6 +177,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		73C305CB2E0BE878009035B9 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				D174D53FF3E8EA943491A5CC /* Pods_SolianShareExtension.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		73CDD6772DEC00480059D95D /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -181,6 +219,7 @@
 				29812C17FFBE7DBBC7203981 /* Pods_RunnerTests.framework */,
 				AA0CA8A3E15DEE023BB27438 /* Pods_NotificationService.framework */,
 				39FE4CC6223F0D3C0E1FFD04 /* Pods_SolianNotificationService.framework */,
+				7B40764A2C4CC0E7DC70A0D3 /* Pods_SolianShareExtension.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -200,6 +239,9 @@
 				F830F535CB92E3F2E1653A11 /* Pods-SolianNotificationService.debug.xcconfig */,
 				B93771F2A63E4148DC6142F7 /* Pods-SolianNotificationService.release.xcconfig */,
 				8B40620B1EEBB09456406A3C /* Pods-SolianNotificationService.profile.xcconfig */,
+				17FAB080A9C53193ABD9C15B /* Pods-SolianShareExtension.debug.xcconfig */,
+				27C66EFB5A705F1A822C3EB0 /* Pods-SolianShareExtension.release.xcconfig */,
+				A85FF612AE7623A9934E57CE /* Pods-SolianShareExtension.profile.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -221,6 +263,7 @@
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
 				73CDD67B2DEC00480059D95D /* SolianNotificationService */,
+				73C305CF2E0BE878009035B9 /* SolianShareExtension */,
 				97C146EF1CF9000F007C117D /* Products */,
 				331C8082294A63A400263BE5 /* RunnerTests */,
 				91E124CE95BCB4DCD890160D /* Pods */,
@@ -235,6 +278,7 @@
 				97C146EE1CF9000F007C117D /* Runner.app */,
 				331C8081294A63A400263BE5 /* RunnerTests.xctest */,
 				73CDD67A2DEC00480059D95D /* SolianNotificationService.appex */,
+				73C305CE2E0BE878009035B9 /* SolianShareExtension.appex */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -279,6 +323,27 @@
 			productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
+		73C305CD2E0BE878009035B9 /* SolianShareExtension */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 73C305DD2E0BE878009035B9 /* Build configuration list for PBXNativeTarget "SolianShareExtension" */;
+			buildPhases = (
+				67E069E457308C73A1C44EF4 /* [CP] Check Pods Manifest.lock */,
+				73C305CA2E0BE878009035B9 /* Sources */,
+				73C305CB2E0BE878009035B9 /* Frameworks */,
+				73C305CC2E0BE878009035B9 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			fileSystemSynchronizedGroups = (
+				73C305CF2E0BE878009035B9 /* SolianShareExtension */,
+			);
+			name = SolianShareExtension;
+			productName = SolianShareExtension;
+			productReference = 73C305CE2E0BE878009035B9 /* SolianShareExtension.appex */;
+			productType = "com.apple.product-type.app-extension";
+		};
 		73CDD6792DEC00480059D95D /* SolianNotificationService */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 73CDD6832DEC00480059D95D /* Build configuration list for PBXNativeTarget "SolianNotificationService" */;
@@ -319,6 +384,7 @@
 			);
 			dependencies = (
 				73CDD6802DEC00480059D95D /* PBXTargetDependency */,
+				73C305D72E0BE878009035B9 /* PBXTargetDependency */,
 			);
 			fileSystemSynchronizedGroups = (
 				73268D272DEB012A0076E970 /* Services */,
@@ -343,6 +409,9 @@
 						CreatedOnToolsVersion = 14.0;
 						TestTargetID = 97C146ED1CF9000F007C117D;
 					};
+					73C305CD2E0BE878009035B9 = {
+						CreatedOnToolsVersion = 16.4;
+					};
 					73CDD6792DEC00480059D95D = {
 						CreatedOnToolsVersion = 16.4;
 					};
@@ -368,6 +437,7 @@
 				97C146ED1CF9000F007C117D /* Runner */,
 				331C8080294A63A400263BE5 /* RunnerTests */,
 				73CDD6792DEC00480059D95D /* SolianNotificationService */,
+				73C305CD2E0BE878009035B9 /* SolianShareExtension */,
 			);
 		};
 /* End PBXProject section */
@@ -380,6 +450,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		73C305CC2E0BE878009035B9 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		73CDD6782DEC00480059D95D /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -479,6 +556,28 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		67E069E457308C73A1C44EF4 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-SolianShareExtension-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 		8C0351B03869BBF493808288 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -544,6 +643,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		73C305CA2E0BE878009035B9 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		73CDD6762DEC00480059D95D /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -569,6 +675,11 @@
 			target = 97C146ED1CF9000F007C117D /* Runner */;
 			targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */;
 		};
+		73C305D72E0BE878009035B9 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 73C305CD2E0BE878009035B9 /* SolianShareExtension */;
+			targetProxy = 73C305D62E0BE878009035B9 /* PBXContainerItemProxy */;
+		};
 		73CDD6802DEC00480059D95D /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 73CDD6792DEC00480059D95D /* SolianNotificationService */;
@@ -656,6 +767,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				CUSTOM_GROUP_ID = group.solsynth.solian;
 				DEVELOPMENT_TEAM = W7HPZ53V6B;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -723,6 +835,129 @@
 			};
 			name = Profile;
 		};
+		73C305D92E0BE878009035B9 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 17FAB080A9C53193ABD9C15B /* Pods-SolianShareExtension.debug.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_ENTITLEMENTS = SolianShareExtension/SolianShareExtension.entitlements;
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				CUSTOM_GROUP_ID = group.solsynth.solian;
+				DEVELOPMENT_TEAM = W7HPZ53V6B;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu17;
+				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = SolianShareExtension/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = SolianShareExtension;
+				INFOPLIST_KEY_NSHumanReadableCopyright = "";
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@executable_path/../../Frameworks",
+				);
+				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
+				MARKETING_VERSION = 1.0;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.solian.SolianShareExtension;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
+				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		73C305DA2E0BE878009035B9 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 27C66EFB5A705F1A822C3EB0 /* Pods-SolianShareExtension.release.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_ENTITLEMENTS = SolianShareExtension/SolianShareExtension.entitlements;
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				CUSTOM_GROUP_ID = group.solsynth.solian;
+				DEVELOPMENT_TEAM = W7HPZ53V6B;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu17;
+				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = SolianShareExtension/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = SolianShareExtension;
+				INFOPLIST_KEY_NSHumanReadableCopyright = "";
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@executable_path/../../Frameworks",
+				);
+				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
+				MARKETING_VERSION = 1.0;
+				MTL_FAST_MATH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.solian.SolianShareExtension;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Release;
+		};
+		73C305DB2E0BE878009035B9 /* Profile */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = A85FF612AE7623A9934E57CE /* Pods-SolianShareExtension.profile.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_ENTITLEMENTS = SolianShareExtension/SolianShareExtension.entitlements;
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				CUSTOM_GROUP_ID = group.solsynth.solian;
+				DEVELOPMENT_TEAM = W7HPZ53V6B;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu17;
+				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = SolianShareExtension/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = SolianShareExtension;
+				INFOPLIST_KEY_NSHumanReadableCopyright = "";
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@executable_path/../../Frameworks",
+				);
+				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
+				MARKETING_VERSION = 1.0;
+				MTL_FAST_MATH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.solian.SolianShareExtension;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Profile;
+		};
 		73CDD6842DEC00480059D95D /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = F830F535CB92E3F2E1653A11 /* Pods-SolianNotificationService.debug.xcconfig */;
@@ -734,6 +969,7 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_ENTITLEMENTS = SolianNotificationService/SolianNotificationService.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = W7HPZ53V6B;
@@ -743,7 +979,7 @@
 				INFOPLIST_FILE = SolianNotificationService/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = SolianNotificationService;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 18.5;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -775,6 +1011,7 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_ENTITLEMENTS = SolianNotificationService/SolianNotificationService.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = W7HPZ53V6B;
@@ -784,7 +1021,7 @@
 				INFOPLIST_FILE = SolianNotificationService/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = SolianNotificationService;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 18.5;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -813,6 +1050,7 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_ENTITLEMENTS = SolianNotificationService/SolianNotificationService.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = W7HPZ53V6B;
@@ -822,7 +1060,7 @@
 				INFOPLIST_FILE = SolianNotificationService/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = SolianNotificationService;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 18.5;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -959,6 +1197,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				CUSTOM_GROUP_ID = group.solsynth.solian;
 				DEVELOPMENT_TEAM = W7HPZ53V6B;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -985,6 +1224,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				CUSTOM_GROUP_ID = group.solsynth.solian;
 				DEVELOPMENT_TEAM = W7HPZ53V6B;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -1015,6 +1255,16 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		73C305DD2E0BE878009035B9 /* Build configuration list for PBXNativeTarget "SolianShareExtension" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				73C305D92E0BE878009035B9 /* Debug */,
+				73C305DA2E0BE878009035B9 /* Release */,
+				73C305DB2E0BE878009035B9 /* Profile */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		73CDD6832DEC00480059D95D /* Build configuration list for PBXNativeTarget "SolianNotificationService" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

ios/Runner/AppDelegate.swift

@@ -11,6 +11,21 @@ import UIKit
     ) -> Bool {
         UNUserNotificationCenter.current().delegate = notifyDelegate
         
+        let replyableMessageCategory = UNNotificationCategory(
+            identifier: "REPLYABLE_MESSAGE",
+            actions: [
+                UNTextInputNotificationAction(
+                    identifier: "reply_action",
+                    title: "Reply",
+                    options: []
+                ),
+            ],
+            intentIdentifiers: [],
+            options: []
+        )
+        
+        UNUserNotificationCenter.current().setNotificationCategories([replyableMessageCategory])
+        
         GeneratedPluginRegistrant.register(with: self)
         return super.application(application, didFinishLaunchingWithOptions: launchOptions)
     }

ios/Runner/Info.plist

@@ -34,6 +34,17 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
+    <key>CFBundleURLTypes</key>
+    <array>
+        <dict>
+            <key>CFBundleTypeRole</key>
+            <string>Editor</string>
+            <key>CFBundleURLSchemes</key>
+            <array>
+                <string>ShareMedia-$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+            </array>
+        </dict>
+    </array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSCalendarsUsageDescription</key>
@@ -76,6 +87,8 @@
 	</array>
 	<key>NSFaceIDUsageDescription</key>
 	<string>Allow the Solar Network verify your ownership of the logged in account and continue your action quickly.</string>
+	<key>AppGroupId</key>
+	<string>$(CUSTOM_GROUP_ID)</string>
 	<key>NSUserActivityTypes</key>
 	<array>
 		<string>INStartCallIntent</string>

ios/Runner/NotifyDelegate.swift

@@ -10,40 +10,51 @@ import Alamofire
 
 class NotifyDelegate: UIResponder, UNUserNotificationCenterDelegate {
     func userNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: @escaping () -> Void) {
-        if let textResponse = response as? UNTextInputNotificationResponse {
-            let content = response.notification.request.content
-            guard let metadata = content.userInfo["meta"] as? [AnyHashable: Any] else {
-                return
-            }
-            
-            var token: String? = UserDefaults.standard.getFlutterToken()
-            if token == nil {
-                return
-            }
-            
-            let serverUrl = UserDefaults.standard.getServerUrl()
-            let url = "\(serverUrl)/chat/\(metadata["room_id"] ?? "")/messages"
-            
-            let parameters: [String: Any?] = [
-                "content": textResponse.userText,
-                "replied_message_id": metadata["message_id"]
-            ]
-            
-            AF.request(url, method: .post, parameters: parameters, encoding: JSONEncoding.default, headers: HTTPHeaders(
-                [HTTPHeader(name: "Authorization", value: "AtField \(token!)")]
-            ))
-                .validate()
-                .responseString { response in
-                    switch response.result {
-                    case .success(_):
-                        break
-                    case .failure(let error):
-                        print("Failed to send chat reply message: \(error)")
-                        break
-                    }
-                }
+        guard let textResponse = response as? UNTextInputNotificationResponse else {
+            completionHandler()
+            return
+        }
+
+        let content = response.notification.request.content
+        
+        // Only handle replies for new messages
+        guard let notificationType = content.userInfo["type"] as? String, notificationType == "messages.new" else {
+            completionHandler()
+            return
+        }
+
+        guard let metadata = content.userInfo["meta"] as? [AnyHashable: Any] else {
+            completionHandler()
+            return
         }
         
-        completionHandler()
+        guard let token = UserDefaults.standard.getFlutterToken() else {
+            completionHandler()
+            return
+        }
+        
+        let serverUrl = UserDefaults.standard.getServerUrl()
+        let url = "\(serverUrl)/chat/\(metadata["room_id"] ?? "")/messages"
+        
+        let parameters: [String: Any?] = [
+            "content": textResponse.userText,
+            "replied_message_id": metadata["message_id"]
+        ]
+        
+        AF.request(url, method: .post, parameters: parameters, encoding: JSONEncoding.default, headers: HTTPHeaders(
+            [HTTPHeader(name: "Authorization", value: "AtField \(token)")]
+        ))
+            .validate()
+            .responseString { response in
+                switch response.result {
+                case .success(_):
+                    break
+                case .failure(let error):
+                    print("Failed to send chat reply message: \(error)")
+                    break
+                }
+                // Call completion handler after network request is finished
+                completionHandler()
+            }
     }
 }

ios/Runner/Runner.entitlements

@@ -11,10 +11,15 @@
 	<key>com.apple.developer.associated-domains</key>
 	<array>
 		<string>webcredentials:solian.app</string>
+		<string>applinks:solian.app</string>
 	</array>
 	<key>com.apple.developer.device-information.user-assigned-device-name</key>
 	<true/>
 	<key>com.apple.developer.usernotifications.communication</key>
 	<true/>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>group.solsynth.solian</string>
+	</array>
 </dict>
 </plist>

ios/SolianNotificationService/NotificationService.swift

@@ -60,21 +60,7 @@ class NotificationService: UNNotificationServiceExtension {
         
         let pfpIdentifier = meta["pfp"] as? String
         
-        let replyableMessageCategory = UNNotificationCategory(
-            identifier: content.categoryIdentifier,
-            actions: [
-                UNTextInputNotificationAction(
-                    identifier: "reply_action",
-                    title: "Reply",
-                    options: []
-                ),
-            ],
-            intentIdentifiers: [],
-            options: []
-        )
-        
-        UNUserNotificationCenter.current().setNotificationCategories([replyableMessageCategory])
-        content.categoryIdentifier = replyableMessageCategory.identifier
+        content.categoryIdentifier = "REPLYABLE_MESSAGE"
         
         let metaCopy = meta as? [String: Any] ?? [:]
         let pfpUrl = pfpIdentifier != nil ? getAttachmentUrl(for: pfpIdentifier!) : nil

ios/SolianNotificationService/SolianNotificationService.entitlements

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-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>com.apple.security.application-groups</key>
+	<array>
+		<string>group.solsynth.solian</string>
+	</array>
+</dict>
+</plist>

ios/SolianShareExtension/Base.lproj/MainInterface.storyboard

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="j1y-V4-xli">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Share View Controller-->
+        <scene sceneID="ceB-am-kn3">
+            <objects>
+                <viewController id="j1y-V4-xli" customClass="ShareViewController" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" opaque="NO" contentMode="scaleToFill" id="wbc-yd-nQP">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                        <viewLayoutGuide key="safeArea" id="1Xd-am-t49"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="CEy-Cv-SGf" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+        </scene>
+    </scenes>
+</document>

ios/SolianShareExtension/Info.plist

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-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>AppGroupId</key>
+    <string>$(CUSTOM_GROUP_ID)</string>
+    <key>CFBundleVersion</key>
+    <string>$(FLUTTER_BUILD_NUMBER)</string>
+    <key>NSExtension</key>
+    <dict>
+        <key>NSExtensionAttributes</key>
+        <dict>
+            <key>PHSupportedMediaTypes</key>
+            <array>
+                <!--TODO: Add this flag, if you want to support sharing video into your app-->
+                <string>Video</string>
+                <!--TODO: Add this flag, if you want to support sharing images into your app-->
+                <string>Image</string>
+            </array>
+            <key>NSExtensionActivationRule</key>
+            <dict>
+                <key>NSExtensionActivationSupportsText</key>
+                <true/>
+                <key>NSExtensionActivationSupportsWebURLWithMaxCount</key>
+                <integer>1</integer>
+                <key>NSExtensionActivationSupportsWebPageWithMaxCount</key>
+                <integer>1</integer>
+                <key>NSExtensionActivationSupportsImageWithMaxCount</key>
+                <integer>100</integer>
+                <key>NSExtensionActivationSupportsMovieWithMaxCount</key>
+                <integer>100</integer>
+                <key>NSExtensionActivationSupportsFileWithMaxCount</key>
+                <integer>100</integer>
+            </dict>
+        </dict>
+        <key>NSExtensionMainStoryboard</key>
+        <string>MainInterface</string>
+        <key>NSExtensionPointIdentifier</key>
+        <string>com.apple.share-services</string>
+    </dict>
+</dict>
+</plist>

ios/SolianShareExtension/ShareViewController.swift

@@ -0,0 +1,14 @@
+//
+//  ShareViewController.swift
+//  SolianShareExtension
+//
+//  Created by LittleSheep on 2025/6/25.
+//
+
+import receive_sharing_intent
+
+class ShareViewController: RSIShareViewController {
+    override func shouldAutoRedirect() -> Bool {
+        return true
+    }
+}

ios/SolianShareExtension/SolianShareExtension.entitlements

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-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>com.apple.security.application-groups</key>
+	<array>
+		<string>group.solsynth.solian</string>
+	</array>
+</dict>
+</plist>

lib/database/draft.dart

@@ -1,26 +1,10 @@
 import 'package:drift/drift.dart';
 
-class ComposeDrafts extends Table {
+class PostDrafts extends Table {
   TextColumn get id => text()();
-  TextColumn get title => text().withDefault(const Constant(''))();
-  TextColumn get description => text().withDefault(const Constant(''))();
-  TextColumn get content => text().withDefault(const Constant(''))();
-  TextColumn get attachmentIds => text().withDefault(const Constant('[]'))(); // JSON array as string
-  IntColumn get visibility => integer().withDefault(const Constant(0))(); // 0=public, 1=unlisted, 2=friends, 3=selected, 4=private
+  TextColumn get post => text()(); // Store SnPost model as JSON string
   DateTimeColumn get lastModified => dateTime()();
 
   @override
   Set<Column> get primaryKey => {id};
 }
-
-class ArticleDrafts extends Table {
-  TextColumn get id => text()();
-  TextColumn get title => text().withDefault(const Constant(''))();
-  TextColumn get description => text().withDefault(const Constant(''))();
-  TextColumn get content => text().withDefault(const Constant(''))();
-  IntColumn get visibility => integer().withDefault(const Constant(0))(); // 0=public, 1=unlisted, 2=friends, 3=private
-  DateTimeColumn get lastModified => dateTime()();
-
-  @override
-  Set<Column> get primaryKey => {id};
-}

lib/database/drift_db.dart

@@ -2,16 +2,17 @@ import 'dart:convert';
 import 'package:drift/drift.dart';
 import 'package:island/database/message.dart';
 import 'package:island/database/draft.dart';
+import 'package:island/models/post.dart';
 
 part 'drift_db.g.dart';
 
 // Define the database
-@DriftDatabase(tables: [ChatMessages, ComposeDrafts, ArticleDrafts])
+@DriftDatabase(tables: [ChatMessages, PostDrafts])
 class AppDatabase extends _$AppDatabase {
   AppDatabase(super.e);
 
   @override
-  int get schemaVersion => 3;
+  int get schemaVersion => 4;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
@@ -23,10 +24,9 @@ class AppDatabase extends _$AppDatabase {
         // Add isRead column with default value false
         await m.addColumn(chatMessages, chatMessages.isRead);
       }
-      if (from < 3) {
-        // Add draft tables
-        await m.createTable(composeDrafts);
-        await m.createTable(articleDrafts);
+      if (from < 4) {
+        // Drop old draft tables if they exist
+        await m.createTable(postDrafts);
       }
     },
   );
@@ -98,51 +98,23 @@ class AppDatabase extends _$AppDatabase {
     );
   }
 
-  // Methods for compose drafts
-  Future<List<ComposeDraft>> getAllComposeDrafts() {
-    return (select(composeDrafts)
-          ..orderBy([(d) => OrderingTerm.desc(d.lastModified)]))
-        .get();
+  // Methods for post drafts
+  Future<List<SnPost>> getAllPostDrafts() async {
+    final drafts = await select(postDrafts).get();
+    return drafts
+        .map((draft) => SnPost.fromJson(jsonDecode(draft.post)))
+        .toList();
   }
 
-  Future<ComposeDraft?> getComposeDraft(String id) {
-    return (select(composeDrafts)..where((d) => d.id.equals(id)))
-        .getSingleOrNull();
+  Future<void> addPostDraft(PostDraftsCompanion entry) async {
+    await into(postDrafts).insert(entry, mode: InsertMode.replace);
   }
 
-  Future<int> saveComposeDraft(ComposeDraftsCompanion draft) {
-    return into(composeDrafts).insert(draft, mode: InsertMode.insertOrReplace);
+  Future<void> deletePostDraft(String id) async {
+    await (delete(postDrafts)..where((tbl) => tbl.id.equals(id))).go();
   }
 
-  Future<int> deleteComposeDraft(String id) {
-    return (delete(composeDrafts)..where((d) => d.id.equals(id))).go();
-  }
-
-  Future<int> clearAllComposeDrafts() {
-    return delete(composeDrafts).go();
-  }
-
-  // Methods for article drafts
-  Future<List<ArticleDraft>> getAllArticleDrafts() {
-    return (select(articleDrafts)
-          ..orderBy([(d) => OrderingTerm.desc(d.lastModified)]))
-        .get();
-  }
-
-  Future<ArticleDraft?> getArticleDraft(String id) {
-    return (select(articleDrafts)..where((d) => d.id.equals(id)))
-        .getSingleOrNull();
-  }
-
-  Future<int> saveArticleDraft(ArticleDraftsCompanion draft) {
-    return into(articleDrafts).insert(draft, mode: InsertMode.insertOrReplace);
-  }
-
-  Future<int> deleteArticleDraft(String id) {
-    return (delete(articleDrafts)..where((d) => d.id.equals(id))).go();
-  }
-
-  Future<int> clearAllArticleDrafts() {
-    return delete(articleDrafts).go();
+  Future<void> clearAllPostDrafts() async {
+    await delete(postDrafts).go();
   }
 }

lib/database/message_repository.dart

@@ -71,25 +71,32 @@ class MessageRepository {
     bool synced = false,
   }) async {
     try {
+      // For initial load, fetch latest messages in the background to sync.
+      if (offset == 0 && !synced) {
+        // Not awaiting this is intentional, for a quicker UI response.
+        // The UI should rely on a stream from the database to get updates.
+        _fetchAndCacheMessages(room.id, offset: 0, take: take).catchError((_) {
+          // Best effort, errors will be handled by later fetches.
+          return <LocalChatMessage>[];
+        });
+      }
+
       final localMessages = await _getCachedMessages(
         room.id,
         offset: offset,
         take: take,
       );
 
-      // If it already synced with the remote, skip this
-      if (offset == 0 && !synced) {
-        // Fetch latest messages
-        _fetchAndCacheMessages(room.id, offset: offset, take: take);
-
-        if (localMessages.isNotEmpty) {
-          return localMessages;
-        }
+      // If local cache has messages, return them. This is the common case for scrolling up.
+      if (localMessages.isNotEmpty) {
+        return localMessages;
       }
 
+      // If local cache is empty, we've probably reached the end of cached history.
+      // Fetch from remote. This will also be hit on first load if cache is empty.
       return await _fetchAndCacheMessages(room.id, offset: offset, take: take);
     } catch (e) {
-      // If API fails but we have local messages, return them
+      // Final fallback to cache in case of network errors during fetch.
       final localMessages = await _getCachedMessages(
         room.id,
         offset: offset,
@@ -117,24 +124,26 @@ class MessageRepository {
     final dbLocalMessages =
         dbMessages.map(_database.companionToMessage).toList();
 
-    // Combine with pending messages
-    final pendingForRoom =
-        pendingMessages.values.where((msg) => msg.roomId == roomId).toList();
+    // Combine with pending messages for the first page
+    if (offset == 0) {
+      final pendingForRoom =
+          pendingMessages.values.where((msg) => msg.roomId == roomId).toList();
 
-    // Sort by timestamp descending (newest first)
-    final allMessages = [...pendingForRoom, ...dbLocalMessages];
-    allMessages.sort((a, b) => b.createdAt.compareTo(a.createdAt));
+      final allMessages = [...pendingForRoom, ...dbLocalMessages];
+      allMessages.sort((a, b) => b.createdAt.compareTo(a.createdAt));
 
-    // Apply pagination
-    if (offset >= allMessages.length) {
-      return [];
+      // Remove duplicates by ID, preserving the order
+      final uniqueMessages = <LocalChatMessage>[];
+      final seenIds = <String>{};
+      for (final message in allMessages) {
+        if (seenIds.add(message.id)) {
+          uniqueMessages.add(message);
+        }
+      }
+      return uniqueMessages;
     }
 
-    final end =
-        (offset + take) > allMessages.length
-            ? allMessages.length
-            : (offset + take);
-    return allMessages.sublist(offset, end);
+    return dbLocalMessages;
   }
 
   Future<List<LocalChatMessage>> _fetchAndCacheMessages(

lib/main.dart

@@ -7,6 +7,7 @@ import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:image_picker_android/image_picker_android.dart';
@@ -18,6 +19,7 @@ import 'package:bitsdojo_window/bitsdojo_window.dart';
 import 'package:island/pods/userinfo.dart';
 import 'package:island/pods/websocket.dart';
 import 'package:island/route.dart';
+
 import 'package:island/services/notify.dart';
 import 'package:island/services/timezone.dart';
 import 'package:island/widgets/alert.dart';
@@ -28,6 +30,12 @@ import 'package:image_picker_platform_interface/image_picker_platform_interface.
 import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 
+@pragma('vm:entry-point')
+Future<void> _firebaseMessagingBackgroundHandler(RemoteMessage message) async {
+  await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
+  log('Handling a background message: ${message.messageId}');
+}
+
 void main() async {
   final widgetsBinding = WidgetsFlutterBinding.ensureInitialized();
   if (!kIsWeb && (Platform.isAndroid || Platform.isIOS)) {
@@ -42,6 +50,7 @@ void main() async {
     await Firebase.initializeApp(
       options: DefaultFirebaseOptions.currentPlatform,
     );
+    FirebaseMessaging.onBackgroundMessage(_firebaseMessagingBackgroundHandler);
     log("[SplashScreen] Firebase is ready!");
   } catch (err) {
     showErrorAlert(err);
@@ -60,11 +69,11 @@ void main() async {
   if (!kIsWeb && (Platform.isMacOS || Platform.isLinux || Platform.isWindows)) {
     doWhenWindowReady(() {
       const defaultSize = Size(360, 640);
-      
+
       // Get saved window size from preferences
       final savedSizeString = prefs.getString(kAppWindowSize);
       Size initialSize = defaultSize;
-      
+
       if (savedSizeString != null) {
         try {
           final parts = savedSizeString.split(',');
@@ -78,12 +87,14 @@ void main() async {
           initialSize = defaultSize;
         }
       }
-      
+
       appWindow.minSize = defaultSize;
       appWindow.size = initialSize;
       appWindow.alignment = Alignment.center;
       appWindow.show();
-      log("[SplashScreen] Desktop window is ready with size: ${initialSize.width}x${initialSize.height}");
+      log(
+        "[SplashScreen] Desktop window is ready with size: ${initialSize.width}x${initialSize.height}",
+      );
     });
   }
 
@@ -122,7 +133,9 @@ void main() async {
   );
 }
 
-final appRouter = AppRouter();
+// Router will be provided through Riverpod
+
+final globalOverlay = GlobalKey<OverlayState>();
 
 class IslandApp extends HookConsumerWidget {
   const IslandApp({super.key});
@@ -136,7 +149,8 @@ class IslandApp extends HookConsumerWidget {
         var uri = notification.data['action_uri'] as String;
         if (uri.startsWith('/')) {
           // In-app routes
-          appRouter.pushPath(notification.data['action_uri']);
+          final router = ref.read(routerProvider);
+          router.go(notification.data['action_uri']);
         } else {
           // External links
           launchUrlString(uri);
@@ -145,17 +159,52 @@ class IslandApp extends HookConsumerWidget {
     }
 
     useEffect(() {
-      Future(() async {
-        RemoteMessage? initialMessage =
-            await FirebaseMessaging.instance.getInitialMessage();
-        if (initialMessage != null) {
-          handleMessage(initialMessage);
-        }
+      const channel = MethodChannel('dev.solsynth.solian/notifications');
 
-        FirebaseMessaging.onMessageOpenedApp.listen(handleMessage);
+      Future<void> handleInitialLink() async {
+        final String? link = await channel.invokeMethod('initialLink');
+        if (link != null) {
+          final router = ref.read(routerProvider);
+          router.go(link);
+        }
+      }
+
+      if (!kIsWeb && (Platform.isAndroid || Platform.isIOS)) {
+        handleInitialLink();
+      }
+
+      channel.setMethodCallHandler((call) async {
+        if (call.method == 'newLink') {
+          final String link = call.arguments;
+          final router = ref.read(routerProvider);
+          router.go(link);
+        }
       });
 
-      return null;
+      // When the app is opened from a terminated state.
+      FirebaseMessaging.instance.getInitialMessage().then((message) {
+        if (message != null) {
+          handleMessage(message);
+        }
+      });
+
+      // When the app is in the background and opened.
+      final onMessageOpenedAppSubscription = FirebaseMessaging
+          .onMessageOpenedApp
+          .listen(handleMessage);
+
+      // When the app is in the foreground.
+      final onMessageSubscription = FirebaseMessaging.onMessage.listen((
+        message,
+      ) {
+        log('Foreground message received: ${message.messageId}');
+        handleMessage(message);
+      });
+
+      return () {
+        onMessageOpenedAppSubscription.cancel();
+        onMessageSubscription.cancel();
+      };
     }, []);
 
     useEffect(() {
@@ -178,11 +227,13 @@ class IslandApp extends HookConsumerWidget {
       return null;
     }, []);
 
+    final router = ref.watch(routerProvider);
+
     return MaterialApp.router(
       theme: theme?.light,
       darkTheme: theme?.dark,
       themeMode: ThemeMode.system,
-      routerConfig: appRouter.config(),
+      routerConfig: router,
       supportedLocales: context.supportedLocales,
       localizationsDelegates: [
         ...context.localizationDelegates,
@@ -192,13 +243,12 @@ class IslandApp extends HookConsumerWidget {
       locale: context.locale,
       builder: (context, child) {
         return Overlay(
+          key: globalOverlay,
           initialEntries: [
             OverlayEntry(
               builder:
-                  (_) => WindowScaffold(
-                    router: appRouter,
-                    child: child ?? const SizedBox.shrink(),
-                  ),
+                  (_) =>
+                      WindowScaffold(child: child ?? const SizedBox.shrink()),
             ),
           ],
         );

lib/models/chat.dart

@@ -13,7 +13,8 @@ sealed class SnChatRoom with _$SnChatRoom {
     required String? name,
     required String? description,
     required int type,
-    required bool isPublic,
+    @Default(false) bool isPublic,
+    @Default(false) bool isCommunity,
     required SnCloudFile? picture,
     required SnCloudFile? background,
     required String? realmId,

lib/models/chat.freezed.dart

@@ -16,7 +16,7 @@ T _$identity<T>(T value) => value;
 /// @nodoc
 mixin _$SnChatRoom {
 
- String get id; String? get name; String? get description; int get type; bool get isPublic; SnCloudFile? get picture; SnCloudFile? get background; String? get realmId; SnRealm? get realm; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt; List<SnChatMember>? get members;
+ String get id; String? get name; String? get description; int get type; bool get isPublic; bool get isCommunity; SnCloudFile? get picture; SnCloudFile? get background; String? get realmId; SnRealm? get realm; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt; List<SnChatMember>? get members;
 /// Create a copy of SnChatRoom
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -29,16 +29,16 @@ $SnChatRoomCopyWith<SnChatRoom> get copyWith => _$SnChatRoomCopyWithImpl<SnChatR
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnChatRoom&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.description, description) || other.description == description)&&(identical(other.type, type) || other.type == type)&&(identical(other.isPublic, isPublic) || other.isPublic == isPublic)&&(identical(other.picture, picture) || other.picture == picture)&&(identical(other.background, background) || other.background == background)&&(identical(other.realmId, realmId) || other.realmId == realmId)&&(identical(other.realm, realm) || other.realm == realm)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&const DeepCollectionEquality().equals(other.members, members));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnChatRoom&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.description, description) || other.description == description)&&(identical(other.type, type) || other.type == type)&&(identical(other.isPublic, isPublic) || other.isPublic == isPublic)&&(identical(other.isCommunity, isCommunity) || other.isCommunity == isCommunity)&&(identical(other.picture, picture) || other.picture == picture)&&(identical(other.background, background) || other.background == background)&&(identical(other.realmId, realmId) || other.realmId == realmId)&&(identical(other.realm, realm) || other.realm == realm)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&const DeepCollectionEquality().equals(other.members, members));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hash(runtimeType,id,name,description,type,isPublic,picture,background,realmId,realm,createdAt,updatedAt,deletedAt,const DeepCollectionEquality().hash(members));
+int get hashCode => Object.hash(runtimeType,id,name,description,type,isPublic,isCommunity,picture,background,realmId,realm,createdAt,updatedAt,deletedAt,const DeepCollectionEquality().hash(members));
 
 @override
 String toString() {
-  return 'SnChatRoom(id: $id, name: $name, description: $description, type: $type, isPublic: $isPublic, picture: $picture, background: $background, realmId: $realmId, realm: $realm, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, members: $members)';
+  return 'SnChatRoom(id: $id, name: $name, description: $description, type: $type, isPublic: $isPublic, isCommunity: $isCommunity, picture: $picture, background: $background, realmId: $realmId, realm: $realm, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, members: $members)';
 }
 
 
@@ -49,7 +49,7 @@ abstract mixin class $SnChatRoomCopyWith<$Res>  {
   factory $SnChatRoomCopyWith(SnChatRoom value, $Res Function(SnChatRoom) _then) = _$SnChatRoomCopyWithImpl;
 @useResult
 $Res call({
- String id, String? name, String? description, int type, bool isPublic, SnCloudFile? picture, SnCloudFile? background, String? realmId, SnRealm? realm, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, List<SnChatMember>? members
+ String id, String? name, String? description, int type, bool isPublic, bool isCommunity, SnCloudFile? picture, SnCloudFile? background, String? realmId, SnRealm? realm, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, List<SnChatMember>? members
 });
 
 
@@ -66,13 +66,14 @@ class _$SnChatRoomCopyWithImpl<$Res>
 
 /// Create a copy of SnChatRoom
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? name = freezed,Object? description = freezed,Object? type = null,Object? isPublic = null,Object? picture = freezed,Object? background = freezed,Object? realmId = freezed,Object? realm = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? members = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? name = freezed,Object? description = freezed,Object? type = null,Object? isPublic = null,Object? isCommunity = null,Object? picture = freezed,Object? background = freezed,Object? realmId = freezed,Object? realm = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? members = freezed,}) {
   return _then(_self.copyWith(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,name: freezed == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
 as String?,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
 as String?,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
 as int,isPublic: null == isPublic ? _self.isPublic : isPublic // ignore: cast_nullable_to_non_nullable
+as bool,isCommunity: null == isCommunity ? _self.isCommunity : isCommunity // ignore: cast_nullable_to_non_nullable
 as bool,picture: freezed == picture ? _self.picture : picture // ignore: cast_nullable_to_non_nullable
 as SnCloudFile?,background: freezed == background ? _self.background : background // ignore: cast_nullable_to_non_nullable
 as SnCloudFile?,realmId: freezed == realmId ? _self.realmId : realmId // ignore: cast_nullable_to_non_nullable
@@ -128,14 +129,15 @@ $SnRealmCopyWith<$Res>? get realm {
 @JsonSerializable()
 
 class _SnChatRoom implements SnChatRoom {
-  const _SnChatRoom({required this.id, required this.name, required this.description, required this.type, required this.isPublic, required this.picture, required this.background, required this.realmId, required this.realm, required this.createdAt, required this.updatedAt, required this.deletedAt, required final  List<SnChatMember>? members}): _members = members;
+  const _SnChatRoom({required this.id, required this.name, required this.description, required this.type, this.isPublic = false, this.isCommunity = false, required this.picture, required this.background, required this.realmId, required this.realm, required this.createdAt, required this.updatedAt, required this.deletedAt, required final  List<SnChatMember>? members}): _members = members;
   factory _SnChatRoom.fromJson(Map<String, dynamic> json) => _$SnChatRoomFromJson(json);
 
 @override final  String id;
 @override final  String? name;
 @override final  String? description;
 @override final  int type;
-@override final  bool isPublic;
+@override@JsonKey() final  bool isPublic;
+@override@JsonKey() final  bool isCommunity;
 @override final  SnCloudFile? picture;
 @override final  SnCloudFile? background;
 @override final  String? realmId;
@@ -166,16 +168,16 @@ Map<String, dynamic> toJson() {
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnChatRoom&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.description, description) || other.description == description)&&(identical(other.type, type) || other.type == type)&&(identical(other.isPublic, isPublic) || other.isPublic == isPublic)&&(identical(other.picture, picture) || other.picture == picture)&&(identical(other.background, background) || other.background == background)&&(identical(other.realmId, realmId) || other.realmId == realmId)&&(identical(other.realm, realm) || other.realm == realm)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&const DeepCollectionEquality().equals(other._members, _members));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnChatRoom&&(identical(other.id, id) || other.id == id)&&(identical(other.name, name) || other.name == name)&&(identical(other.description, description) || other.description == description)&&(identical(other.type, type) || other.type == type)&&(identical(other.isPublic, isPublic) || other.isPublic == isPublic)&&(identical(other.isCommunity, isCommunity) || other.isCommunity == isCommunity)&&(identical(other.picture, picture) || other.picture == picture)&&(identical(other.background, background) || other.background == background)&&(identical(other.realmId, realmId) || other.realmId == realmId)&&(identical(other.realm, realm) || other.realm == realm)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&(identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt)&&const DeepCollectionEquality().equals(other._members, _members));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hash(runtimeType,id,name,description,type,isPublic,picture,background,realmId,realm,createdAt,updatedAt,deletedAt,const DeepCollectionEquality().hash(_members));
+int get hashCode => Object.hash(runtimeType,id,name,description,type,isPublic,isCommunity,picture,background,realmId,realm,createdAt,updatedAt,deletedAt,const DeepCollectionEquality().hash(_members));
 
 @override
 String toString() {
-  return 'SnChatRoom(id: $id, name: $name, description: $description, type: $type, isPublic: $isPublic, picture: $picture, background: $background, realmId: $realmId, realm: $realm, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, members: $members)';
+  return 'SnChatRoom(id: $id, name: $name, description: $description, type: $type, isPublic: $isPublic, isCommunity: $isCommunity, picture: $picture, background: $background, realmId: $realmId, realm: $realm, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, members: $members)';
 }
 
 
@@ -186,7 +188,7 @@ abstract mixin class _$SnChatRoomCopyWith<$Res> implements $SnChatRoomCopyWith<$
   factory _$SnChatRoomCopyWith(_SnChatRoom value, $Res Function(_SnChatRoom) _then) = __$SnChatRoomCopyWithImpl;
 @override @useResult
 $Res call({
- String id, String? name, String? description, int type, bool isPublic, SnCloudFile? picture, SnCloudFile? background, String? realmId, SnRealm? realm, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, List<SnChatMember>? members
+ String id, String? name, String? description, int type, bool isPublic, bool isCommunity, SnCloudFile? picture, SnCloudFile? background, String? realmId, SnRealm? realm, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, List<SnChatMember>? members
 });
 
 
@@ -203,13 +205,14 @@ class __$SnChatRoomCopyWithImpl<$Res>
 
 /// Create a copy of SnChatRoom
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? name = freezed,Object? description = freezed,Object? type = null,Object? isPublic = null,Object? picture = freezed,Object? background = freezed,Object? realmId = freezed,Object? realm = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? members = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? name = freezed,Object? description = freezed,Object? type = null,Object? isPublic = null,Object? isCommunity = null,Object? picture = freezed,Object? background = freezed,Object? realmId = freezed,Object? realm = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? members = freezed,}) {
   return _then(_SnChatRoom(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,name: freezed == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
 as String?,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
 as String?,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
 as int,isPublic: null == isPublic ? _self.isPublic : isPublic // ignore: cast_nullable_to_non_nullable
+as bool,isCommunity: null == isCommunity ? _self.isCommunity : isCommunity // ignore: cast_nullable_to_non_nullable
 as bool,picture: freezed == picture ? _self.picture : picture // ignore: cast_nullable_to_non_nullable
 as SnCloudFile?,background: freezed == background ? _self.background : background // ignore: cast_nullable_to_non_nullable
 as SnCloudFile?,realmId: freezed == realmId ? _self.realmId : realmId // ignore: cast_nullable_to_non_nullable

lib/models/chat.g.dart

@@ -11,7 +11,8 @@ _SnChatRoom _$SnChatRoomFromJson(Map<String, dynamic> json) => _SnChatRoom(
   name: json['name'] as String?,
   description: json['description'] as String?,
   type: (json['type'] as num).toInt(),
-  isPublic: json['is_public'] as bool,
+  isPublic: json['is_public'] as bool? ?? false,
+  isCommunity: json['is_community'] as bool? ?? false,
   picture:
       json['picture'] == null
           ? null
@@ -44,6 +45,7 @@ Map<String, dynamic> _$SnChatRoomToJson(_SnChatRoom instance) =>
       'description': instance.description,
       'type': instance.type,
       'is_public': instance.isPublic,
+      'is_community': instance.isCommunity,
       'picture': instance.picture?.toJson(),
       'background': instance.background?.toJson(),
       'realm_id': instance.realmId,

lib/models/embed.dart

@@ -21,3 +21,22 @@ sealed class SnEmbedLink with _$SnEmbedLink {
   factory SnEmbedLink.fromJson(Map<String, dynamic> json) =>
       _$SnEmbedLinkFromJson(json);
 }
+
+@freezed
+sealed class SnScrappedLink with _$SnScrappedLink {
+  const factory SnScrappedLink({
+    required String type,
+    required String url,
+    required String title,
+    required String? description,
+    required String? imageUrl,
+    required String faviconUrl,
+    required String siteName,
+    required String? contentType,
+    required String? author,
+    required DateTime? publishedDate,
+  }) = _SnScrappedLink;
+
+  factory SnScrappedLink.fromJson(Map<String, dynamic> json) =>
+      _$SnScrappedLinkFromJson(json);
+}

lib/models/embed.freezed.dart

@@ -170,6 +170,166 @@ as DateTime?,
 }
 
 
+}
+
+
+/// @nodoc
+mixin _$SnScrappedLink {
+
+ String get type; String get url; String get title; String? get description; String? get imageUrl; String get faviconUrl; String get siteName; String? get contentType; String? get author; DateTime? get publishedDate;
+/// Create a copy of SnScrappedLink
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$SnScrappedLinkCopyWith<SnScrappedLink> get copyWith => _$SnScrappedLinkCopyWithImpl<SnScrappedLink>(this as SnScrappedLink, _$identity);
+
+  /// Serializes this SnScrappedLink to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is SnScrappedLink&&(identical(other.type, type) || other.type == type)&&(identical(other.url, url) || other.url == url)&&(identical(other.title, title) || other.title == title)&&(identical(other.description, description) || other.description == description)&&(identical(other.imageUrl, imageUrl) || other.imageUrl == imageUrl)&&(identical(other.faviconUrl, faviconUrl) || other.faviconUrl == faviconUrl)&&(identical(other.siteName, siteName) || other.siteName == siteName)&&(identical(other.contentType, contentType) || other.contentType == contentType)&&(identical(other.author, author) || other.author == author)&&(identical(other.publishedDate, publishedDate) || other.publishedDate == publishedDate));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,type,url,title,description,imageUrl,faviconUrl,siteName,contentType,author,publishedDate);
+
+@override
+String toString() {
+  return 'SnScrappedLink(type: $type, url: $url, title: $title, description: $description, imageUrl: $imageUrl, faviconUrl: $faviconUrl, siteName: $siteName, contentType: $contentType, author: $author, publishedDate: $publishedDate)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $SnScrappedLinkCopyWith<$Res>  {
+  factory $SnScrappedLinkCopyWith(SnScrappedLink value, $Res Function(SnScrappedLink) _then) = _$SnScrappedLinkCopyWithImpl;
+@useResult
+$Res call({
+ String type, String url, String title, String? description, String? imageUrl, String faviconUrl, String siteName, String? contentType, String? author, DateTime? publishedDate
+});
+
+
+
+
+}
+/// @nodoc
+class _$SnScrappedLinkCopyWithImpl<$Res>
+    implements $SnScrappedLinkCopyWith<$Res> {
+  _$SnScrappedLinkCopyWithImpl(this._self, this._then);
+
+  final SnScrappedLink _self;
+  final $Res Function(SnScrappedLink) _then;
+
+/// Create a copy of SnScrappedLink
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? type = null,Object? url = null,Object? title = null,Object? description = freezed,Object? imageUrl = freezed,Object? faviconUrl = null,Object? siteName = null,Object? contentType = freezed,Object? author = freezed,Object? publishedDate = freezed,}) {
+  return _then(_self.copyWith(
+type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
+as String,url: null == url ? _self.url : url // ignore: cast_nullable_to_non_nullable
+as String,title: null == title ? _self.title : title // ignore: cast_nullable_to_non_nullable
+as String,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
+as String?,imageUrl: freezed == imageUrl ? _self.imageUrl : imageUrl // ignore: cast_nullable_to_non_nullable
+as String?,faviconUrl: null == faviconUrl ? _self.faviconUrl : faviconUrl // ignore: cast_nullable_to_non_nullable
+as String,siteName: null == siteName ? _self.siteName : siteName // ignore: cast_nullable_to_non_nullable
+as String,contentType: freezed == contentType ? _self.contentType : contentType // ignore: cast_nullable_to_non_nullable
+as String?,author: freezed == author ? _self.author : author // ignore: cast_nullable_to_non_nullable
+as String?,publishedDate: freezed == publishedDate ? _self.publishedDate : publishedDate // ignore: cast_nullable_to_non_nullable
+as DateTime?,
+  ));
+}
+
+}
+
+
+/// @nodoc
+@JsonSerializable()
+
+class _SnScrappedLink implements SnScrappedLink {
+  const _SnScrappedLink({required this.type, required this.url, required this.title, required this.description, required this.imageUrl, required this.faviconUrl, required this.siteName, required this.contentType, required this.author, required this.publishedDate});
+  factory _SnScrappedLink.fromJson(Map<String, dynamic> json) => _$SnScrappedLinkFromJson(json);
+
+@override final  String type;
+@override final  String url;
+@override final  String title;
+@override final  String? description;
+@override final  String? imageUrl;
+@override final  String faviconUrl;
+@override final  String siteName;
+@override final  String? contentType;
+@override final  String? author;
+@override final  DateTime? publishedDate;
+
+/// Create a copy of SnScrappedLink
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$SnScrappedLinkCopyWith<_SnScrappedLink> get copyWith => __$SnScrappedLinkCopyWithImpl<_SnScrappedLink>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$SnScrappedLinkToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _SnScrappedLink&&(identical(other.type, type) || other.type == type)&&(identical(other.url, url) || other.url == url)&&(identical(other.title, title) || other.title == title)&&(identical(other.description, description) || other.description == description)&&(identical(other.imageUrl, imageUrl) || other.imageUrl == imageUrl)&&(identical(other.faviconUrl, faviconUrl) || other.faviconUrl == faviconUrl)&&(identical(other.siteName, siteName) || other.siteName == siteName)&&(identical(other.contentType, contentType) || other.contentType == contentType)&&(identical(other.author, author) || other.author == author)&&(identical(other.publishedDate, publishedDate) || other.publishedDate == publishedDate));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,type,url,title,description,imageUrl,faviconUrl,siteName,contentType,author,publishedDate);
+
+@override
+String toString() {
+  return 'SnScrappedLink(type: $type, url: $url, title: $title, description: $description, imageUrl: $imageUrl, faviconUrl: $faviconUrl, siteName: $siteName, contentType: $contentType, author: $author, publishedDate: $publishedDate)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$SnScrappedLinkCopyWith<$Res> implements $SnScrappedLinkCopyWith<$Res> {
+  factory _$SnScrappedLinkCopyWith(_SnScrappedLink value, $Res Function(_SnScrappedLink) _then) = __$SnScrappedLinkCopyWithImpl;
+@override @useResult
+$Res call({
+ String type, String url, String title, String? description, String? imageUrl, String faviconUrl, String siteName, String? contentType, String? author, DateTime? publishedDate
+});
+
+
+
+
+}
+/// @nodoc
+class __$SnScrappedLinkCopyWithImpl<$Res>
+    implements _$SnScrappedLinkCopyWith<$Res> {
+  __$SnScrappedLinkCopyWithImpl(this._self, this._then);
+
+  final _SnScrappedLink _self;
+  final $Res Function(_SnScrappedLink) _then;
+
+/// Create a copy of SnScrappedLink
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? type = null,Object? url = null,Object? title = null,Object? description = freezed,Object? imageUrl = freezed,Object? faviconUrl = null,Object? siteName = null,Object? contentType = freezed,Object? author = freezed,Object? publishedDate = freezed,}) {
+  return _then(_SnScrappedLink(
+type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
+as String,url: null == url ? _self.url : url // ignore: cast_nullable_to_non_nullable
+as String,title: null == title ? _self.title : title // ignore: cast_nullable_to_non_nullable
+as String,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
+as String?,imageUrl: freezed == imageUrl ? _self.imageUrl : imageUrl // ignore: cast_nullable_to_non_nullable
+as String?,faviconUrl: null == faviconUrl ? _self.faviconUrl : faviconUrl // ignore: cast_nullable_to_non_nullable
+as String,siteName: null == siteName ? _self.siteName : siteName // ignore: cast_nullable_to_non_nullable
+as String,contentType: freezed == contentType ? _self.contentType : contentType // ignore: cast_nullable_to_non_nullable
+as String?,author: freezed == author ? _self.author : author // ignore: cast_nullable_to_non_nullable
+as String?,publishedDate: freezed == publishedDate ? _self.publishedDate : publishedDate // ignore: cast_nullable_to_non_nullable
+as DateTime?,
+  ));
+}
+
+
 }
 
 // dart format on

lib/models/embed.g.dart

@@ -35,3 +35,34 @@ Map<String, dynamic> _$SnEmbedLinkToJson(_SnEmbedLink instance) =>
       'Author': instance.author,
       'PublishedDate': instance.publishedDate?.toIso8601String(),
     };
+
+_SnScrappedLink _$SnScrappedLinkFromJson(Map<String, dynamic> json) =>
+    _SnScrappedLink(
+      type: json['type'] as String,
+      url: json['url'] as String,
+      title: json['title'] as String,
+      description: json['description'] as String?,
+      imageUrl: json['image_url'] as String?,
+      faviconUrl: json['favicon_url'] as String,
+      siteName: json['site_name'] as String,
+      contentType: json['content_type'] as String?,
+      author: json['author'] as String?,
+      publishedDate:
+          json['published_date'] == null
+              ? null
+              : DateTime.parse(json['published_date'] as String),
+    );
+
+Map<String, dynamic> _$SnScrappedLinkToJson(_SnScrappedLink instance) =>
+    <String, dynamic>{
+      'type': instance.type,
+      'url': instance.url,
+      'title': instance.title,
+      'description': instance.description,
+      'image_url': instance.imageUrl,
+      'favicon_url': instance.faviconUrl,
+      'site_name': instance.siteName,
+      'content_type': instance.contentType,
+      'author': instance.author,
+      'published_date': instance.publishedDate?.toIso8601String(),
+    };

lib/models/post.dart

@@ -1,5 +1,7 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:island/models/file.dart';
+import 'package:island/models/post_category.dart';
+import 'package:island/models/post_tag.dart';
 import 'package:island/models/user.dart';
 
 part 'post.freezed.dart';
@@ -9,36 +11,36 @@ part 'post.g.dart';
 sealed class SnPost with _$SnPost {
   const factory SnPost({
     required String id,
-    required String? title,
-    required String? description,
-    required String? language,
-    required DateTime? editedAt,
-    required DateTime publishedAt,
-    required int visibility,
-    required String? content,
-    required int type,
-    required Map<String, dynamic>? meta,
-    required int viewsUnique,
-    required int viewsTotal,
-    required int upvotes,
-    required int downvotes,
-    required int repliesCount,
-    required String? threadedPostId,
-    required SnPost? threadedPost,
-    required String? repliedPostId,
-    required SnPost? repliedPost,
-    required String? forwardedPostId,
-    required SnPost? forwardedPost,
-    required List<SnCloudFile> attachments,
-    required SnPublisher publisher,
+    String? title,
+    String? description,
+    String? language,
+    DateTime? editedAt,
+    @Default(null) DateTime? publishedAt,
+    @Default(0) int visibility,
+    String? content,
+    @Default(0) int type,
+    Map<String, dynamic>? meta,
+    @Default(0) int viewsUnique,
+    @Default(0) int viewsTotal,
+    @Default(0) int upvotes,
+    @Default(0) int downvotes,
+    @Default(0) int repliesCount,
+    String? threadedPostId,
+    SnPost? threadedPost,
+    String? repliedPostId,
+    SnPost? repliedPost,
+    String? forwardedPostId,
+    SnPost? forwardedPost,
+    @Default([]) List<SnCloudFile> attachments,
+    @Default(SnPublisher()) SnPublisher publisher,
     @Default({}) Map<String, int> reactionsCount,
-    required List<dynamic> reactions,
-    required List<dynamic> tags,
-    required List<dynamic> categories,
-    required List<dynamic> collections,
-    required DateTime createdAt,
-    required DateTime updatedAt,
-    required DateTime? deletedAt,
+    @Default([]) List<dynamic> reactions,
+    @Default([]) List<PostTag> tags,
+    @Default([]) List<PostCategory> categories,
+    @Default([]) List<dynamic> collections,
+    @Default(null) DateTime? createdAt,
+    @Default(null) DateTime? updatedAt,
+    DateTime? deletedAt,
     @Default(false) bool isTruncated,
   }) = _SnPost;
 
@@ -48,20 +50,20 @@ sealed class SnPost with _$SnPost {
 @freezed
 sealed class SnPublisher with _$SnPublisher {
   const factory SnPublisher({
-    required String id,
-    required int type,
-    required String name,
-    required String nick,
+    @Default('') String id,
+    @Default(0) int type,
+    @Default('') String name,
+    @Default('') String nick,
     @Default('') String bio,
-    required SnCloudFile? picture,
-    required SnCloudFile? background,
-    required SnAccount? account,
-    required String? accountId,
-    required DateTime createdAt,
-    required DateTime updatedAt,
-    required DateTime? deletedAt,
-    required String? realmId,
-    required SnVerificationMark? verification,
+    SnCloudFile? picture,
+    SnCloudFile? background,
+    SnAccount? account,
+    String? accountId,
+    @Default(null) DateTime? createdAt,
+    @Default(null) DateTime? updatedAt,
+    DateTime? deletedAt,
+    String? realmId,
+    SnVerificationMark? verification,
   }) = _SnPublisher;
 
   factory SnPublisher.fromJson(Map<String, dynamic> json) =>

lib/models/post.freezed.dart

@@ -16,7 +16,7 @@ T _$identity<T>(T value) => value;
 /// @nodoc
 mixin _$SnPost {
 
- String get id; String? get title; String? get description; String? get language; DateTime? get editedAt; DateTime get publishedAt; int get visibility; String? get content; int get type; Map<String, dynamic>? get meta; int get viewsUnique; int get viewsTotal; int get upvotes; int get downvotes; int get repliesCount; String? get threadedPostId; SnPost? get threadedPost; String? get repliedPostId; SnPost? get repliedPost; String? get forwardedPostId; SnPost? get forwardedPost; List<SnCloudFile> get attachments; SnPublisher get publisher; Map<String, int> get reactionsCount; List<dynamic> get reactions; List<dynamic> get tags; List<dynamic> get categories; List<dynamic> get collections; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt; bool get isTruncated;
+ String get id; String? get title; String? get description; String? get language; DateTime? get editedAt; DateTime? get publishedAt; int get visibility; String? get content; int get type; Map<String, dynamic>? get meta; int get viewsUnique; int get viewsTotal; int get upvotes; int get downvotes; int get repliesCount; String? get threadedPostId; SnPost? get threadedPost; String? get repliedPostId; SnPost? get repliedPost; String? get forwardedPostId; SnPost? get forwardedPost; List<SnCloudFile> get attachments; SnPublisher get publisher; Map<String, int> get reactionsCount; List<dynamic> get reactions; List<PostTag> get tags; List<PostCategory> get categories; List<dynamic> get collections; DateTime? get createdAt; DateTime? get updatedAt; DateTime? get deletedAt; bool get isTruncated;
 /// Create a copy of SnPost
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -49,7 +49,7 @@ abstract mixin class $SnPostCopyWith<$Res>  {
   factory $SnPostCopyWith(SnPost value, $Res Function(SnPost) _then) = _$SnPostCopyWithImpl;
 @useResult
 $Res call({
- String id, String? title, String? description, String? language, DateTime? editedAt, DateTime publishedAt, int visibility, String? content, int type, Map<String, dynamic>? meta, int viewsUnique, int viewsTotal, int upvotes, int downvotes, int repliesCount, String? threadedPostId, SnPost? threadedPost, String? repliedPostId, SnPost? repliedPost, String? forwardedPostId, SnPost? forwardedPost, List<SnCloudFile> attachments, SnPublisher publisher, Map<String, int> reactionsCount, List<dynamic> reactions, List<dynamic> tags, List<dynamic> categories, List<dynamic> collections, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, bool isTruncated
+ String id, String? title, String? description, String? language, DateTime? editedAt, DateTime? publishedAt, int visibility, String? content, int type, Map<String, dynamic>? meta, int viewsUnique, int viewsTotal, int upvotes, int downvotes, int repliesCount, String? threadedPostId, SnPost? threadedPost, String? repliedPostId, SnPost? repliedPost, String? forwardedPostId, SnPost? forwardedPost, List<SnCloudFile> attachments, SnPublisher publisher, Map<String, int> reactionsCount, List<dynamic> reactions, List<PostTag> tags, List<PostCategory> categories, List<dynamic> collections, DateTime? createdAt, DateTime? updatedAt, DateTime? deletedAt, bool isTruncated
 });
 
 
@@ -66,15 +66,15 @@ class _$SnPostCopyWithImpl<$Res>
 
 /// Create a copy of SnPost
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? title = freezed,Object? description = freezed,Object? language = freezed,Object? editedAt = freezed,Object? publishedAt = null,Object? visibility = null,Object? content = freezed,Object? type = null,Object? meta = freezed,Object? viewsUnique = null,Object? viewsTotal = null,Object? upvotes = null,Object? downvotes = null,Object? repliesCount = null,Object? threadedPostId = freezed,Object? threadedPost = freezed,Object? repliedPostId = freezed,Object? repliedPost = freezed,Object? forwardedPostId = freezed,Object? forwardedPost = freezed,Object? attachments = null,Object? publisher = null,Object? reactionsCount = null,Object? reactions = null,Object? tags = null,Object? categories = null,Object? collections = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? isTruncated = null,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? title = freezed,Object? description = freezed,Object? language = freezed,Object? editedAt = freezed,Object? publishedAt = freezed,Object? visibility = null,Object? content = freezed,Object? type = null,Object? meta = freezed,Object? viewsUnique = null,Object? viewsTotal = null,Object? upvotes = null,Object? downvotes = null,Object? repliesCount = null,Object? threadedPostId = freezed,Object? threadedPost = freezed,Object? repliedPostId = freezed,Object? repliedPost = freezed,Object? forwardedPostId = freezed,Object? forwardedPost = freezed,Object? attachments = null,Object? publisher = null,Object? reactionsCount = null,Object? reactions = null,Object? tags = null,Object? categories = null,Object? collections = null,Object? createdAt = freezed,Object? updatedAt = freezed,Object? deletedAt = freezed,Object? isTruncated = null,}) {
   return _then(_self.copyWith(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,title: freezed == title ? _self.title : title // ignore: cast_nullable_to_non_nullable
 as String?,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
 as String?,language: freezed == language ? _self.language : language // ignore: cast_nullable_to_non_nullable
 as String?,editedAt: freezed == editedAt ? _self.editedAt : editedAt // ignore: cast_nullable_to_non_nullable
-as DateTime?,publishedAt: null == publishedAt ? _self.publishedAt : publishedAt // ignore: cast_nullable_to_non_nullable
-as DateTime,visibility: null == visibility ? _self.visibility : visibility // ignore: cast_nullable_to_non_nullable
+as DateTime?,publishedAt: freezed == publishedAt ? _self.publishedAt : publishedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,visibility: null == visibility ? _self.visibility : visibility // ignore: cast_nullable_to_non_nullable
 as int,content: freezed == content ? _self.content : content // ignore: cast_nullable_to_non_nullable
 as String?,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
 as int,meta: freezed == meta ? _self.meta : meta // ignore: cast_nullable_to_non_nullable
@@ -94,11 +94,11 @@ as List<SnCloudFile>,publisher: null == publisher ? _self.publisher : publisher
 as SnPublisher,reactionsCount: null == reactionsCount ? _self.reactionsCount : reactionsCount // ignore: cast_nullable_to_non_nullable
 as Map<String, int>,reactions: null == reactions ? _self.reactions : reactions // ignore: cast_nullable_to_non_nullable
 as List<dynamic>,tags: null == tags ? _self.tags : tags // ignore: cast_nullable_to_non_nullable
-as List<dynamic>,categories: null == categories ? _self.categories : categories // ignore: cast_nullable_to_non_nullable
-as List<dynamic>,collections: null == collections ? _self.collections : collections // ignore: cast_nullable_to_non_nullable
-as List<dynamic>,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 List<PostTag>,categories: null == categories ? _self.categories : categories // ignore: cast_nullable_to_non_nullable
+as List<PostCategory>,collections: null == collections ? _self.collections : collections // ignore: cast_nullable_to_non_nullable
+as List<dynamic>,createdAt: freezed == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,updatedAt: freezed == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,isTruncated: null == isTruncated ? _self.isTruncated : isTruncated // ignore: cast_nullable_to_non_nullable
 as bool,
   ));
@@ -156,7 +156,7 @@ $SnPublisherCopyWith<$Res> get publisher {
 @JsonSerializable()
 
 class _SnPost implements SnPost {
-  const _SnPost({required this.id, required this.title, required this.description, required this.language, required this.editedAt, required this.publishedAt, required this.visibility, required this.content, required this.type, required final  Map<String, dynamic>? meta, required this.viewsUnique, required this.viewsTotal, required this.upvotes, required this.downvotes, required this.repliesCount, required this.threadedPostId, required this.threadedPost, required this.repliedPostId, required this.repliedPost, required this.forwardedPostId, required this.forwardedPost, required final  List<SnCloudFile> attachments, required this.publisher, final  Map<String, int> reactionsCount = const {}, required final  List<dynamic> reactions, required final  List<dynamic> tags, required final  List<dynamic> categories, required final  List<dynamic> collections, required this.createdAt, required this.updatedAt, required this.deletedAt, this.isTruncated = false}): _meta = meta,_attachments = attachments,_reactionsCount = reactionsCount,_reactions = reactions,_tags = tags,_categories = categories,_collections = collections;
+  const _SnPost({required this.id, this.title, this.description, this.language, this.editedAt, this.publishedAt = null, this.visibility = 0, this.content, this.type = 0, final  Map<String, dynamic>? meta, this.viewsUnique = 0, this.viewsTotal = 0, this.upvotes = 0, this.downvotes = 0, this.repliesCount = 0, this.threadedPostId, this.threadedPost, this.repliedPostId, this.repliedPost, this.forwardedPostId, this.forwardedPost, final  List<SnCloudFile> attachments = const [], this.publisher = const SnPublisher(), final  Map<String, int> reactionsCount = const {}, final  List<dynamic> reactions = const [], final  List<PostTag> tags = const [], final  List<PostCategory> categories = const [], final  List<dynamic> collections = const [], this.createdAt = null, this.updatedAt = null, this.deletedAt, this.isTruncated = false}): _meta = meta,_attachments = attachments,_reactionsCount = reactionsCount,_reactions = reactions,_tags = tags,_categories = categories,_collections = collections;
   factory _SnPost.fromJson(Map<String, dynamic> json) => _$SnPostFromJson(json);
 
 @override final  String id;
@@ -164,10 +164,10 @@ class _SnPost implements SnPost {
 @override final  String? description;
 @override final  String? language;
 @override final  DateTime? editedAt;
-@override final  DateTime publishedAt;
-@override final  int visibility;
+@override@JsonKey() final  DateTime? publishedAt;
+@override@JsonKey() final  int visibility;
 @override final  String? content;
-@override final  int type;
+@override@JsonKey() final  int type;
  final  Map<String, dynamic>? _meta;
 @override Map<String, dynamic>? get meta {
   final value = _meta;
@@ -177,11 +177,11 @@ class _SnPost implements SnPost {
   return EqualUnmodifiableMapView(value);
 }
 
-@override final  int viewsUnique;
-@override final  int viewsTotal;
-@override final  int upvotes;
-@override final  int downvotes;
-@override final  int repliesCount;
+@override@JsonKey() final  int viewsUnique;
+@override@JsonKey() final  int viewsTotal;
+@override@JsonKey() final  int upvotes;
+@override@JsonKey() final  int downvotes;
+@override@JsonKey() final  int repliesCount;
 @override final  String? threadedPostId;
 @override final  SnPost? threadedPost;
 @override final  String? repliedPostId;
@@ -189,13 +189,13 @@ class _SnPost implements SnPost {
 @override final  String? forwardedPostId;
 @override final  SnPost? forwardedPost;
  final  List<SnCloudFile> _attachments;
-@override List<SnCloudFile> get attachments {
+@override@JsonKey() List<SnCloudFile> get attachments {
   if (_attachments is EqualUnmodifiableListView) return _attachments;
   // ignore: implicit_dynamic_type
   return EqualUnmodifiableListView(_attachments);
 }
 
-@override final  SnPublisher publisher;
+@override@JsonKey() final  SnPublisher publisher;
  final  Map<String, int> _reactionsCount;
 @override@JsonKey() Map<String, int> get reactionsCount {
   if (_reactionsCount is EqualUnmodifiableMapView) return _reactionsCount;
@@ -204,35 +204,35 @@ class _SnPost implements SnPost {
 }
 
  final  List<dynamic> _reactions;
-@override List<dynamic> get reactions {
+@override@JsonKey() List<dynamic> get reactions {
   if (_reactions is EqualUnmodifiableListView) return _reactions;
   // ignore: implicit_dynamic_type
   return EqualUnmodifiableListView(_reactions);
 }
 
- final  List<dynamic> _tags;
-@override List<dynamic> get tags {
+ final  List<PostTag> _tags;
+@override@JsonKey() List<PostTag> get tags {
   if (_tags is EqualUnmodifiableListView) return _tags;
   // ignore: implicit_dynamic_type
   return EqualUnmodifiableListView(_tags);
 }
 
- final  List<dynamic> _categories;
-@override List<dynamic> get categories {
+ final  List<PostCategory> _categories;
+@override@JsonKey() List<PostCategory> get categories {
   if (_categories is EqualUnmodifiableListView) return _categories;
   // ignore: implicit_dynamic_type
   return EqualUnmodifiableListView(_categories);
 }
 
  final  List<dynamic> _collections;
-@override List<dynamic> get collections {
+@override@JsonKey() List<dynamic> get collections {
   if (_collections is EqualUnmodifiableListView) return _collections;
   // ignore: implicit_dynamic_type
   return EqualUnmodifiableListView(_collections);
 }
 
-@override final  DateTime createdAt;
-@override final  DateTime updatedAt;
+@override@JsonKey() final  DateTime? createdAt;
+@override@JsonKey() final  DateTime? updatedAt;
 @override final  DateTime? deletedAt;
 @override@JsonKey() final  bool isTruncated;
 
@@ -269,7 +269,7 @@ abstract mixin class _$SnPostCopyWith<$Res> implements $SnPostCopyWith<$Res> {
   factory _$SnPostCopyWith(_SnPost value, $Res Function(_SnPost) _then) = __$SnPostCopyWithImpl;
 @override @useResult
 $Res call({
- String id, String? title, String? description, String? language, DateTime? editedAt, DateTime publishedAt, int visibility, String? content, int type, Map<String, dynamic>? meta, int viewsUnique, int viewsTotal, int upvotes, int downvotes, int repliesCount, String? threadedPostId, SnPost? threadedPost, String? repliedPostId, SnPost? repliedPost, String? forwardedPostId, SnPost? forwardedPost, List<SnCloudFile> attachments, SnPublisher publisher, Map<String, int> reactionsCount, List<dynamic> reactions, List<dynamic> tags, List<dynamic> categories, List<dynamic> collections, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, bool isTruncated
+ String id, String? title, String? description, String? language, DateTime? editedAt, DateTime? publishedAt, int visibility, String? content, int type, Map<String, dynamic>? meta, int viewsUnique, int viewsTotal, int upvotes, int downvotes, int repliesCount, String? threadedPostId, SnPost? threadedPost, String? repliedPostId, SnPost? repliedPost, String? forwardedPostId, SnPost? forwardedPost, List<SnCloudFile> attachments, SnPublisher publisher, Map<String, int> reactionsCount, List<dynamic> reactions, List<PostTag> tags, List<PostCategory> categories, List<dynamic> collections, DateTime? createdAt, DateTime? updatedAt, DateTime? deletedAt, bool isTruncated
 });
 
 
@@ -286,15 +286,15 @@ class __$SnPostCopyWithImpl<$Res>
 
 /// Create a copy of SnPost
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? title = freezed,Object? description = freezed,Object? language = freezed,Object? editedAt = freezed,Object? publishedAt = null,Object? visibility = null,Object? content = freezed,Object? type = null,Object? meta = freezed,Object? viewsUnique = null,Object? viewsTotal = null,Object? upvotes = null,Object? downvotes = null,Object? repliesCount = null,Object? threadedPostId = freezed,Object? threadedPost = freezed,Object? repliedPostId = freezed,Object? repliedPost = freezed,Object? forwardedPostId = freezed,Object? forwardedPost = freezed,Object? attachments = null,Object? publisher = null,Object? reactionsCount = null,Object? reactions = null,Object? tags = null,Object? categories = null,Object? collections = null,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? isTruncated = null,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? title = freezed,Object? description = freezed,Object? language = freezed,Object? editedAt = freezed,Object? publishedAt = freezed,Object? visibility = null,Object? content = freezed,Object? type = null,Object? meta = freezed,Object? viewsUnique = null,Object? viewsTotal = null,Object? upvotes = null,Object? downvotes = null,Object? repliesCount = null,Object? threadedPostId = freezed,Object? threadedPost = freezed,Object? repliedPostId = freezed,Object? repliedPost = freezed,Object? forwardedPostId = freezed,Object? forwardedPost = freezed,Object? attachments = null,Object? publisher = null,Object? reactionsCount = null,Object? reactions = null,Object? tags = null,Object? categories = null,Object? collections = null,Object? createdAt = freezed,Object? updatedAt = freezed,Object? deletedAt = freezed,Object? isTruncated = null,}) {
   return _then(_SnPost(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,title: freezed == title ? _self.title : title // ignore: cast_nullable_to_non_nullable
 as String?,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
 as String?,language: freezed == language ? _self.language : language // ignore: cast_nullable_to_non_nullable
 as String?,editedAt: freezed == editedAt ? _self.editedAt : editedAt // ignore: cast_nullable_to_non_nullable
-as DateTime?,publishedAt: null == publishedAt ? _self.publishedAt : publishedAt // ignore: cast_nullable_to_non_nullable
-as DateTime,visibility: null == visibility ? _self.visibility : visibility // ignore: cast_nullable_to_non_nullable
+as DateTime?,publishedAt: freezed == publishedAt ? _self.publishedAt : publishedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,visibility: null == visibility ? _self.visibility : visibility // ignore: cast_nullable_to_non_nullable
 as int,content: freezed == content ? _self.content : content // ignore: cast_nullable_to_non_nullable
 as String?,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
 as int,meta: freezed == meta ? _self._meta : meta // ignore: cast_nullable_to_non_nullable
@@ -314,11 +314,11 @@ as List<SnCloudFile>,publisher: null == publisher ? _self.publisher : publisher
 as SnPublisher,reactionsCount: null == reactionsCount ? _self._reactionsCount : reactionsCount // ignore: cast_nullable_to_non_nullable
 as Map<String, int>,reactions: null == reactions ? _self._reactions : reactions // ignore: cast_nullable_to_non_nullable
 as List<dynamic>,tags: null == tags ? _self._tags : tags // ignore: cast_nullable_to_non_nullable
-as List<dynamic>,categories: null == categories ? _self._categories : categories // ignore: cast_nullable_to_non_nullable
-as List<dynamic>,collections: null == collections ? _self._collections : collections // ignore: cast_nullable_to_non_nullable
-as List<dynamic>,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 List<PostTag>,categories: null == categories ? _self._categories : categories // ignore: cast_nullable_to_non_nullable
+as List<PostCategory>,collections: null == collections ? _self._collections : collections // ignore: cast_nullable_to_non_nullable
+as List<dynamic>,createdAt: freezed == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,updatedAt: freezed == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,isTruncated: null == isTruncated ? _self.isTruncated : isTruncated // ignore: cast_nullable_to_non_nullable
 as bool,
   ));
@@ -376,7 +376,7 @@ $SnPublisherCopyWith<$Res> get publisher {
 /// @nodoc
 mixin _$SnPublisher {
 
- String get id; int get type; String get name; String get nick; String get bio; SnCloudFile? get picture; SnCloudFile? get background; SnAccount? get account; String? get accountId; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt; String? get realmId; SnVerificationMark? get verification;
+ String get id; int get type; String get name; String get nick; String get bio; SnCloudFile? get picture; SnCloudFile? get background; SnAccount? get account; String? get accountId; DateTime? get createdAt; DateTime? get updatedAt; DateTime? get deletedAt; String? get realmId; SnVerificationMark? get verification;
 /// Create a copy of SnPublisher
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -409,7 +409,7 @@ abstract mixin class $SnPublisherCopyWith<$Res>  {
   factory $SnPublisherCopyWith(SnPublisher value, $Res Function(SnPublisher) _then) = _$SnPublisherCopyWithImpl;
 @useResult
 $Res call({
- String id, int type, String name, String nick, String bio, SnCloudFile? picture, SnCloudFile? background, SnAccount? account, String? accountId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, String? realmId, SnVerificationMark? verification
+ String id, int type, String name, String nick, String bio, SnCloudFile? picture, SnCloudFile? background, SnAccount? account, String? accountId, DateTime? createdAt, DateTime? updatedAt, DateTime? deletedAt, String? realmId, SnVerificationMark? verification
 });
 
 
@@ -426,7 +426,7 @@ class _$SnPublisherCopyWithImpl<$Res>
 
 /// Create a copy of SnPublisher
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? type = null,Object? name = null,Object? nick = null,Object? bio = null,Object? picture = freezed,Object? background = freezed,Object? account = freezed,Object? accountId = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? realmId = freezed,Object? verification = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? type = null,Object? name = null,Object? nick = null,Object? bio = null,Object? picture = freezed,Object? background = freezed,Object? account = freezed,Object? accountId = freezed,Object? createdAt = freezed,Object? updatedAt = freezed,Object? deletedAt = freezed,Object? realmId = freezed,Object? verification = freezed,}) {
   return _then(_self.copyWith(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
@@ -437,9 +437,9 @@ as String,picture: freezed == picture ? _self.picture : picture // ignore: cast_
 as SnCloudFile?,background: freezed == background ? _self.background : background // ignore: cast_nullable_to_non_nullable
 as SnCloudFile?,account: freezed == account ? _self.account : account // ignore: cast_nullable_to_non_nullable
 as SnAccount?,accountId: freezed == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
-as String?,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
-as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
-as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
+as String?,createdAt: freezed == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,updatedAt: freezed == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,realmId: freezed == realmId ? _self.realmId : realmId // ignore: cast_nullable_to_non_nullable
 as String?,verification: freezed == verification ? _self.verification : verification // ignore: cast_nullable_to_non_nullable
 as SnVerificationMark?,
@@ -501,20 +501,20 @@ $SnVerificationMarkCopyWith<$Res>? get verification {
 @JsonSerializable()
 
 class _SnPublisher implements SnPublisher {
-  const _SnPublisher({required this.id, required this.type, required this.name, required this.nick, this.bio = '', required this.picture, required this.background, required this.account, required this.accountId, required this.createdAt, required this.updatedAt, required this.deletedAt, required this.realmId, required this.verification});
+  const _SnPublisher({this.id = '', this.type = 0, this.name = '', this.nick = '', this.bio = '', this.picture, this.background, this.account, this.accountId, this.createdAt = null, this.updatedAt = null, this.deletedAt, this.realmId, this.verification});
   factory _SnPublisher.fromJson(Map<String, dynamic> json) => _$SnPublisherFromJson(json);
 
-@override final  String id;
-@override final  int type;
-@override final  String name;
-@override final  String nick;
+@override@JsonKey() final  String id;
+@override@JsonKey() final  int type;
+@override@JsonKey() final  String name;
+@override@JsonKey() final  String nick;
 @override@JsonKey() final  String bio;
 @override final  SnCloudFile? picture;
 @override final  SnCloudFile? background;
 @override final  SnAccount? account;
 @override final  String? accountId;
-@override final  DateTime createdAt;
-@override final  DateTime updatedAt;
+@override@JsonKey() final  DateTime? createdAt;
+@override@JsonKey() final  DateTime? updatedAt;
 @override final  DateTime? deletedAt;
 @override final  String? realmId;
 @override final  SnVerificationMark? verification;
@@ -552,7 +552,7 @@ abstract mixin class _$SnPublisherCopyWith<$Res> implements $SnPublisherCopyWith
   factory _$SnPublisherCopyWith(_SnPublisher value, $Res Function(_SnPublisher) _then) = __$SnPublisherCopyWithImpl;
 @override @useResult
 $Res call({
- String id, int type, String name, String nick, String bio, SnCloudFile? picture, SnCloudFile? background, SnAccount? account, String? accountId, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt, String? realmId, SnVerificationMark? verification
+ String id, int type, String name, String nick, String bio, SnCloudFile? picture, SnCloudFile? background, SnAccount? account, String? accountId, DateTime? createdAt, DateTime? updatedAt, DateTime? deletedAt, String? realmId, SnVerificationMark? verification
 });
 
 
@@ -569,7 +569,7 @@ class __$SnPublisherCopyWithImpl<$Res>
 
 /// Create a copy of SnPublisher
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? type = null,Object? name = null,Object? nick = null,Object? bio = null,Object? picture = freezed,Object? background = freezed,Object? account = freezed,Object? accountId = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,Object? realmId = freezed,Object? verification = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? type = null,Object? name = null,Object? nick = null,Object? bio = null,Object? picture = freezed,Object? background = freezed,Object? account = freezed,Object? accountId = freezed,Object? createdAt = freezed,Object? updatedAt = freezed,Object? deletedAt = freezed,Object? realmId = freezed,Object? verification = freezed,}) {
   return _then(_SnPublisher(
 id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
 as String,type: null == type ? _self.type : type // ignore: cast_nullable_to_non_nullable
@@ -580,9 +580,9 @@ as String,picture: freezed == picture ? _self.picture : picture // ignore: cast_
 as SnCloudFile?,background: freezed == background ? _self.background : background // ignore: cast_nullable_to_non_nullable
 as SnCloudFile?,account: freezed == account ? _self.account : account // ignore: cast_nullable_to_non_nullable
 as SnAccount?,accountId: freezed == accountId ? _self.accountId : accountId // ignore: cast_nullable_to_non_nullable
-as String?,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
-as DateTime,updatedAt: null == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
-as DateTime,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
+as String?,createdAt: freezed == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,updatedAt: freezed == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable
+as DateTime?,deletedAt: freezed == deletedAt ? _self.deletedAt : deletedAt // ignore: cast_nullable_to_non_nullable
 as DateTime?,realmId: freezed == realmId ? _self.realmId : realmId // ignore: cast_nullable_to_non_nullable
 as String?,verification: freezed == verification ? _self.verification : verification // ignore: cast_nullable_to_non_nullable
 as SnVerificationMark?,

lib/models/post.g.dart

@@ -15,16 +15,19 @@ _SnPost _$SnPostFromJson(Map<String, dynamic> json) => _SnPost(
       json['edited_at'] == null
           ? null
           : DateTime.parse(json['edited_at'] as String),
-  publishedAt: DateTime.parse(json['published_at'] as String),
-  visibility: (json['visibility'] as num).toInt(),
+  publishedAt:
+      json['published_at'] == null
+          ? null
+          : DateTime.parse(json['published_at'] as String),
+  visibility: (json['visibility'] as num?)?.toInt() ?? 0,
   content: json['content'] as String?,
-  type: (json['type'] as num).toInt(),
+  type: (json['type'] as num?)?.toInt() ?? 0,
   meta: json['meta'] as Map<String, dynamic>?,
-  viewsUnique: (json['views_unique'] as num).toInt(),
-  viewsTotal: (json['views_total'] as num).toInt(),
-  upvotes: (json['upvotes'] as num).toInt(),
-  downvotes: (json['downvotes'] as num).toInt(),
-  repliesCount: (json['replies_count'] as num).toInt(),
+  viewsUnique: (json['views_unique'] as num?)?.toInt() ?? 0,
+  viewsTotal: (json['views_total'] as num?)?.toInt() ?? 0,
+  upvotes: (json['upvotes'] as num?)?.toInt() ?? 0,
+  downvotes: (json['downvotes'] as num?)?.toInt() ?? 0,
+  repliesCount: (json['replies_count'] as num?)?.toInt() ?? 0,
   threadedPostId: json['threaded_post_id'] as String?,
   threadedPost:
       json['threaded_post'] == null
@@ -41,21 +44,39 @@ _SnPost _$SnPostFromJson(Map<String, dynamic> json) => _SnPost(
           ? null
           : SnPost.fromJson(json['forwarded_post'] as Map<String, dynamic>),
   attachments:
-      (json['attachments'] as List<dynamic>)
-          .map((e) => SnCloudFile.fromJson(e as Map<String, dynamic>))
-          .toList(),
-  publisher: SnPublisher.fromJson(json['publisher'] as Map<String, dynamic>),
+      (json['attachments'] as List<dynamic>?)
+          ?.map((e) => SnCloudFile.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      const [],
+  publisher:
+      json['publisher'] == null
+          ? const SnPublisher()
+          : SnPublisher.fromJson(json['publisher'] as Map<String, dynamic>),
   reactionsCount:
       (json['reactions_count'] as Map<String, dynamic>?)?.map(
         (k, e) => MapEntry(k, (e as num).toInt()),
       ) ??
       const {},
-  reactions: json['reactions'] as List<dynamic>,
-  tags: json['tags'] as List<dynamic>,
-  categories: json['categories'] as List<dynamic>,
-  collections: json['collections'] as List<dynamic>,
-  createdAt: DateTime.parse(json['created_at'] as String),
-  updatedAt: DateTime.parse(json['updated_at'] as String),
+  reactions: json['reactions'] as List<dynamic>? ?? const [],
+  tags:
+      (json['tags'] as List<dynamic>?)
+          ?.map((e) => PostTag.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      const [],
+  categories:
+      (json['categories'] as List<dynamic>?)
+          ?.map((e) => PostCategory.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      const [],
+  collections: json['collections'] as List<dynamic>? ?? const [],
+  createdAt:
+      json['created_at'] == null
+          ? null
+          : DateTime.parse(json['created_at'] as String),
+  updatedAt:
+      json['updated_at'] == null
+          ? null
+          : DateTime.parse(json['updated_at'] as String),
   deletedAt:
       json['deleted_at'] == null
           ? null
@@ -69,7 +90,7 @@ Map<String, dynamic> _$SnPostToJson(_SnPost instance) => <String, dynamic>{
   'description': instance.description,
   'language': instance.language,
   'edited_at': instance.editedAt?.toIso8601String(),
-  'published_at': instance.publishedAt.toIso8601String(),
+  'published_at': instance.publishedAt?.toIso8601String(),
   'visibility': instance.visibility,
   'content': instance.content,
   'type': instance.type,
@@ -89,20 +110,20 @@ Map<String, dynamic> _$SnPostToJson(_SnPost instance) => <String, dynamic>{
   'publisher': instance.publisher.toJson(),
   'reactions_count': instance.reactionsCount,
   'reactions': instance.reactions,
-  'tags': instance.tags,
-  'categories': instance.categories,
+  'tags': instance.tags.map((e) => e.toJson()).toList(),
+  'categories': instance.categories.map((e) => e.toJson()).toList(),
   'collections': instance.collections,
-  'created_at': instance.createdAt.toIso8601String(),
-  'updated_at': instance.updatedAt.toIso8601String(),
+  'created_at': instance.createdAt?.toIso8601String(),
+  'updated_at': instance.updatedAt?.toIso8601String(),
   'deleted_at': instance.deletedAt?.toIso8601String(),
   'is_truncated': instance.isTruncated,
 };
 
 _SnPublisher _$SnPublisherFromJson(Map<String, dynamic> json) => _SnPublisher(
-  id: json['id'] as String,
-  type: (json['type'] as num).toInt(),
-  name: json['name'] as String,
-  nick: json['nick'] as String,
+  id: json['id'] as String? ?? '',
+  type: (json['type'] as num?)?.toInt() ?? 0,
+  name: json['name'] as String? ?? '',
+  nick: json['nick'] as String? ?? '',
   bio: json['bio'] as String? ?? '',
   picture:
       json['picture'] == null
@@ -117,8 +138,14 @@ _SnPublisher _$SnPublisherFromJson(Map<String, dynamic> json) => _SnPublisher(
           ? null
           : SnAccount.fromJson(json['account'] as Map<String, dynamic>),
   accountId: json['account_id'] as String?,
-  createdAt: DateTime.parse(json['created_at'] as String),
-  updatedAt: DateTime.parse(json['updated_at'] as String),
+  createdAt:
+      json['created_at'] == null
+          ? null
+          : DateTime.parse(json['created_at'] as String),
+  updatedAt:
+      json['updated_at'] == null
+          ? null
+          : DateTime.parse(json['updated_at'] as String),
   deletedAt:
       json['deleted_at'] == null
           ? null
@@ -143,8 +170,8 @@ Map<String, dynamic> _$SnPublisherToJson(_SnPublisher instance) =>
       'background': instance.background?.toJson(),
       'account': instance.account?.toJson(),
       'account_id': instance.accountId,
-      'created_at': instance.createdAt.toIso8601String(),
-      'updated_at': instance.updatedAt.toIso8601String(),
+      'created_at': instance.createdAt?.toIso8601String(),
+      'updated_at': instance.updatedAt?.toIso8601String(),
       'deleted_at': instance.deletedAt?.toIso8601String(),
       'realm_id': instance.realmId,
       'verification': instance.verification?.toJson(),

lib/models/post_category.dart

@@ -0,0 +1,19 @@
+
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:island/models/post.dart';
+
+part 'post_category.freezed.dart';
+part 'post_category.g.dart';
+
+@freezed
+sealed class PostCategory with _$PostCategory {
+  const factory PostCategory({
+    required String id,
+    required String slug,
+    String? name,
+    @Default([]) List<SnPost> posts,
+  }) = _PostCategory;
+
+  factory PostCategory.fromJson(Map<String, dynamic> json) =>
+      _$PostCategoryFromJson(json);
+}

lib/models/post_category.freezed.dart

@@ -0,0 +1,163 @@
+// dart format width=80
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'post_category.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+
+/// @nodoc
+mixin _$PostCategory {
+
+ String get id; String get slug; String? get name; List<SnPost> get posts;
+/// Create a copy of PostCategory
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$PostCategoryCopyWith<PostCategory> get copyWith => _$PostCategoryCopyWithImpl<PostCategory>(this as PostCategory, _$identity);
+
+  /// Serializes this PostCategory to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is PostCategory&&(identical(other.id, id) || other.id == id)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.name, name) || other.name == name)&&const DeepCollectionEquality().equals(other.posts, posts));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,slug,name,const DeepCollectionEquality().hash(posts));
+
+@override
+String toString() {
+  return 'PostCategory(id: $id, slug: $slug, name: $name, posts: $posts)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $PostCategoryCopyWith<$Res>  {
+  factory $PostCategoryCopyWith(PostCategory value, $Res Function(PostCategory) _then) = _$PostCategoryCopyWithImpl;
+@useResult
+$Res call({
+ String id, String slug, String? name, List<SnPost> posts
+});
+
+
+
+
+}
+/// @nodoc
+class _$PostCategoryCopyWithImpl<$Res>
+    implements $PostCategoryCopyWith<$Res> {
+  _$PostCategoryCopyWithImpl(this._self, this._then);
+
+  final PostCategory _self;
+  final $Res Function(PostCategory) _then;
+
+/// Create a copy of PostCategory
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? slug = null,Object? name = freezed,Object? posts = null,}) {
+  return _then(_self.copyWith(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,slug: null == slug ? _self.slug : slug // ignore: cast_nullable_to_non_nullable
+as String,name: freezed == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
+as String?,posts: null == posts ? _self.posts : posts // ignore: cast_nullable_to_non_nullable
+as List<SnPost>,
+  ));
+}
+
+}
+
+
+/// @nodoc
+@JsonSerializable()
+
+class _PostCategory implements PostCategory {
+  const _PostCategory({required this.id, required this.slug, this.name, final  List<SnPost> posts = const []}): _posts = posts;
+  factory _PostCategory.fromJson(Map<String, dynamic> json) => _$PostCategoryFromJson(json);
+
+@override final  String id;
+@override final  String slug;
+@override final  String? name;
+ final  List<SnPost> _posts;
+@override@JsonKey() List<SnPost> get posts {
+  if (_posts is EqualUnmodifiableListView) return _posts;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableListView(_posts);
+}
+
+
+/// Create a copy of PostCategory
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$PostCategoryCopyWith<_PostCategory> get copyWith => __$PostCategoryCopyWithImpl<_PostCategory>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$PostCategoryToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _PostCategory&&(identical(other.id, id) || other.id == id)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.name, name) || other.name == name)&&const DeepCollectionEquality().equals(other._posts, _posts));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,slug,name,const DeepCollectionEquality().hash(_posts));
+
+@override
+String toString() {
+  return 'PostCategory(id: $id, slug: $slug, name: $name, posts: $posts)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$PostCategoryCopyWith<$Res> implements $PostCategoryCopyWith<$Res> {
+  factory _$PostCategoryCopyWith(_PostCategory value, $Res Function(_PostCategory) _then) = __$PostCategoryCopyWithImpl;
+@override @useResult
+$Res call({
+ String id, String slug, String? name, List<SnPost> posts
+});
+
+
+
+
+}
+/// @nodoc
+class __$PostCategoryCopyWithImpl<$Res>
+    implements _$PostCategoryCopyWith<$Res> {
+  __$PostCategoryCopyWithImpl(this._self, this._then);
+
+  final _PostCategory _self;
+  final $Res Function(_PostCategory) _then;
+
+/// Create a copy of PostCategory
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? slug = null,Object? name = freezed,Object? posts = null,}) {
+  return _then(_PostCategory(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,slug: null == slug ? _self.slug : slug // ignore: cast_nullable_to_non_nullable
+as String,name: freezed == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
+as String?,posts: null == posts ? _self._posts : posts // ignore: cast_nullable_to_non_nullable
+as List<SnPost>,
+  ));
+}
+
+
+}
+
+// dart format on

lib/models/post_category.g.dart

@@ -0,0 +1,27 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'post_category.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_PostCategory _$PostCategoryFromJson(Map<String, dynamic> json) =>
+    _PostCategory(
+      id: json['id'] as String,
+      slug: json['slug'] as String,
+      name: json['name'] as String?,
+      posts:
+          (json['posts'] as List<dynamic>?)
+              ?.map((e) => SnPost.fromJson(e as Map<String, dynamic>))
+              .toList() ??
+          const [],
+    );
+
+Map<String, dynamic> _$PostCategoryToJson(_PostCategory instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'slug': instance.slug,
+      'name': instance.name,
+      'posts': instance.posts.map((e) => e.toJson()).toList(),
+    };

lib/models/post_tag.dart

@@ -0,0 +1,19 @@
+
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:island/models/post.dart';
+
+part 'post_tag.freezed.dart';
+part 'post_tag.g.dart';
+
+@freezed
+sealed class PostTag with _$PostTag {
+  const factory PostTag({
+    required String id,
+    required String slug,
+    String? name,
+    @Default([]) List<SnPost> posts,
+  }) = _PostTag;
+
+  factory PostTag.fromJson(Map<String, dynamic> json) =>
+      _$PostTagFromJson(json);
+}

lib/models/post_tag.freezed.dart

@@ -0,0 +1,163 @@
+// dart format width=80
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'post_tag.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+
+/// @nodoc
+mixin _$PostTag {
+
+ String get id; String get slug; String? get name; List<SnPost> get posts;
+/// Create a copy of PostTag
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$PostTagCopyWith<PostTag> get copyWith => _$PostTagCopyWithImpl<PostTag>(this as PostTag, _$identity);
+
+  /// Serializes this PostTag to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is PostTag&&(identical(other.id, id) || other.id == id)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.name, name) || other.name == name)&&const DeepCollectionEquality().equals(other.posts, posts));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,slug,name,const DeepCollectionEquality().hash(posts));
+
+@override
+String toString() {
+  return 'PostTag(id: $id, slug: $slug, name: $name, posts: $posts)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $PostTagCopyWith<$Res>  {
+  factory $PostTagCopyWith(PostTag value, $Res Function(PostTag) _then) = _$PostTagCopyWithImpl;
+@useResult
+$Res call({
+ String id, String slug, String? name, List<SnPost> posts
+});
+
+
+
+
+}
+/// @nodoc
+class _$PostTagCopyWithImpl<$Res>
+    implements $PostTagCopyWith<$Res> {
+  _$PostTagCopyWithImpl(this._self, this._then);
+
+  final PostTag _self;
+  final $Res Function(PostTag) _then;
+
+/// Create a copy of PostTag
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? slug = null,Object? name = freezed,Object? posts = null,}) {
+  return _then(_self.copyWith(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,slug: null == slug ? _self.slug : slug // ignore: cast_nullable_to_non_nullable
+as String,name: freezed == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
+as String?,posts: null == posts ? _self.posts : posts // ignore: cast_nullable_to_non_nullable
+as List<SnPost>,
+  ));
+}
+
+}
+
+
+/// @nodoc
+@JsonSerializable()
+
+class _PostTag implements PostTag {
+  const _PostTag({required this.id, required this.slug, this.name, final  List<SnPost> posts = const []}): _posts = posts;
+  factory _PostTag.fromJson(Map<String, dynamic> json) => _$PostTagFromJson(json);
+
+@override final  String id;
+@override final  String slug;
+@override final  String? name;
+ final  List<SnPost> _posts;
+@override@JsonKey() List<SnPost> get posts {
+  if (_posts is EqualUnmodifiableListView) return _posts;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableListView(_posts);
+}
+
+
+/// Create a copy of PostTag
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$PostTagCopyWith<_PostTag> get copyWith => __$PostTagCopyWithImpl<_PostTag>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$PostTagToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _PostTag&&(identical(other.id, id) || other.id == id)&&(identical(other.slug, slug) || other.slug == slug)&&(identical(other.name, name) || other.name == name)&&const DeepCollectionEquality().equals(other._posts, _posts));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,slug,name,const DeepCollectionEquality().hash(_posts));
+
+@override
+String toString() {
+  return 'PostTag(id: $id, slug: $slug, name: $name, posts: $posts)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$PostTagCopyWith<$Res> implements $PostTagCopyWith<$Res> {
+  factory _$PostTagCopyWith(_PostTag value, $Res Function(_PostTag) _then) = __$PostTagCopyWithImpl;
+@override @useResult
+$Res call({
+ String id, String slug, String? name, List<SnPost> posts
+});
+
+
+
+
+}
+/// @nodoc
+class __$PostTagCopyWithImpl<$Res>
+    implements _$PostTagCopyWith<$Res> {
+  __$PostTagCopyWithImpl(this._self, this._then);
+
+  final _PostTag _self;
+  final $Res Function(_PostTag) _then;
+
+/// Create a copy of PostTag
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? slug = null,Object? name = freezed,Object? posts = null,}) {
+  return _then(_PostTag(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,slug: null == slug ? _self.slug : slug // ignore: cast_nullable_to_non_nullable
+as String,name: freezed == name ? _self.name : name // ignore: cast_nullable_to_non_nullable
+as String?,posts: null == posts ? _self._posts : posts // ignore: cast_nullable_to_non_nullable
+as List<SnPost>,
+  ));
+}
+
+
+}
+
+// dart format on

lib/models/post_tag.g.dart

@@ -0,0 +1,25 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'post_tag.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_PostTag _$PostTagFromJson(Map<String, dynamic> json) => _PostTag(
+  id: json['id'] as String,
+  slug: json['slug'] as String,
+  name: json['name'] as String?,
+  posts:
+      (json['posts'] as List<dynamic>?)
+          ?.map((e) => SnPost.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      const [],
+);
+
+Map<String, dynamic> _$PostTagToJson(_PostTag instance) => <String, dynamic>{
+  'id': instance.id,
+  'slug': instance.slug,
+  'name': instance.name,
+  'posts': instance.posts.map((e) => e.toJson()).toList(),
+};

lib/models/realm.dart

@@ -10,8 +10,8 @@ sealed class SnRealm with _$SnRealm {
   const factory SnRealm({
     required String id,
     required String slug,
-    required String name,
-    required String description,
+    @Default('') String name,
+    @Default('') String description,
     required String? verifiedAs,
     required DateTime? verifiedAt,
     required bool isCommunity,

lib/models/realm.freezed.dart

@@ -117,13 +117,13 @@ $SnCloudFileCopyWith<$Res>? get background {
 @JsonSerializable()
 
 class _SnRealm implements SnRealm {
-  const _SnRealm({required this.id, required this.slug, required this.name, required this.description, required this.verifiedAs, required this.verifiedAt, required this.isCommunity, required this.isPublic, required this.picture, required this.background, required this.accountId, required this.createdAt, required this.updatedAt, required this.deletedAt});
+  const _SnRealm({required this.id, required this.slug, this.name = '', this.description = '', required this.verifiedAs, required this.verifiedAt, required this.isCommunity, required this.isPublic, required this.picture, required this.background, required this.accountId, required this.createdAt, required this.updatedAt, required this.deletedAt});
   factory _SnRealm.fromJson(Map<String, dynamic> json) => _$SnRealmFromJson(json);
 
 @override final  String id;
 @override final  String slug;
-@override final  String name;
-@override final  String description;
+@override@JsonKey() final  String name;
+@override@JsonKey() final  String description;
 @override final  String? verifiedAs;
 @override final  DateTime? verifiedAt;
 @override final  bool isCommunity;

lib/models/realm.g.dart

@@ -9,8 +9,8 @@ part of 'realm.dart';
 _SnRealm _$SnRealmFromJson(Map<String, dynamic> json) => _SnRealm(
   id: json['id'] as String,
   slug: json['slug'] as String,
-  name: json['name'] as String,
-  description: json['description'] as String,
+  name: json['name'] as String? ?? '',
+  description: json['description'] as String? ?? '',
   verifiedAs: json['verified_as'] as String?,
   verifiedAt:
       json['verified_at'] == null

lib/pods/link_preview.dart

@@ -0,0 +1,28 @@
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:island/models/embed.dart';
+import 'package:island/pods/network.dart';
+
+part 'link_preview.g.dart';
+
+@riverpod
+class LinkPreview extends _$LinkPreview {
+  @override
+  Future<SnScrappedLink?> build(String url) async {
+    final client = ref.read(apiClientProvider);
+
+    try {
+      final response = await client.get(
+        '/scrap/link',
+        queryParameters: {'url': url},
+      );
+
+      if (response.statusCode == 200 && response.data != null) {
+        return SnScrappedLink.fromJson(response.data);
+      }
+      return null;
+    } catch (e) {
+      // Return null on error to show fallback UI
+      return null;
+    }
+  }
+}

lib/pods/link_preview.g.dart

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

lib/pods/theme.dart

@@ -102,6 +102,7 @@ Future<ThemeData> createAppTheme(
     ),
     snackBarTheme: SnackBarThemeData(
       behavior: useM3 ? SnackBarBehavior.floating : SnackBarBehavior.fixed,
+      width: 480,
     ),
     appBarTheme: AppBarTheme(
       centerTitle: true,

lib/pods/userinfo.dart

@@ -32,7 +32,6 @@ class UserInfoNotifier extends StateNotifier<AsyncValue<SnAccount?>> {
     state = const AsyncValue.data(null);
     final prefs = _ref.read(sharedPreferencesProvider);
     await prefs.remove(kTokenPairStoreKey);
-    _ref.invalidate(userInfoProvider);
     _ref.invalidate(tokenProvider);
   }
 }

lib/route.dart

@@ -1,91 +1,343 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:island/route.gr.dart';
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/widgets/app_wrapper.dart';
+import 'package:island/screens/tabs.dart';
 
-@AutoRouterConfig(replaceInRouteName: 'Screen|Page,Route')
-class AppRouter extends RootStackRouter {
-  @override
-  RouteType get defaultRouteType => RouteType.adaptive();
+import 'package:island/screens/explore.dart';
+import 'package:island/screens/account.dart';
+import 'package:island/screens/notification.dart';
+import 'package:island/screens/wallet.dart';
+import 'package:island/screens/account/relationship.dart';
+import 'package:island/screens/account/profile.dart';
+import 'package:island/screens/account/me/update.dart';
+import 'package:island/screens/account/leveling.dart';
+import 'package:island/screens/account/me/settings.dart';
+import 'package:island/screens/chat/chat.dart';
+import 'package:island/screens/chat/room.dart';
+import 'package:island/screens/chat/room_detail.dart';
+import 'package:island/screens/chat/call.dart';
+import 'package:island/screens/creators/hub.dart';
+import 'package:island/screens/creators/posts/list.dart';
+import 'package:island/screens/creators/stickers/stickers.dart';
+import 'package:island/screens/creators/stickers/pack_detail.dart';
+import 'package:island/screens/creators/publishers.dart';
+import 'package:island/screens/posts/compose.dart';
+import 'package:island/screens/posts/detail.dart';
+import 'package:island/screens/posts/pub_profile.dart';
+import 'package:island/screens/auth/login.dart';
+import 'package:island/screens/auth/create_account.dart';
+import 'package:island/screens/settings.dart';
+import 'package:island/screens/realm/realms.dart';
+import 'package:island/screens/realm/detail.dart';
+import 'package:island/screens/account/event_calendar.dart';
+import 'package:island/screens/discovery/realms.dart';
 
-  @override
-  List<AutoRoute> get routes => [
-    AutoRoute(page: PostComposeRoute.page, path: '/posts/compose'),
-    AutoRoute(page: PostEditRoute.page, path: '/posts/:id/edit'),
-    AutoRoute(page: CallRoute.page, path: '/chat/:id/call'),
-    AutoRoute(page: EventCalanderRoute.page, path: '/account/:name/calendar'),
-    AutoRoute(
-      page: TabsRoute.page,
-      path: '/',
-      children: [
-        AutoRoute(
-          page: ExploreShellRoute.page,
-          path: '',
-          children: [
-            AutoRoute(page: ExploreRoute.page, path: ''),
-            AutoRoute(page: PostDetailRoute.page, path: 'posts/:id'),
-            AutoRoute(
-              page: PublisherProfileRoute.page,
-              path: 'publishers/:name',
-            ),
-          ],
-        ),
-        AutoRoute(
-          page: AccountShellRoute.page,
-          path: 'account',
-          children: [
-            AutoRoute(page: AccountRoute.page, path: ''),
-            AutoRoute(page: NotificationRoute.page, path: 'notifications'),
-            AutoRoute(page: WalletRoute.page, path: 'wallet'),
-            AutoRoute(page: RelationshipRoute.page, path: 'relationships'),
-            AutoRoute(page: AccountProfileRoute.page, path: ':name'),
-            AutoRoute(page: UpdateProfileRoute.page, path: 'me/update'),
-            AutoRoute(page: LevelingRoute.page, path: 'me/leveling'),
-            AutoRoute(page: AccountSettingsRoute.page, path: 'settings'),
-          ],
-        ),
-        AutoRoute(page: RealmListRoute.page, path: 'realms'),
-        AutoRoute(
-          page: ChatShellRoute.page,
-          path: 'chat',
-          children: [
-            AutoRoute(page: ChatListRoute.page, path: ''),
-            AutoRoute(page: ChatRoomRoute.page, path: ':id'),
-            AutoRoute(page: NewChatRoute.page, path: 'new'),
-            AutoRoute(page: EditChatRoute.page, path: ':id/edit'),
-            AutoRoute(page: ChatDetailRoute.page, path: ':id/detail'),
-          ],
-        ),
-      ],
-    ),
-    AutoRoute(
-      page: CreatorHubShellRoute.page,
-      path: '/creators',
-      children: [
-        AutoRoute(page: CreatorHubRoute.page, path: ''),
-        AutoRoute(page: CreatorPostListRoute.page, path: ':name/posts'),
-        AutoRoute(page: StickersRoute.page, path: ':name/stickers'),
-        AutoRoute(page: NewStickerPacksRoute.page, path: ':name/stickers/new'),
-        AutoRoute(
-          page: EditStickerPacksRoute.page,
-          path: ':name/stickers/:packId/edit',
-        ),
-        AutoRoute(
-          page: StickerPackDetailRoute.page,
-          path: ':name/stickers/:packId',
-        ),
-        AutoRoute(page: NewStickersRoute.page, path: ':name/stickers/new'),
-        AutoRoute(
-          page: EditStickersRoute.page,
-          path: ':name/stickers/:id/edit',
-        ),
-        AutoRoute(page: NewPublisherRoute.page, path: 'new'),
-        AutoRoute(page: EditPublisherRoute.page, path: ':name/edit'),
-      ],
-    ),
-    AutoRoute(page: LoginRoute.page, path: '/auth/login'),
-    AutoRoute(page: CreateAccountRoute.page, path: '/auth/create-account'),
-    AutoRoute(page: SettingsRoute.page, path: '/settings'),
-    AutoRoute(page: NewRealmRoute.page, path: '/realms/new'),
-    AutoRoute(page: RealmDetailRoute.page, path: '/realms/:slug'),
-    AutoRoute(page: EditRealmRoute.page, path: '/realms/:slug/edit'),
-  ];
+// Shell route keys for nested navigation
+final rootNavigatorKey = GlobalKey<NavigatorState>();
+final _shellNavigatorKey = GlobalKey<NavigatorState>();
+final _tabsShellKey = GlobalKey<NavigatorState>();
+
+// Provider for the router
+final routerProvider = Provider<GoRouter>((ref) {
+  return GoRouter(
+    navigatorKey: rootNavigatorKey,
+    initialLocation: '/',
+    routes: [
+      ShellRoute(
+        navigatorKey: _shellNavigatorKey,
+        builder: (context, state, child) {
+          return AppWrapper(child: child);
+        },
+        routes: [
+          // Standalone routes without bottom navigation
+          GoRoute(
+            path: '/posts/compose',
+            builder:
+                (context, state) => PostComposeScreen(
+                  initialState: state.extra as PostComposeInitialState?,
+                ),
+          ),
+          GoRoute(
+            path: '/posts/:id/edit',
+            builder: (context, state) {
+              final id = state.pathParameters['id']!;
+              return PostEditScreen(id: id);
+            },
+          ),
+          GoRoute(
+            path: '/chat/:id/call',
+            builder: (context, state) {
+              final id = state.pathParameters['id']!;
+              return CallScreen(roomId: id);
+            },
+          ),
+          GoRoute(
+            path: '/account/:name/calendar',
+            builder: (context, state) {
+              final name = state.pathParameters['name']!;
+              return EventCalanderScreen(name: name);
+            },
+          ),
+          ShellRoute(
+            builder:
+                (context, state, child) => CreatorHubShellScreen(child: child),
+            routes: [
+              GoRoute(
+                path: '/creators',
+                builder: (context, state) => const CreatorHubScreen(),
+              ),
+              GoRoute(
+                path: '/creators/:name/posts',
+                builder: (context, state) {
+                  final name = state.pathParameters['name']!;
+                  return CreatorPostListScreen(pubName: name);
+                },
+              ),
+              GoRoute(
+                path: '/creators/:name/stickers',
+                builder: (context, state) {
+                  final name = state.pathParameters['name']!;
+                  return StickersScreen(pubName: name);
+                },
+              ),
+              GoRoute(
+                path: '/creators/:name/stickers/new',
+                builder: (context, state) {
+                  final name = state.pathParameters['name']!;
+                  return NewStickerPacksScreen(pubName: name);
+                },
+              ),
+              GoRoute(
+                path: '/creators/:name/stickers/:packId/edit',
+                builder: (context, state) {
+                  final name = state.pathParameters['name']!;
+                  final packId = state.pathParameters['packId']!;
+                  return EditStickerPacksScreen(pubName: name, packId: packId);
+                },
+              ),
+              GoRoute(
+                path: '/creators/:name/stickers/:packId',
+                builder: (context, state) {
+                  final name = state.pathParameters['name']!;
+                  final packId = state.pathParameters['packId']!;
+                  return StickerPackDetailScreen(pubName: name, id: packId);
+                },
+              ),
+              GoRoute(
+                path: '/creators/:name/stickers/:packId/new',
+                builder: (context, state) {
+                  final packId = state.pathParameters['packId']!;
+                  return NewStickersScreen(packId: packId);
+                },
+              ),
+              GoRoute(
+                path: '/creators/:name/stickers/:packId/:id/edit',
+                builder: (context, state) {
+                  final packId = state.pathParameters['packId']!;
+                  final id = state.pathParameters['id']!;
+                  return EditStickersScreen(id: id, packId: packId);
+                },
+              ),
+              GoRoute(
+                path: '/creators/new',
+                builder: (context, state) => const NewPublisherScreen(),
+              ),
+              GoRoute(
+                path: '/creators/:name/edit',
+                builder: (context, state) {
+                  final name = state.pathParameters['name']!;
+                  return EditPublisherScreen(name: name);
+                },
+              ),
+            ],
+          ),
+
+          // Auth routes
+          GoRoute(
+            path: '/auth/login',
+            builder: (context, state) => const LoginScreen(),
+          ),
+          GoRoute(
+            path: '/auth/create-account',
+            builder: (context, state) => const CreateAccountScreen(),
+          ),
+
+          // Other routes
+          GoRoute(
+            path: '/settings',
+            builder: (context, state) => const SettingsScreen(),
+          ),
+
+          // Main tabs with TabsScreen shell
+          ShellRoute(
+            navigatorKey: _tabsShellKey,
+            builder: (context, state, child) {
+              return TabsScreen(child: child);
+            },
+            routes: [
+              // Explore tab
+              ShellRoute(
+                builder:
+                    (context, state, child) => ExploreShellScreen(child: child),
+                routes: [
+                  GoRoute(
+                    path: '/',
+                    builder: (context, state) => const ExploreScreen(),
+                  ),
+                  GoRoute(
+                    path: '/posts/:id',
+                    builder: (context, state) {
+                      final id = state.pathParameters['id']!;
+                      return PostDetailScreen(id: id);
+                    },
+                  ),
+                  GoRoute(
+                    path: '/publishers/:name',
+                    builder: (context, state) {
+                      final name = state.pathParameters['name']!;
+                      return PublisherProfileScreen(name: name);
+                    },
+                  ),
+                  GoRoute(
+                    path: '/discovery/realms',
+                    builder: (context, state) => const DiscoveryRealmsScreen(),
+                  ),
+                ],
+              ),
+
+              // Chat tab
+              ShellRoute(
+                builder:
+                    (context, state, child) => ChatShellScreen(child: child),
+                routes: [
+                  GoRoute(
+                    path: '/chat',
+                    builder: (context, state) => const ChatListScreen(),
+                  ),
+                  GoRoute(
+                    path: '/chat/new',
+                    builder: (context, state) => const NewChatScreen(),
+                  ),
+                  GoRoute(
+                    path: '/chat/:id',
+                    builder: (context, state) {
+                      final id = state.pathParameters['id']!;
+                      return ChatRoomScreen(id: id);
+                    },
+                  ),
+                  GoRoute(
+                    path: '/chat/:id/edit',
+                    builder: (context, state) {
+                      final id = state.pathParameters['id']!;
+                      return EditChatScreen(id: id);
+                    },
+                  ),
+                  GoRoute(
+                    path: '/chat/:id/detail',
+                    builder: (context, state) {
+                      final id = state.pathParameters['id']!;
+                      return ChatDetailScreen(id: id);
+                    },
+                  ),
+                ],
+              ),
+
+              // Realms tab
+              GoRoute(
+                path: '/realms',
+                builder: (context, state) => const RealmListScreen(),
+                routes: [
+                  GoRoute(
+                    path: 'new',
+                    builder: (context, state) => const NewRealmScreen(),
+                  ),
+                  GoRoute(
+                    path: ':slug',
+                    builder: (context, state) {
+                      final slug = state.pathParameters['slug']!;
+                      return RealmDetailScreen(slug: slug);
+                    },
+                  ),
+                  GoRoute(
+                    path: ':slug/edit',
+                    builder: (context, state) {
+                      final slug = state.pathParameters['slug']!;
+                      return EditRealmScreen(slug: slug);
+                    },
+                  ),
+                ],
+              ),
+
+              // Account tab
+              ShellRoute(
+                builder:
+                    (context, state, child) => AccountShellScreen(child: child),
+                routes: [
+                  GoRoute(
+                    path: '/account',
+                    builder: (context, state) => const AccountScreen(),
+                  ),
+                  GoRoute(
+                    path: '/account/notifications',
+                    builder: (context, state) => const NotificationScreen(),
+                  ),
+                  GoRoute(
+                    path: '/account/wallet',
+                    builder: (context, state) => const WalletScreen(),
+                  ),
+                  GoRoute(
+                    path: '/account/relationships',
+                    builder: (context, state) => const RelationshipScreen(),
+                  ),
+                  GoRoute(
+                    path: '/account/:name',
+                    builder: (context, state) {
+                      final name = state.pathParameters['name']!;
+                      return AccountProfileScreen(name: name);
+                    },
+                  ),
+                  GoRoute(
+                    path: '/account/me/update',
+                    builder: (context, state) => const UpdateProfileScreen(),
+                  ),
+                  GoRoute(
+                    path: '/account/me/leveling',
+                    builder: (context, state) => const LevelingScreen(),
+                  ),
+                  GoRoute(
+                    path: '/account/settings',
+                    builder: (context, state) => const AccountSettingsScreen(),
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ],
+      ),
+    ],
+  );
+});
+
+// Navigation helper functions
+class AppRouter {
+  static GoRouter of(BuildContext context) {
+    return GoRouter.of(context);
+  }
+
+  static void go(BuildContext context, String path) {
+    context.go(path);
+  }
+
+  static void push(BuildContext context, String path) {
+    context.push(path);
+  }
+
+  static void pop(BuildContext context) {
+    context.pop();
+  }
+
+  static bool canPop(BuildContext context) {
+    return context.canPop();
+  }
 }

lib/screens/account.dart

@@ -1,14 +1,13 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:flutter/services.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/pods/message.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/pods/userinfo.dart';
-import 'package:island/route.gr.dart';
 import 'package:island/screens/notification.dart';
 import 'package:island/services/responsive.dart';
 import 'package:island/widgets/account/account_name.dart';
@@ -19,9 +18,9 @@ import 'package:island/widgets/content/cloud_files.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:styled_widget/styled_widget.dart';
 
-@RoutePage()
 class AccountShellScreen extends HookConsumerWidget {
-  const AccountShellScreen({super.key});
+  final Widget child;
+  const AccountShellScreen({super.key, required this.child});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -34,17 +33,16 @@ class AccountShellScreen extends HookConsumerWidget {
           children: [
             Flexible(flex: 2, child: AccountScreen(isAside: true)),
             VerticalDivider(width: 1),
-            Flexible(flex: 3, child: AutoRouter()),
+            Flexible(flex: 3, child: child),
           ],
         ),
       );
     }
 
-    return AppBackground(isRoot: true, child: AutoRouter());
+    return AppBackground(isRoot: true, child: child);
   }
 }
 
-@RoutePage()
 class AccountScreen extends HookConsumerWidget {
   final bool isAside;
   const AccountScreen({super.key, this.isAside = false});
@@ -100,9 +98,7 @@ class AccountScreen extends HookConsumerWidget {
                           radius: 24,
                         ),
                         onTap: () {
-                          context.router.push(
-                            AccountProfileRoute(name: user.value!.name),
-                          );
+                          context.push('/account/${user.value!.name}');
                         },
                       ),
                       Expanded(
@@ -147,7 +143,7 @@ class AccountScreen extends HookConsumerWidget {
                 progress: user.value!.profile.levelingProgress,
               ),
               onTap: () {
-                context.router.push(LevelingRoute());
+                context.push('/account/me/leveling');
               },
             ).padding(horizontal: 12),
             Row(
@@ -165,7 +161,7 @@ class AccountScreen extends HookConsumerWidget {
                         ],
                       ).padding(horizontal: 16, vertical: 12),
                       onTap: () {
-                        context.router.push(CreatorHubShellRoute());
+                        context.push('/creators');
                       },
                     ),
                   ).height(140),
@@ -204,7 +200,7 @@ class AccountScreen extends HookConsumerWidget {
                 ],
               ),
               onTap: () {
-                context.router.push(NotificationRoute());
+                context.push('/account/notifications');
               },
             ),
             ListTile(
@@ -214,7 +210,7 @@ class AccountScreen extends HookConsumerWidget {
               contentPadding: EdgeInsets.symmetric(horizontal: 24),
               title: Text('wallet').tr(),
               onTap: () {
-                context.router.push(WalletRoute());
+                context.push('/account/wallet');
               },
             ),
             ListTile(
@@ -224,7 +220,7 @@ class AccountScreen extends HookConsumerWidget {
               contentPadding: EdgeInsets.symmetric(horizontal: 24),
               title: Text('relationships').tr(),
               onTap: () {
-                context.router.push(RelationshipRoute());
+                context.push('/account/relationship');
               },
             ),
             const Divider(height: 1).padding(vertical: 8),
@@ -235,7 +231,7 @@ class AccountScreen extends HookConsumerWidget {
               contentPadding: EdgeInsets.symmetric(horizontal: 24),
               title: Text('appSettings').tr(),
               onTap: () {
-                context.router.push(SettingsRoute());
+                context.push('/settings');
               },
             ),
             ListTile(
@@ -245,7 +241,7 @@ class AccountScreen extends HookConsumerWidget {
               contentPadding: EdgeInsets.symmetric(horizontal: 24),
               title: Text('updateYourProfile').tr(),
               onTap: () {
-                context.router.push(UpdateProfileRoute());
+                context.push('/account/me/update');
               },
             ),
             ListTile(
@@ -255,7 +251,7 @@ class AccountScreen extends HookConsumerWidget {
               contentPadding: EdgeInsets.symmetric(horizontal: 24),
               title: Text('accountSettings').tr(),
               onTap: () {
-                context.router.push(AccountSettingsRoute());
+                context.push('/account/me/settings');
               },
             ),
             if (kDebugMode) const Divider(height: 1).padding(vertical: 8),
@@ -320,7 +316,7 @@ class _UnauthorizedAccountScreen extends StatelessWidget {
                   child: Card(
                     child: InkWell(
                       onTap: () {
-                        context.router.push(CreateAccountRoute());
+                        context.push('/auth/create');
                       },
                       child: Padding(
                         padding: const EdgeInsets.all(16),
@@ -342,7 +338,7 @@ class _UnauthorizedAccountScreen extends StatelessWidget {
                   child: Card(
                     child: InkWell(
                       onTap: () {
-                        context.router.push(LoginRoute());
+                        context.push('/auth/login');
                       },
                       child: Padding(
                         padding: const EdgeInsets.all(16),
@@ -361,7 +357,7 @@ class _UnauthorizedAccountScreen extends StatelessWidget {
                 const Gap(8),
                 TextButton(
                   onPressed: () {
-                    context.router.push(SettingsRoute());
+                    context.push('/settings');
                   },
                   child: Text('appSettings').tr(),
                 ).center(),

lib/screens/account/event_calendar.dart

@@ -1,4 +1,3 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
@@ -12,10 +11,9 @@ import 'package:island/widgets/account/event_calendar.dart';
 import 'package:island/widgets/account/fortune_graph.dart';
 import 'package:styled_widget/styled_widget.dart';
 
-@RoutePage()
 class EventCalanderScreen extends HookConsumerWidget {
   final String name;
-  const EventCalanderScreen({super.key, @PathParam("name") required this.name});
+  const EventCalanderScreen({super.key, required this.name});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -61,7 +59,7 @@ class EventCalanderScreen extends HookConsumerWidget {
                   child: Column(
                     children: [
                       Card(
-                        margin: EdgeInsets.all(16),
+                        margin: EdgeInsets.only(left: 16, right: 16, top: 16),
                         child: Column(
                           children: [
                             // Use the reusable EventCalendarWidget
@@ -77,7 +75,6 @@ class EventCalanderScreen extends HookConsumerWidget {
                       ),
 
                       // Add the fortune graph widget
-                      const Divider(height: 1),
                       FortuneGraphWidget(
                         events: events,
                         constrainWidth: true,

lib/screens/account/leveling.dart

@@ -1,4 +1,3 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
@@ -31,7 +30,6 @@ Future<SnWalletSubscription?> accountStellarSubscription(Ref ref) async {
   }
 }
 
-@RoutePage()
 class LevelingScreen extends HookConsumerWidget {
   const LevelingScreen({super.key});
 
@@ -641,7 +639,7 @@ class LevelingScreen extends HookConsumerWidget {
         ref.invalidate(accountStellarSubscriptionProvider);
         ref.read(userInfoProvider.notifier).fetchUser();
         if (context.mounted) {
-          showSnackBar(context, 'membershipPurchaseSuccess'.tr());
+          showSnackBar('membershipPurchaseSuccess'.tr());
         }
       }
     } catch (err) {

lib/screens/account/me/settings.dart

@@ -1,6 +1,5 @@
 import 'dart:io';
 
-import 'package:auto_route/annotations.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
@@ -51,7 +50,6 @@ Future<List<SnAccountConnection>> accountConnections(Ref ref) async {
       .toList();
 }
 
-@RoutePage()
 class AccountSettingsScreen extends HookConsumerWidget {
   const AccountSettingsScreen({super.key});
 
@@ -72,7 +70,7 @@ class AccountSettingsScreen extends HookConsumerWidget {
         final client = ref.read(apiClientProvider);
         await client.delete('/accounts/me');
         if (context.mounted) {
-          showSnackBar(context, 'accountDeletionSent'.tr());
+          showSnackBar('accountDeletionSent'.tr());
         }
       } catch (err) {
         showErrorAlert(err);
@@ -100,7 +98,7 @@ class AccountSettingsScreen extends HookConsumerWidget {
           data: {'account': userInfo.value!.name, 'captcha_token': captchaTk},
         );
         if (context.mounted) {
-          showSnackBar(context, 'accountPasswordChangeSent'.tr());
+          showSnackBar('accountPasswordChangeSent'.tr());
         }
       } catch (err) {
         showErrorAlert(err);

lib/screens/account/me/settings_auth_factors.dart

@@ -205,7 +205,7 @@ class AuthFactorNewSheet extends HookConsumerWidget {
             builder: (context) => AuthFactorNewAdditonalSheet(factor: factor),
           ).then((_) {
             if (context.mounted) {
-              showSnackBar(context, 'contactMethodVerificationNeeded'.tr());
+              showSnackBar('contactMethodVerificationNeeded'.tr());
             }
             if (context.mounted) Navigator.pop(context, true);
           });

lib/screens/account/me/settings_connections.dart

@@ -181,7 +181,7 @@ class AccountConnectionNewSheet extends HookConsumerWidget {
               },
             );
             if (context.mounted) {
-              showSnackBar(context, 'accountConnectionAddSuccess'.tr());
+              showSnackBar('accountConnectionAddSuccess'.tr());
               Navigator.pop(context, true);
             }
           } catch (err) {
@@ -208,7 +208,7 @@ class AccountConnectionNewSheet extends HookConsumerWidget {
           if (context.mounted) Navigator.pop(context, true);
           break;
         default:
-          showSnackBar(context, 'accountConnectionAddError'.tr());
+          showSnackBar('accountConnectionAddError'.tr());
           return;
       }
     }

lib/screens/account/me/settings_contacts.dart

@@ -40,7 +40,7 @@ class ContactMethodSheet extends HookConsumerWidget {
         final client = ref.read(apiClientProvider);
         await client.post('/accounts/me/contacts/${contact.id}/verify');
         if (context.mounted) {
-          showSnackBar(context, 'contactMethodVerificationSent'.tr());
+          showSnackBar('contactMethodVerificationSent'.tr());
         }
       } catch (err) {
         showErrorAlert(err);
@@ -152,7 +152,7 @@ class ContactMethodNewSheet extends HookConsumerWidget {
 
     Future<void> addContactMethod() async {
       if (contentController.text.isEmpty) {
-        showSnackBar(context, 'contactMethodContentEmpty'.tr());
+        showSnackBar('contactMethodContentEmpty'.tr());
         return;
       }
 
@@ -164,7 +164,7 @@ class ContactMethodNewSheet extends HookConsumerWidget {
           data: {'type': contactType.value, 'content': contentController.text},
         );
         if (context.mounted) {
-          showSnackBar(context, 'contactMethodVerificationNeeded'.tr());
+          showSnackBar('contactMethodVerificationNeeded'.tr());
           Navigator.pop(context, true);
         }
       } catch (err) {

lib/screens/account/me/update.dart

@@ -1,4 +1,3 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:croppy/croppy.dart' hide cropImage;
 import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -20,7 +19,6 @@ import 'package:styled_widget/styled_widget.dart';
 
 const kServerSupportedLanguages = {'en-US': 'en-us', 'zh-CN': 'zh-hans'};
 
-@RoutePage()
 class UpdateProfileScreen extends HookConsumerWidget {
   const UpdateProfileScreen({super.key});
 

lib/screens/account/profile.dart

@@ -1,7 +1,7 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/chat.dart';
@@ -53,17 +53,21 @@ Future<List<SnAccountBadge>> accountBadges(Ref ref, String uname) async {
 
 @riverpod
 Future<Color?> accountAppbarForcegroundColor(Ref ref, String uname) async {
-  final account = await ref.watch(accountProvider(uname).future);
-  if (account.profile.background == null) return null;
-  final palette = await PaletteGenerator.fromImageProvider(
-    CloudImageWidget.provider(
-      fileId: account.profile.background!.id,
-      serverUrl: ref.watch(serverUrlProvider),
-    ),
-  );
-  final dominantColor = palette.dominantColor?.color;
-  if (dominantColor == null) return null;
-  return dominantColor.computeLuminance() > 0.5 ? Colors.black : Colors.white;
+  try {
+    final account = await ref.watch(accountProvider(uname).future);
+    if (account.profile.background == null) return null;
+    final palette = await PaletteGenerator.fromImageProvider(
+      CloudImageWidget.provider(
+        fileId: account.profile.background!.id,
+        serverUrl: ref.watch(serverUrlProvider),
+      ),
+    );
+    final dominantColor = palette.dominantColor?.color;
+    if (dominantColor == null) return null;
+    return dominantColor.computeLuminance() > 0.5 ? Colors.black : Colors.white;
+  } catch (_) {
+    return null;
+  }
 }
 
 @riverpod
@@ -96,13 +100,9 @@ Future<SnRelationship?> accountRelationship(Ref ref, String uname) async {
   }
 }
 
-@RoutePage()
 class AccountProfileScreen extends HookConsumerWidget {
   final String name;
-  const AccountProfileScreen({
-    super.key,
-    @PathParam("name") required this.name,
-  });
+  const AccountProfileScreen({super.key, required this.name});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -142,7 +142,7 @@ class AccountProfileScreen extends HookConsumerWidget {
     Future<void> directMessageAction() async {
       if (!account.hasValue) return;
       if (accountChat.value != null) {
-        context.router.pushPath('/chat/${accountChat.value!.id}');
+        context.push('/chat/${accountChat.value!.id}');
         return;
       }
       showLoadingModal(context);
@@ -153,7 +153,7 @@ class AccountProfileScreen extends HookConsumerWidget {
           data: {'related_user_id': account.value!.id},
         );
         final chat = SnChatRoom.fromJson(resp.data);
-        if (context.mounted) context.router.pushPath('/chat/${chat.id}');
+        if (context.mounted) context.push('/chat/${chat.id}');
         ref.invalidate(accountDirectChatProvider(name));
       } catch (err) {
         showErrorAlert(err);

lib/screens/account/relationship.dart

@@ -1,4 +1,3 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -204,7 +203,6 @@ class RelationshipListTile extends StatelessWidget {
   }
 }
 
-@RoutePage()
 class RelationshipScreen extends HookConsumerWidget {
   const RelationshipScreen({super.key});
 
@@ -217,6 +215,7 @@ class RelationshipScreen extends HookConsumerWidget {
     Future<void> addFriend() async {
       final result = await showModalBottomSheet(
         context: context,
+        useRootNavigator: true,
         builder: (context) => AccountPickerSheet(),
       );
       if (result == null) return;
@@ -242,12 +241,10 @@ class RelationshipScreen extends HookConsumerWidget {
         if (!context.mounted) return;
         if (isAccept) {
           showSnackBar(
-            context,
             'friendRequestAccepted'.tr(args: ['@${relationship.account.name}']),
           );
         } else {
           showSnackBar(
-            context,
             'friendRequestDeclined'.tr(args: ['@${relationship.account.name}']),
           );
         }

lib/screens/auth/create_account.dart

@@ -1,12 +1,11 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:email_validator/email_validator.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/pods/network.dart';
-import 'package:island/route.gr.dart';
 import 'package:island/screens/account/me/update.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
@@ -16,7 +15,6 @@ import 'package:url_launcher/url_launcher_string.dart';
 
 import 'captcha.dart';
 
-@RoutePage()
 class CreateAccountScreen extends HookConsumerWidget {
   const CreateAccountScreen({super.key});
 
@@ -307,7 +305,7 @@ class _PostCreateModal extends HookConsumerWidget {
             TextButton(
               onPressed: () {
                 Navigator.pop(context);
-                context.router.replace(LoginRoute());
+                context.pushReplacement('/auth/login');
               },
               child: Text('login'.tr()),
             ),

lib/screens/auth/login.dart

@@ -3,7 +3,6 @@ import 'dart:io';
 import 'dart:math' as math;
 
 import 'package:animations/animations.dart';
-import 'package:auto_route/auto_route.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -43,7 +42,6 @@ final Map<int, (String, String, IconData)> kFactorTypes = {
   4: ('authFactorPin', 'authFactorPinDescription', Symbols.nest_secure_alarm),
 };
 
-@RoutePage()
 class LoginScreen extends HookConsumerWidget {
   const LoginScreen({super.key});
 
@@ -427,7 +425,7 @@ class _LoginPickerScreen extends HookConsumerWidget {
           onPickFactor(factors!.where((x) => x == factorPicked.value).first);
           onNext();
           if (context.mounted) {
-            showSnackBar(context, err.response!.data.toString());
+            showSnackBar(err.response!.data.toString());
           }
           return;
         }

lib/screens/auth/oidc.native.dart

@@ -10,6 +10,7 @@ import 'package:gap/gap.dart';
 import 'package:island/pods/config.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/services/udid.dart';
+import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
 import 'package:styled_widget/styled_widget.dart';
 
@@ -204,12 +205,7 @@ class _OidcScreenState extends ConsumerState<OidcScreen> {
                       onPressed: () {
                         if (currentUrl != null) {
                           Clipboard.setData(ClipboardData(text: currentUrl!));
-                          ScaffoldMessenger.of(context).showSnackBar(
-                            SnackBar(
-                              content: Text('copyToClipboard').tr(),
-                              duration: const Duration(seconds: 1),
-                            ),
-                          );
+                          showSnackBar('copyToClipboard');
                         }
                       },
                     ),

lib/screens/chat/call.dart

@@ -1,4 +1,3 @@
-import 'package:auto_route/annotations.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
@@ -14,10 +13,9 @@ import 'package:livekit_client/livekit_client.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:styled_widget/styled_widget.dart';
 
-@RoutePage()
 class CallScreen extends HookConsumerWidget {
   final String roomId;
-  const CallScreen({super.key, @PathParam('id') required this.roomId});
+  const CallScreen({super.key, required this.roomId});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {

lib/screens/chat/chat.dart

@@ -1,9 +1,9 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:collection/collection.dart';
 import 'package:croppy/croppy.dart' hide cropImage;
 import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -15,7 +15,6 @@ import 'package:island/pods/call.dart';
 import 'package:island/pods/chat_summary.dart';
 import 'package:island/pods/config.dart';
 import 'package:island/pods/network.dart';
-import 'package:island/route.gr.dart';
 import 'package:island/screens/realm/realms.dart';
 import 'package:island/services/file.dart';
 import 'package:island/services/responsive.dart';
@@ -173,9 +172,9 @@ Future<List<SnChatRoom>> chatroomsJoined(Ref ref) async {
       .toList();
 }
 
-@RoutePage()
 class ChatShellScreen extends HookConsumerWidget {
-  const ChatShellScreen({super.key});
+  final Widget child;
+  const ChatShellScreen({super.key, required this.child});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -187,18 +186,17 @@ class ChatShellScreen extends HookConsumerWidget {
         child: Row(
           children: [
             Flexible(flex: 2, child: ChatListScreen(isAside: true)),
-            VerticalDivider(width: 1),
-            Flexible(flex: 4, child: AutoRouter()),
+            const VerticalDivider(width: 1),
+            Flexible(flex: 4, child: child),
           ],
         ),
       );
     }
 
-    return AppBackground(isRoot: true, child: AutoRouter());
+    return AppBackground(isRoot: true, child: child);
   }
 }
 
-@RoutePage()
 class ChatListScreen extends HookConsumerWidget {
   final bool isAside;
   const ChatListScreen({super.key, this.isAside = false});
@@ -229,7 +227,8 @@ class ChatListScreen extends HookConsumerWidget {
     Future<void> createDirectMessage() async {
       final result = await showModalBottomSheet(
         context: context,
-        builder: (context) => AccountPickerSheet(),
+        useRootNavigator: true,
+        builder: (context) => const AccountPickerSheet(),
       );
       if (result == null) return;
       final client = ref.read(apiClientProvider);
@@ -244,7 +243,7 @@ class ChatListScreen extends HookConsumerWidget {
     return AppScaffold(
       extendBody: false, // Prevent conflicts with tabs navigation
       appBar: AppBar(
-        title: Text('chat').tr(),
+        title: const Text('chat').tr(),
         bottom: TabBar(
           controller: tabController,
           tabs: [
@@ -298,7 +297,7 @@ class ChatListScreen extends HookConsumerWidget {
               showModalBottomSheet(
                 isScrollControlled: true,
                 context: context,
-                builder: (context) => _ChatInvitesSheet(),
+                builder: (context) => const _ChatInvitesSheet(),
               );
             },
           ),
@@ -309,17 +308,18 @@ class ChatListScreen extends HookConsumerWidget {
         onPressed: () {
           showModalBottomSheet(
             context: context,
+            useRootNavigator: true,
             builder:
                 (context) => Column(
                   mainAxisSize: MainAxisSize.min,
                   crossAxisAlignment: CrossAxisAlignment.stretch,
                   children: [
                     ListTile(
-                      title: Text('createChatRoom').tr(),
+                      title: const Text('createChatRoom').tr(),
                       leading: const Icon(Symbols.add),
                       onTap: () {
                         Navigator.pop(context);
-                        context.pushRoute(NewChatRoute()).then((value) {
+                        context.push('/chat/new').then((value) {
                           if (value != null) {
                             ref.invalidate(chatroomsJoinedProvider);
                           }
@@ -327,7 +327,7 @@ class ChatListScreen extends HookConsumerWidget {
                       },
                     ),
                     ListTile(
-                      title: Text('createDirectMessage').tr(),
+                      title: const Text('createDirectMessage').tr(),
                       leading: const Icon(Symbols.person),
                       onTap: () {
                         Navigator.pop(context);
@@ -400,16 +400,7 @@ class ChatListScreen extends HookConsumerWidget {
                               room: item,
                               isDirect: item.type == 1,
                               onTap: () {
-                                if (context.router.topRoute.name ==
-                                    ChatRoomRoute.name) {
-                                  context.router.replace(
-                                    ChatRoomRoute(id: item.id),
-                                  );
-                                } else {
-                                  context.router.push(
-                                    ChatRoomRoute(id: item.id),
-                                  );
-                                }
+                                context.push('/chat/${item.id}');
                               },
                             );
                           },
@@ -443,33 +434,45 @@ class ChatListScreen extends HookConsumerWidget {
 @riverpod
 Future<SnChatRoom?> chatroom(Ref ref, String? identifier) async {
   if (identifier == null) return null;
-  final client = ref.watch(apiClientProvider);
-  final resp = await client.get('/chat/$identifier');
-  return SnChatRoom.fromJson(resp.data);
+  try {
+    final client = ref.watch(apiClientProvider);
+    final resp = await client.get('/chat/$identifier');
+    return SnChatRoom.fromJson(resp.data);
+  } catch (err) {
+    if (err is DioException && err.response?.statusCode == 404) {
+      return null; // Chat room not found
+    }
+    rethrow; // Rethrow other errors
+  }
 }
 
 @riverpod
 Future<SnChatMember?> chatroomIdentity(Ref ref, String? identifier) async {
   if (identifier == null) return null;
-  final client = ref.watch(apiClientProvider);
-  final resp = await client.get('/chat/$identifier/members/me');
-  return SnChatMember.fromJson(resp.data);
+  try {
+    final client = ref.watch(apiClientProvider);
+    final resp = await client.get('/chat/$identifier/members/me');
+    return SnChatMember.fromJson(resp.data);
+  } catch (err) {
+    if (err is DioException && err.response?.statusCode == 404) {
+      return null; // Chat member not found
+    }
+    rethrow; // Rethrow other errors
+  }
 }
 
-@RoutePage()
 class NewChatScreen extends StatelessWidget {
   const NewChatScreen({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return EditChatScreen();
+    return const EditChatScreen();
   }
 }
 
-@RoutePage()
 class EditChatScreen extends HookConsumerWidget {
   final String? id;
-  const EditChatScreen({super.key, @PathParam("id") this.id});
+  const EditChatScreen({super.key, this.id});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -481,6 +484,8 @@ class EditChatScreen extends HookConsumerWidget {
     final descriptionController = useTextEditingController();
     final picture = useState<SnCloudFile?>(null);
     final background = useState<SnCloudFile?>(null);
+    final isPublic = useState(true);
+    final isCommunity = useState(false);
 
     final chat = ref.watch(chatroomProvider(id));
 
@@ -493,12 +498,14 @@ class EditChatScreen extends HookConsumerWidget {
         descriptionController.text = chat.value!.description ?? '';
         picture.value = chat.value!.picture;
         background.value = chat.value!.background;
+        isPublic.value = chat.value!.isPublic;
+        isCommunity.value = chat.value!.isCommunity;
         currentRealm.value = joinedRealms.value?.firstWhereOrNull(
           (realm) => realm.id == chat.value!.realmId,
         );
       }
       return;
-    }, [chat]);
+    }, [chat, joinedRealms]);
 
     void setPicture(String position) async {
       showLoadingModal(context);
@@ -516,9 +523,9 @@ class EditChatScreen extends HookConsumerWidget {
         image: result,
         allowedAspectRatios: [
           if (position == 'background')
-            CropAspectRatio(height: 7, width: 16)
+            const CropAspectRatio(height: 7, width: 16)
           else
-            CropAspectRatio(height: 1, width: 1),
+            const CropAspectRatio(height: 1, width: 1),
         ],
       );
       if (result == null) {
@@ -575,11 +582,13 @@ class EditChatScreen extends HookConsumerWidget {
             'background_id': background.value?.id,
             'picture_id': picture.value?.id,
             'realm_id': currentRealm.value?.id,
+            'is_public': isPublic.value,
+            'is_community': isCommunity.value,
           },
           options: Options(method: id == null ? 'POST' : 'PATCH'),
         );
         if (context.mounted) {
-          context.maybePop(SnChatRoom.fromJson(resp.data));
+          context.pop(SnChatRoom.fromJson(resp.data));
         }
       } catch (err) {
         showErrorAlert(err);
@@ -667,6 +676,19 @@ class EditChatScreen extends HookConsumerWidget {
                       (_) => FocusManager.instance.primaryFocus?.unfocus(),
                 ),
                 const SizedBox(height: 16),
+                CheckboxListTile(
+                  title: const Text('isPublic').tr(),
+                  subtitle: const Text('isPublicHint').tr(),
+                  value: isPublic.value,
+                  onChanged: (value) => isPublic.value = value ?? false,
+                ),
+                CheckboxListTile(
+                  title: const Text('isCommunity').tr(),
+                  subtitle: const Text('isCommunityHint').tr(),
+                  value: isCommunity.value,
+                  onChanged: (value) => isCommunity.value = value ?? false,
+                ),
+                const SizedBox(height: 16),
                 Align(
                   alignment: Alignment.centerRight,
                   child: TextButton.icon(
@@ -767,7 +789,7 @@ class _ChatInvitesSheet extends HookConsumerWidget {
                               ),
                               if (invite.chatRoom!.type == 1)
                                 Badge(
-                                  label: Text('directMessage').tr(),
+                                  label: const Text('directMessage').tr(),
                                   backgroundColor:
                                       Theme.of(context).colorScheme.primary,
                                   textColor:

lib/screens/chat/chat.g.dart

@@ -25,7 +25,7 @@ final chatroomsJoinedProvider =
 @Deprecated('Will be removed in 3.0. Use Ref instead')
 // ignore: unused_element
 typedef ChatroomsJoinedRef = AutoDisposeFutureProviderRef<List<SnChatRoom>>;
-String _$chatroomHash() => r'dce3c0fc407f178bb7c306a08b9fa545795a9205';
+String _$chatroomHash() => r'8dac7aaac50932e6dd213039102d43c1cf5f1d4e';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -164,7 +164,7 @@ class _ChatroomProviderElement
   String? get identifier => (origin as ChatroomProvider).identifier;
 }
 
-String _$chatroomIdentityHash() => r'4c349ea4265df7b0498cf26c82dbaabe3d868727';
+String _$chatroomIdentityHash() => r'ad6ad09b6fc4cf7c4abe146ea97f8e364a3d4fd0';
 
 /// See also [chatroomIdentity].
 @ProviderFor(chatroomIdentity)

lib/screens/chat/room.dart

@@ -1,10 +1,10 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
@@ -18,7 +18,6 @@ import 'package:island/pods/config.dart';
 import 'package:island/pods/database.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/pods/websocket.dart';
-import 'package:island/route.gr.dart';
 import 'package:island/services/responsive.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
@@ -288,15 +287,76 @@ class MessagesNotifier extends _$MessagesNotifier {
   }
 }
 
-@RoutePage()
 class ChatRoomScreen extends HookConsumerWidget {
   final String id;
-  const ChatRoomScreen({super.key, @PathParam("id") required this.id});
+  const ChatRoomScreen({super.key, required this.id});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final chatRoom = ref.watch(chatroomProvider(id));
     final chatIdentity = ref.watch(chatroomIdentityProvider(id));
+
+    if (chatIdentity.isLoading || chatRoom.isLoading) {
+      return AppScaffold(
+        appBar: AppBar(leading: const PageBackButton()),
+        body: CircularProgressIndicator().center(),
+      );
+    } else if (chatIdentity.value == null) {
+      // Identity was not found, user was not joined
+      return AppScaffold(
+        appBar: AppBar(leading: const PageBackButton()),
+        body: Center(
+          child:
+              ConstrainedBox(
+                constraints: const BoxConstraints(maxWidth: 280),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Icon(
+                      chatRoom.value?.isCommunity == true
+                          ? Symbols.person_add
+                          : Symbols.person_remove,
+                      size: 36,
+                      fill: 1,
+                    ).padding(bottom: 4),
+                    Text('chatNotJoined').tr(),
+                    if (chatRoom.value?.isCommunity != true)
+                      Text(
+                        'chatUnableJoin',
+                        textAlign: TextAlign.center,
+                      ).tr().bold()
+                    else
+                      FilledButton.tonalIcon(
+                        onPressed: () async {
+                          try {
+                            showLoadingModal(context);
+                            final apiClient = ref.read(apiClientProvider);
+                            if (chatRoom.value == null) {
+                              hideLoadingModal(context);
+                              return;
+                            }
+
+                            await apiClient.post(
+                              '/chat/${chatRoom.value!.id}/members/me',
+                            );
+                            ref.invalidate(chatroomIdentityProvider(id));
+                          } catch (err) {
+                            showErrorAlert(err);
+                          } finally {
+                            if (context.mounted) hideLoadingModal(context);
+                          }
+                        },
+                        label: Text('chatJoin').tr(),
+                        icon: const Icon(Icons.add),
+                      ).padding(top: 8),
+                  ],
+                ),
+              ).center(),
+        ),
+      );
+    }
+
     final messages = ref.watch(messagesNotifierProvider(id));
     final messagesNotifier = ref.read(messagesNotifierProvider(id).notifier);
     final ws = ref.watch(websocketProvider);
@@ -431,6 +491,28 @@ class ChatRoomScreen extends HookConsumerWidget {
       return () => subscription.cancel();
     }, [ws, chatRoom]);
 
+    useEffect(() {
+      final wsState = ref.read(websocketStateProvider.notifier);
+      wsState.sendMessage(
+        jsonEncode(
+          WebSocketPacket(
+            type: 'messages.subscribe',
+            data: {'chat_room_id': id},
+          ),
+        ),
+      );
+      return () {
+        wsState.sendMessage(
+          jsonEncode(
+            WebSocketPacket(
+              type: 'messages.unsubscribe',
+              data: {'chat_room_id': id},
+            ),
+          ),
+        );
+      };
+    }, [id]);
+
     Future<void> pickPhotoMedia() async {
       final result = await ref
           .watch(imagePickerProvider)
@@ -605,7 +687,7 @@ class ChatRoomScreen extends HookConsumerWidget {
           IconButton(
             icon: const Icon(Icons.more_vert),
             onPressed: () {
-              context.router.push(ChatDetailRoute(id: id));
+              context.push('/chat/$id/detail');
             },
           ),
           const Gap(8),
@@ -917,8 +999,10 @@ class _ChatInput extends HookConsumerWidget {
     final isMobile = !kIsWeb && (Platform.isAndroid || Platform.isIOS);
 
     void send() {
-      inputFocusNode.requestFocus();
       onSend.call();
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        inputFocusNode.requestFocus();
+      });
     }
 
     Future<void> handlePaste() async {

lib/screens/chat/room_detail.dart

@@ -1,14 +1,13 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/chat.dart';
 import 'package:island/pods/network.dart';
-import 'package:island/route.gr.dart';
 import 'package:island/screens/chat/chat.dart';
 import 'package:island/widgets/account/account_picker.dart';
 import 'package:island/widgets/alert.dart';
@@ -23,10 +22,9 @@ import 'package:styled_widget/styled_widget.dart';
 part 'room_detail.freezed.dart';
 part 'room_detail.g.dart';
 
-@RoutePage()
 class ChatDetailScreen extends HookConsumerWidget {
   final String id;
-  const ChatDetailScreen({super.key, @PathParam("id") required this.id});
+  const ChatDetailScreen({super.key, required this.id});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -49,7 +47,6 @@ class ChatDetailScreen extends HookConsumerWidget {
         ref.invalidate(chatroomIdentityProvider(id));
         if (context.mounted) {
           showSnackBar(
-            context,
             'chatNotifyLevelUpdated'.tr(args: [kNotifyLevelText[level].tr()]),
           );
         }
@@ -140,7 +137,7 @@ class ChatDetailScreen extends HookConsumerWidget {
                       setChatBreak(now);
                       Navigator.pop(context);
                       if (context.mounted) {
-                        showSnackBar(context, 'chatBreakCleared'.tr());
+                        showSnackBar('chatBreakCleared'.tr());
                       }
                     },
                   ),
@@ -152,7 +149,7 @@ class ChatDetailScreen extends HookConsumerWidget {
                       setChatBreak(now.add(const Duration(minutes: 5)));
                       Navigator.pop(context);
                       if (context.mounted) {
-                        showSnackBar(context, 'chatBreakSet'.tr(args: ['5m']));
+                        showSnackBar('chatBreakSet'.tr(args: ['5m']));
                       }
                     },
                   ),
@@ -164,7 +161,7 @@ class ChatDetailScreen extends HookConsumerWidget {
                       setChatBreak(now.add(const Duration(minutes: 10)));
                       Navigator.pop(context);
                       if (context.mounted) {
-                        showSnackBar(context, 'chatBreakSet'.tr(args: ['10m']));
+                        showSnackBar('chatBreakSet'.tr(args: ['10m']));
                       }
                     },
                   ),
@@ -176,7 +173,7 @@ class ChatDetailScreen extends HookConsumerWidget {
                       setChatBreak(now.add(const Duration(minutes: 15)));
                       Navigator.pop(context);
                       if (context.mounted) {
-                        showSnackBar(context, 'chatBreakSet'.tr(args: ['15m']));
+                        showSnackBar('chatBreakSet'.tr(args: ['15m']));
                       }
                     },
                   ),
@@ -188,7 +185,7 @@ class ChatDetailScreen extends HookConsumerWidget {
                       setChatBreak(now.add(const Duration(minutes: 30)));
                       Navigator.pop(context);
                       if (context.mounted) {
-                        showSnackBar(context, 'chatBreakSet'.tr(args: ['30m']));
+                        showSnackBar('chatBreakSet'.tr(args: ['30m']));
                       }
                     },
                   ),
@@ -208,7 +205,6 @@ class ChatDetailScreen extends HookConsumerWidget {
                             Navigator.pop(context);
                             if (context.mounted) {
                               showSnackBar(
-                                context,
                                 'chatBreakSet'.tr(args: ['${minutes}m']),
                               );
                             }
@@ -393,7 +389,7 @@ class _ChatRoomActionMenu extends HookConsumerWidget {
             if ((chatIdentity.value?.role ?? 0) >= 50)
               PopupMenuItem(
                 onTap: () {
-                  context.router.replace(EditChatRoute(id: id));
+                  context.pushReplacement('/chat/$id/edit');
                 },
                 child: Row(
                   children: [
@@ -428,9 +424,7 @@ class _ChatRoomActionMenu extends HookConsumerWidget {
                       client.delete('/chat/$id');
                       ref.invalidate(chatroomsJoinedProvider);
                       if (context.mounted) {
-                        context.router.popUntil(
-                          (route) => route is ChatRoomRoute,
-                        );
+                        context.pop();
                       }
                     }
                   });
@@ -463,9 +457,7 @@ class _ChatRoomActionMenu extends HookConsumerWidget {
                       client.delete('/chat/$id/members/me');
                       ref.invalidate(chatroomsJoinedProvider);
                       if (context.mounted) {
-                        context.router.popUntil(
-                          (route) => route is ChatRoomRoute,
-                        );
+                        context.pop();
                       }
                     }
                   });
@@ -592,8 +584,8 @@ class _ChatMemberListSheet extends HookConsumerWidget {
 
     Future<void> invitePerson() async {
       final result = await showModalBottomSheet(
-        isScrollControlled: true,
         context: context,
+        useRootNavigator: true,
         builder: (context) => const AccountPickerSheet(),
       );
       if (result == null) return;

lib/screens/creators/hub.dart

@@ -1,13 +1,12 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/post.dart';
 import 'package:island/pods/network.dart';
-import 'package:island/route.gr.dart';
 import 'package:island/screens/creators/publishers.dart';
 import 'package:island/services/responsive.dart';
 import 'package:island/widgets/alert.dart';
@@ -27,9 +26,9 @@ Future<SnPublisherStats?> publisherStats(Ref ref, String? uname) async {
   return SnPublisherStats.fromJson(resp.data);
 }
 
-@RoutePage()
 class CreatorHubShellScreen extends StatelessWidget {
-  const CreatorHubShellScreen({super.key});
+  final Widget child;
+  const CreatorHubShellScreen({super.key, required this.child});
 
   @override
   Widget build(BuildContext context) {
@@ -39,15 +38,14 @@ class CreatorHubShellScreen extends StatelessWidget {
         children: [
           SizedBox(width: 360, child: const CreatorHubScreen(isAside: true)),
           const VerticalDivider(width: 1),
-          Expanded(child: AutoRouter()),
+          Expanded(child: child),
         ],
       );
     }
-    return AutoRouter();
+    return child;
   }
 }
 
-@RoutePage()
 class CreatorHubScreen extends HookConsumerWidget {
   final bool isAside;
   const CreatorHubScreen({super.key, this.isAside = false});
@@ -65,8 +63,8 @@ class CreatorHubScreen extends HookConsumerWidget {
     );
 
     void updatePublisher() {
-      context.router
-          .push(EditPublisherRoute(name: currentPublisher.value!.name))
+      context
+          .push('/creators/${currentPublisher.value!.name}/edit')
           .then((value) async {
             if (value == null) return;
             final data = await ref.refresh(publishersManagedProvider.future);
@@ -223,7 +221,7 @@ class CreatorHubScreen extends HookConsumerWidget {
                             subtitle: Text('createPublisherHint').tr(),
                             trailing: const Icon(Symbols.chevron_right),
                             onTap: () {
-                              context.router.push(NewPublisherRoute()).then((
+                              context.push('/creators/publishers/new').then((
                                 value,
                               ) {
                                 if (value != null) {
@@ -249,10 +247,8 @@ class CreatorHubScreen extends HookConsumerWidget {
                               horizontal: 24,
                             ),
                             onTap: () {
-                              context.router.push(
-                                StickersRoute(
-                                  pubName: currentPublisher.value!.name,
-                                ),
+                              context.push(
+                                '/creators/${currentPublisher.value!.name}/stickers',
                               );
                             },
                           ),
@@ -265,10 +261,8 @@ class CreatorHubScreen extends HookConsumerWidget {
                               horizontal: 24,
                             ),
                             onTap: () {
-                              context.router.push(
-                                CreatorPostListRoute(
-                                  pubName: currentPublisher.value!.name,
-                                ),
+                              context.push(
+                                '/creators/${currentPublisher.value!.name}/posts',
                               );
                             },
                           ),

lib/screens/creators/posts/list.dart

@@ -1,6 +1,6 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/widgets/app_scaffold.dart';
@@ -8,13 +8,9 @@ import 'package:island/widgets/content/sheet.dart';
 import 'package:island/widgets/post/post_list.dart';
 import 'package:material_symbols_icons/symbols.dart';
 
-@RoutePage()
 class CreatorPostListScreen extends HookConsumerWidget {
   final String pubName;
-  const CreatorPostListScreen({
-    super.key,
-    @PathParam('name') required this.pubName,
-  });
+  const CreatorPostListScreen({super.key, required this.pubName});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -34,7 +30,7 @@ class CreatorPostListScreen extends HookConsumerWidget {
                     subtitle: Text('Create a regular post'),
                     onTap: () async {
                       Navigator.pop(context);
-                      final result = await context.router.pushPath(
+                      final result = await context.push(
                         '/posts/compose?type=0',
                       );
                       if (result == true) {
@@ -48,7 +44,7 @@ class CreatorPostListScreen extends HookConsumerWidget {
                     subtitle: Text('Create a detailed article'),
                     onTap: () async {
                       Navigator.pop(context);
-                      final result = await context.router.pushPath(
+                      final result = await context.push(
                         '/posts/compose?type=1',
                       );
                       if (result == true) {

lib/screens/creators/publishers.dart

@@ -1,10 +1,10 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:collection/collection.dart';
 import 'package:croppy/croppy.dart' hide cropImage;
 import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:island/models/file.dart';
@@ -44,7 +44,6 @@ Future<SnPublisher?> publisher(Ref ref, String? identifier) async {
   return SnPublisher.fromJson(resp.data);
 }
 
-@RoutePage()
 class NewPublisherScreen extends StatelessWidget {
   const NewPublisherScreen({super.key});
 
@@ -54,10 +53,9 @@ class NewPublisherScreen extends StatelessWidget {
   }
 }
 
-@RoutePage()
 class EditPublisherScreen extends HookConsumerWidget {
   final String? name;
-  const EditPublisherScreen({super.key, @PathParam('id') this.name});
+  const EditPublisherScreen({super.key, this.name});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -177,7 +175,7 @@ class EditPublisherScreen extends HookConsumerWidget {
           options: Options(method: name == null ? 'POST' : 'PATCH'),
         );
         if (context.mounted) {
-          context.maybePop(SnPublisher.fromJson(resp.data));
+          context.pop(SnPublisher.fromJson(resp.data));
         }
       } catch (err) {
         showErrorAlert(err);

lib/screens/creators/stickers/pack_detail.dart

@@ -1,7 +1,7 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
@@ -10,7 +10,6 @@ import 'package:google_fonts/google_fonts.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/sticker.dart';
 import 'package:island/pods/network.dart';
-import 'package:island/route.gr.dart';
 import 'package:island/screens/creators/stickers/stickers.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
@@ -34,14 +33,13 @@ Future<List<SnSticker>> stickerPackContent(Ref ref, String packId) async {
       .toList();
 }
 
-@RoutePage()
 class StickerPackDetailScreen extends HookConsumerWidget {
   final String id;
   final String pubName;
   const StickerPackDetailScreen({
     super.key,
-    @PathParam('name') required this.pubName,
-    @PathParam('packId') required this.id,
+    required this.pubName,
+    required this.id,
   });
 
   @override
@@ -76,7 +74,7 @@ class StickerPackDetailScreen extends HookConsumerWidget {
           IconButton(
             icon: const Icon(Symbols.add_circle),
             onPressed: () {
-              AutoRouter.of(context).push(NewStickersRoute(packId: id)).then((
+              context.push('/creators/stickers/$id/new').then((
                 value,
               ) {
                 if (value != null) {
@@ -175,12 +173,9 @@ class StickerPackDetailScreen extends HookConsumerWidget {
                                         title: 'edit'.tr(),
                                         image: MenuImage.icon(Symbols.edit),
                                         callback: () {
-                                          context.router
+                                          context
                                               .push(
-                                                EditStickersRoute(
-                                                  packId: id,
-                                                  id: sticker.id,
-                                                ),
+                                                '/creators/stickers/$id/edit/${sticker.id}',
                                               )
                                               .then((value) {
                                                 if (value != null) {
@@ -264,8 +259,8 @@ class _StickerPackActionMenu extends HookConsumerWidget {
           (context) => [
             PopupMenuItem(
               onTap: () {
-                context.router.push(
-                  EditStickerPacksRoute(pubName: pubName, packId: packId),
+                context.push(
+                  '/creators/$pubName/stickers/$packId/edit',
                 );
               },
               child: Row(
@@ -299,7 +294,7 @@ class _StickerPackActionMenu extends HookConsumerWidget {
                     final client = ref.watch(apiClientProvider);
                     client.delete('/stickers/$packId');
                     ref.invalidate(stickerPacksNotifierProvider);
-                    if (context.mounted) context.router.maybePop(true);
+                    if (context.mounted) context.pop(true);
                   }
                 });
               },
@@ -331,13 +326,9 @@ Future<SnSticker?> stickerPackSticker(
   return SnSticker.fromJson(resp.data);
 }
 
-@RoutePage()
 class NewStickersScreen extends StatelessWidget {
   final String packId;
-  const NewStickersScreen({
-    super.key,
-    @PathParam('packId') required this.packId,
-  });
+  const NewStickersScreen({super.key, required this.packId});
 
   @override
   Widget build(BuildContext context) {
@@ -345,15 +336,10 @@ class NewStickersScreen extends StatelessWidget {
   }
 }
 
-@RoutePage()
 class EditStickersScreen extends HookConsumerWidget {
   final String packId;
   final String? id;
-  const EditStickersScreen({
-    super.key,
-    @PathParam("packId") required this.packId,
-    @PathParam("id") required this.id,
-  });
+  const EditStickersScreen({super.key, required this.packId, required this.id});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {

lib/screens/creators/stickers/stickers.dart

@@ -1,13 +1,12 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/sticker.dart';
 import 'package:island/pods/network.dart';
-import 'package:island/route.gr.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
 import 'package:material_symbols_icons/symbols.dart';
@@ -17,10 +16,9 @@ import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';
 
 part 'stickers.g.dart';
 
-@RoutePage()
 class StickersScreen extends HookConsumerWidget {
   final String pubName;
-  const StickersScreen({super.key, @PathParam("name") required this.pubName});
+  const StickersScreen({super.key, required this.pubName});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -30,7 +28,7 @@ class StickersScreen extends HookConsumerWidget {
         actions: [
           IconButton(
             onPressed: () {
-              context.router.push(NewStickerPacksRoute(pubName: pubName)).then((
+              context.push('/creators/stickers/new?pubName=pubName').then((
                 value,
               ) {
                 if (value != null) {
@@ -73,8 +71,8 @@ class SliverStickerPacksList extends HookConsumerWidget {
                 subtitle: Text(sticker.description),
                 trailing: const Icon(Symbols.chevron_right),
                 onTap: () {
-                  context.router.push(
-                    StickerPackDetailRoute(pubName: pubName, id: sticker.id),
+                  context.push(
+                    '/creators/$pubName/stickers/${sticker.id}',
                   );
                 },
               );
@@ -137,13 +135,9 @@ Future<SnStickerPack?> stickerPack(Ref ref, String? packId) async {
   return SnStickerPack.fromJson(resp.data);
 }
 
-@RoutePage()
 class NewStickerPacksScreen extends HookConsumerWidget {
   final String pubName;
-  const NewStickerPacksScreen({
-    super.key,
-    @PathParam("name") required this.pubName,
-  });
+  const NewStickerPacksScreen({super.key, required this.pubName});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -151,15 +145,10 @@ class NewStickerPacksScreen extends HookConsumerWidget {
   }
 }
 
-@RoutePage()
 class EditStickerPacksScreen extends HookConsumerWidget {
   final String pubName;
   final String? packId;
-  const EditStickerPacksScreen({
-    super.key,
-    @PathParam("name") required this.pubName,
-    @PathParam("packId") this.packId,
-  });
+  const EditStickerPacksScreen({super.key, required this.pubName, this.packId});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -200,7 +189,7 @@ class EditStickerPacksScreen extends HookConsumerWidget {
           ),
         );
         if (!context.mounted) return;
-        context.router.maybePop(SnStickerPack.fromJson(resp.data));
+        context.pop(SnStickerPack.fromJson(resp.data));
       } catch (err) {
         showErrorAlert(err);
       } finally {

lib/screens/discovery/realms.dart

@@ -0,0 +1,64 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:gap/gap.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/widgets/app_scaffold.dart';
+import 'package:island/widgets/realm/realm_list.dart';
+import 'dart:async';
+
+class DiscoveryRealmsScreen extends HookConsumerWidget {
+  const DiscoveryRealmsScreen({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    Timer? debounceTimer;
+    final searchController = useTextEditingController();
+    final currentQuery = useState<String?>(null);
+
+    return AppScaffold(
+      appBar: AppBar(title: Text('discoverRealms'.tr())),
+      body: Stack(
+        children: [
+          CustomScrollView(
+            slivers: [
+              SliverGap(80),
+              SliverRealmList(
+                query: currentQuery.value,
+                key: ValueKey(currentQuery.value),
+              ),
+              SliverGap(MediaQuery.of(context).padding.bottom + 16),
+            ],
+          ),
+          Positioned(
+            top: 0,
+            left: 0,
+            right: 0,
+            child: Padding(
+              padding: const EdgeInsets.all(16),
+              child: SearchBar(
+                elevation: WidgetStateProperty.all(4),
+                controller: searchController,
+                hintText: 'search'.tr(),
+                leading: const Icon(Icons.search),
+                padding: WidgetStateProperty.all(
+                  const EdgeInsets.symmetric(horizontal: 24),
+                ),
+                onChanged: (value) {
+                  if (debounceTimer?.isActive ?? false) {
+                    debounceTimer?.cancel();
+                  }
+                  debounceTimer = Timer(const Duration(milliseconds: 300), () {
+                    if (currentQuery.value != value) {
+                      currentQuery.value = value;
+                    }
+                  });
+                },
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/screens/explore.dart

@@ -1,34 +1,36 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/activity.dart';
+import 'package:island/models/realm.dart';
 import 'package:island/pods/userinfo.dart';
-import 'package:island/route.gr.dart';
 import 'package:island/services/responsive.dart';
 import 'package:island/widgets/app_scaffold.dart';
 import 'package:island/models/post.dart';
 import 'package:island/widgets/check_in.dart';
 import 'package:island/widgets/post/post_item.dart';
-import 'package:island/widgets/tour/tour.dart';
 import 'package:island/screens/tabs.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';
 import 'package:island/pods/network.dart';
+import 'package:island/widgets/realm/realm_card.dart';
+import 'package:island/widgets/publisher/publisher_card.dart';
 import 'package:styled_widget/styled_widget.dart';
 
 part 'explore.g.dart';
 
-@RoutePage()
-class ExploreShellScreen extends ConsumerWidget {
-  const ExploreShellScreen({super.key});
+class ExploreShellScreen extends HookConsumerWidget {
+  final Widget child;
+  const ExploreShellScreen({super.key, required this.child});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final isWide = isWideScreen(context);
+    final isWide = MediaQuery.of(context).size.width > 640;
 
     if (isWide) {
       return AppBackground(
@@ -37,17 +39,16 @@ class ExploreShellScreen extends ConsumerWidget {
           children: [
             Flexible(flex: 2, child: ExploreScreen(isAside: true)),
             VerticalDivider(width: 1),
-            Flexible(flex: 3, child: AutoRouter()),
+            Flexible(flex: 3, child: child),
           ],
         ),
       );
     }
 
-    return AppBackground(isRoot: true, child: AutoRouter());
+    return AppBackground(isRoot: true, child: child);
   }
 }
 
-@RoutePage()
 class ExploreScreen extends HookConsumerWidget {
   final bool isAside;
   const ExploreScreen({super.key, this.isAside = false});
@@ -85,65 +86,64 @@ class ExploreScreen extends HookConsumerWidget {
       activityListNotifierProvider(currentFilter.value).notifier,
     );
 
-    return TourTriggerWidget(
-      child: AppScaffold(
-        extendBody: false, // Prevent conflicts with tabs navigation
-        appBar: AppBar(
-          toolbarHeight: 0,
-          bottom: TabBar(
-            controller: tabController,
-            tabs: [
-              Tab(
-                child: Text(
-                  'explore'.tr(),
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    color: Theme.of(context).appBarTheme.foregroundColor!,
-                  ),
-                ),
-              ),
-              Tab(
-                child: Text(
-                  'exploreFilterSubscriptions'.tr(),
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    color: Theme.of(context).appBarTheme.foregroundColor!,
-                  ),
-                ),
-              ),
-              Tab(
-                child: Text(
-                  'exploreFilterFriends'.tr(),
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    color: Theme.of(context).appBarTheme.foregroundColor!,
-                  ),
-                ),
-              ),
-            ],
-          ),
-        ),
-        floatingActionButton: FloatingActionButton(
-          heroTag: Key("explore-page-fab"),
-          onPressed: () {
-            context.router.push(PostComposeRoute()).then((value) {
-              if (value != null) {
-                activitiesNotifier.forceRefresh();
-              }
-            });
-          },
-          child: const Icon(Symbols.edit),
-        ),
-        floatingActionButtonLocation: TabbedFabLocation(context),
-        body: TabBarView(
+    return AppScaffold(
+      extendBody: false, // Prevent conflicts with tabs navigation
+      appBar: AppBar(
+        toolbarHeight: 0,
+        bottom: TabBar(
           controller: tabController,
-          children: [
-            _buildActivityList(ref, null),
-            _buildActivityList(ref, 'subscriptions'),
-            _buildActivityList(ref, 'friends'),
+          tabs: [
+            Tab(
+              child: Text(
+                'explore'.tr(),
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                  color: Theme.of(context).appBarTheme.foregroundColor!,
+                ),
+              ),
+            ),
+            Tab(
+              child: Text(
+                'exploreFilterSubscriptions'.tr(),
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                  color: Theme.of(context).appBarTheme.foregroundColor!,
+                ),
+              ),
+            ),
+            Tab(
+              child: Text(
+                'exploreFilterFriends'.tr(),
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                  color: Theme.of(context).appBarTheme.foregroundColor!,
+                ),
+              ),
+            ),
           ],
         ),
       ),
+      floatingActionButton: FloatingActionButton(
+        heroTag: Key("explore-page-fab"),
+        onPressed: () {
+          context.push('/posts/compose').then((value) {
+            if (value != null) {
+              activitiesNotifier.forceRefresh();
+            }
+          });
+        },
+        child: const Icon(Symbols.edit),
+      ),
+      floatingActionButtonLocation: TabbedFabLocation(context),
+      body: TabBarView(
+        controller: tabController,
+        physics: const NeverScrollableScrollPhysics(),
+        children: [
+          _buildActivityList(ref, null),
+          _buildActivityList(ref, 'subscriptions'),
+          _buildActivityList(ref, 'friends'),
+        ],
+      ),
     );
   }
 
@@ -173,6 +173,64 @@ class ExploreScreen extends HookConsumerWidget {
   }
 }
 
+class _DiscoveryActivityItem extends StatelessWidget {
+  final Map<String, dynamic> data;
+
+  const _DiscoveryActivityItem({required this.data});
+
+  @override
+  Widget build(BuildContext context) {
+    final items = data['items'] as List;
+    final type = items.firstOrNull?['type'] ?? 'unknown';
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Row(
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            const Icon(Symbols.explore, size: 19),
+            const Gap(8),
+            Text(
+              (switch (type) {
+                'realm' => 'discoverRealms',
+                'publisher' => 'discoverPublishers',
+                _ => 'unknown',
+              }).tr(),
+              style: Theme.of(context).textTheme.titleMedium,
+            ).padding(top: 1),
+          ],
+        ).padding(horizontal: 20, top: 8, bottom: 4),
+        SizedBox(
+          height: 180,
+          child: ListView.builder(
+            scrollDirection: Axis.horizontal,
+            itemCount: items.length,
+            padding: const EdgeInsets.symmetric(horizontal: 8),
+            itemBuilder: (context, index) {
+              final item = items[index];
+              switch (type) {
+                case 'realm':
+                  return RealmCard(
+                    realm: SnRealm.fromJson(item['data']),
+                    maxWidth: 280,
+                  );
+                case 'publisher':
+                  return PublisherCard(
+                    publisher: SnPublisher.fromJson(item['data']),
+                    maxWidth: 280,
+                  );
+                default:
+                  return Placeholder();
+              }
+            },
+          ),
+        ).padding(bottom: 4),
+      ],
+    );
+  }
+}
+
 class _ActivityListView extends HookConsumerWidget {
   final CursorPagingData<SnActivity> data;
   final int widgetCount;
@@ -216,10 +274,14 @@ class _ActivityListView extends HookConsumerWidget {
                 itemWidget = PostItem(
                   backgroundColor:
                       isWideScreen(context) ? Colors.transparent : null,
-                  item: SnPost.fromJson(item.data),
+                  item: SnPost.fromJson(item.data!),
                   padding:
                       isReply
-                          ? EdgeInsets.only(left: 16, right: 16, bottom: 16)
+                          ? const EdgeInsets.only(
+                            left: 16,
+                            right: 16,
+                            bottom: 16,
+                          )
                           : null,
                   onRefresh: (_) {
                     activitiesNotifier.forceRefresh();
@@ -247,6 +309,9 @@ class _ActivityListView extends HookConsumerWidget {
                   );
                 }
                 break;
+              case 'discovery':
+                itemWidget = _DiscoveryActivityItem(data: item.data!);
+                break;
               default:
                 itemWidget = const Placeholder();
             }
@@ -276,6 +341,7 @@ class ActivityListNotifier extends _$ActivityListNotifier
       if (cursor != null) 'cursor': cursor,
       'take': take,
       if (filter != null) 'filter': filter,
+      if (kDebugMode) 'debugInclude': 'realms,publishers',
     };
 
     final response = await client.get(

lib/screens/explore.g.dart

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

lib/screens/notification.dart

@@ -1,22 +1,21 @@
 import 'dart:async';
 import 'dart:math' as math;
 
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
+import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/user.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/pods/websocket.dart';
-import 'package:island/widgets/alert.dart';
+import 'package:island/route.dart';
 import 'package:island/widgets/app_scaffold.dart';
 import 'package:island/widgets/content/markdown.dart';
 import 'package:relative_time/relative_time.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';
 import 'package:styled_widget/styled_widget.dart';
-import 'package:url_launcher/url_launcher.dart';
+import 'package:url_launcher/url_launcher_string.dart';
 
 part 'notification.g.dart';
 
@@ -107,7 +106,6 @@ class NotificationListNotifier extends _$NotificationListNotifier
   }
 }
 
-@RoutePage()
 class NotificationScreen extends HookConsumerWidget {
   const NotificationScreen({super.key});
 
@@ -181,37 +179,17 @@ class NotificationScreen extends HookConsumerWidget {
                             ),
                           ),
                   onTap: () {
-                    if (notification.meta['link'] is String) {
-                      final href = notification.meta['link'];
-                      final uri = Uri.tryParse(href);
-                      if (uri == null) {
-                        showSnackBar(
-                          context,
-                          'brokenLink'.tr(args: []),
-                          action: SnackBarAction(
-                            label: 'copyToClipboard'.tr(),
-                            onPressed: () {
-                              Clipboard.setData(ClipboardData(text: href));
-                              clearSnackBar(context);
-                            },
-                          ),
+                    if (notification.meta['action_uri'] != null) {
+                      var uri = notification.meta['action_uri'] as String;
+                      if (uri.startsWith('/')) {
+                        // In-app routes
+                        rootNavigatorKey.currentContext?.push(
+                          notification.meta['action_uri'],
                         );
-                        return;
+                      } else {
+                        // External URLs
+                        launchUrlString(uri);
                       }
-                      if (uri.scheme == 'solian') {
-                        context.router.pushPath(
-                          ['', uri.host, ...uri.pathSegments].join('/'),
-                        );
-                        return;
-                      }
-                      showConfirmAlert(
-                        'openLinkConfirmDescription'.tr(args: [href]),
-                        'openLinkConfirm'.tr(),
-                      ).then((value) {
-                        if (value) {
-                          launchUrl(uri, mode: LaunchMode.externalApplication);
-                        }
-                      });
                     }
                   },
                 );

lib/screens/posts/compose.dart

@@ -1,7 +1,7 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/file.dart';
@@ -22,10 +22,26 @@ import 'package:island/widgets/post/draft_manager.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:styled_widget/styled_widget.dart';
 
-@RoutePage()
+part 'compose.freezed.dart';
+part 'compose.g.dart';
+
+@freezed
+sealed class PostComposeInitialState with _$PostComposeInitialState {
+  const factory PostComposeInitialState({
+    String? title,
+    String? description,
+    String? content,
+    @Default([]) List<UniversalFile> attachments,
+    int? visibility,
+  }) = _PostComposeInitialState;
+
+  factory PostComposeInitialState.fromJson(Map<String, dynamic> json) =>
+      _$PostComposeInitialStateFromJson(json);
+}
+
 class PostEditScreen extends HookConsumerWidget {
   final String id;
-  const PostEditScreen({super.key, @PathParam('id') required this.id});
+  const PostEditScreen({super.key, required this.id});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -48,22 +64,21 @@ class PostEditScreen extends HookConsumerWidget {
   }
 }
 
-@RoutePage()
 class PostComposeScreen extends HookConsumerWidget {
   final SnPost? originalPost;
   final SnPost? repliedPost;
   final SnPost? forwardedPost;
   final int? type;
+  final PostComposeInitialState? initialState;
   const PostComposeScreen({
     super.key,
     this.originalPost,
     this.repliedPost,
     this.forwardedPost,
-    @QueryParam('type') this.type,
+    this.type,
+    this.initialState,
   });
 
-
-
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     // Determine the compose type: auto-detect from edited post or use query parameter
@@ -88,10 +103,27 @@ class PostComposeScreen extends HookConsumerWidget {
         originalPost: originalPost,
         forwardedPost: effectiveForwardedPost,
         repliedPost: effectiveRepliedPost,
+        postType: 0, // Regular post type
       ),
       [originalPost, effectiveForwardedPost, effectiveRepliedPost],
     );
 
+    // Add a listener to the entire state to trigger rebuilds
+    final stateNotifier = useMemoized(
+      () => Listenable.merge([
+        state.titleController,
+        state.descriptionController,
+        state.contentController,
+        state.visibility,
+        state.attachments,
+        state.attachmentProgress,
+        state.currentPublisher,
+        state.submitting,
+      ]),
+      [state],
+    );
+    useListenable(stateNotifier);
+
     // Start auto-save when component mounts
     useEffect(() {
       if (originalPost == null) {
@@ -109,23 +141,45 @@ class PostComposeScreen extends HookConsumerWidget {
       return null;
     }, [publishers]);
 
-    // Load draft if available (only for new posts)
+    // Load initial state if provided (for sharing functionality)
+    useEffect(() {
+      if (initialState != null) {
+        state.titleController.text = initialState!.title ?? '';
+        state.descriptionController.text = initialState!.description ?? '';
+        state.contentController.text = initialState!.content ?? '';
+        if (initialState!.visibility != null) {
+          state.visibility.value = initialState!.visibility!;
+        }
+        if (initialState!.attachments.isNotEmpty) {
+          state.attachments.value = List.from(initialState!.attachments);
+        }
+      }
+      return null;
+    }, [initialState]);
+
+    // Load draft if available (only for new posts without initial state)
     useEffect(() {
       if (originalPost == null &&
           effectiveForwardedPost == null &&
-          effectiveRepliedPost == null) {
+          effectiveRepliedPost == null &&
+          initialState == null) {
         // Try to load the most recent draft
         final drafts = ref.read(composeStorageNotifierProvider);
         if (drafts.isNotEmpty) {
           final mostRecentDraft = drafts.values.reduce(
-            (a, b) => a.lastModified.isAfter(b.lastModified) ? a : b,
+            (a, b) =>
+                (a.updatedAt ?? DateTime(0)).isAfter(b.updatedAt ?? DateTime(0))
+                    ? a
+                    : b,
           );
 
           // Only load if the draft has meaningful content
-          if (!mostRecentDraft.isEmpty) {
-            state.titleController.text = mostRecentDraft.title;
-            state.descriptionController.text = mostRecentDraft.description;
-            state.contentController.text = mostRecentDraft.content;
+          if (mostRecentDraft.content?.isNotEmpty == true ||
+              mostRecentDraft.title?.isNotEmpty == true) {
+            state.titleController.text = mostRecentDraft.title ?? '';
+            state.descriptionController.text =
+                mostRecentDraft.description ?? '';
+            state.contentController.text = mostRecentDraft.content ?? '';
             state.visibility.value = mostRecentDraft.visibility;
           }
         }
@@ -152,6 +206,8 @@ class PostComposeScreen extends HookConsumerWidget {
               titleController: state.titleController,
               descriptionController: state.descriptionController,
               visibility: state.visibility,
+              tagsController: state.tagsController,
+              categoriesController: state.categoriesController,
               onVisibilityChanged: () {
                 // Trigger rebuild if needed
               },
@@ -162,30 +218,27 @@ class PostComposeScreen extends HookConsumerWidget {
     Widget buildWideAttachmentGrid() {
       return GridView.builder(
         shrinkWrap: true,
+        padding: EdgeInsets.zero,
         physics: const NeverScrollableScrollPhysics(),
         gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-          crossAxisCount: 3,
+          crossAxisCount: 2,
           crossAxisSpacing: 8,
           mainAxisSpacing: 8,
         ),
         itemCount: state.attachments.value.length,
         itemBuilder: (context, idx) {
-          return ValueListenableBuilder<Map<int, double>>(
-            valueListenable: state.attachmentProgress,
-            builder: (context, progressMap, _) {
-              return AttachmentPreview(
-                item: state.attachments.value[idx],
-                progress: progressMap[idx],
-                onRequestUpload:
-                    () => ComposeLogic.uploadAttachment(ref, state, idx),
-                onDelete: () => ComposeLogic.deleteAttachment(ref, state, idx),
-                onMove: (delta) {
-                  state.attachments.value = ComposeLogic.moveAttachment(
-                    state.attachments.value,
-                    idx,
-                    delta,
-                  );
-                },
+          final progressMap = state.attachmentProgress.value;
+          return AttachmentPreview(
+            item: state.attachments.value[idx],
+            progress: progressMap[idx],
+            onRequestUpload:
+                () => ComposeLogic.uploadAttachment(ref, state, idx),
+            onDelete: () => ComposeLogic.deleteAttachment(ref, state, idx),
+            onMove: (delta) {
+              state.attachments.value = ComposeLogic.moveAttachment(
+                state.attachments.value,
+                idx,
+                delta,
               );
             },
           );
@@ -199,26 +252,24 @@ class PostComposeScreen extends HookConsumerWidget {
           for (var idx = 0; idx < state.attachments.value.length; idx++)
             Container(
               margin: const EdgeInsets.only(bottom: 8),
-              child: ValueListenableBuilder<Map<int, double>>(
-                valueListenable: state.attachmentProgress,
-                builder: (context, progressMap, _) {
-                  return AttachmentPreview(
-                    item: state.attachments.value[idx],
-                    progress: progressMap[idx],
-                    onRequestUpload:
-                        () => ComposeLogic.uploadAttachment(ref, state, idx),
-                    onDelete:
-                        () => ComposeLogic.deleteAttachment(ref, state, idx),
-                    onMove: (delta) {
-                      state.attachments.value = ComposeLogic.moveAttachment(
-                        state.attachments.value,
-                        idx,
-                        delta,
-                      );
-                    },
-                  );
-                },
-              ),
+              child: () {
+                final progressMap = state.attachmentProgress.value;
+                return AttachmentPreview(
+                  item: state.attachments.value[idx],
+                  progress: progressMap[idx],
+                  onRequestUpload:
+                      () => ComposeLogic.uploadAttachment(ref, state, idx),
+                  onDelete:
+                      () => ComposeLogic.deleteAttachment(ref, state, idx),
+                  onMove: (delta) {
+                    state.attachments.value = ComposeLogic.moveAttachment(
+                      state.attachments.value,
+                      idx,
+                      delta,
+                    );
+                  },
+                );
+              }(),
             ),
         ],
       );
@@ -245,17 +296,17 @@ class PostComposeScreen extends HookConsumerWidget {
                     isScrollControlled: true,
                     builder:
                         (context) => DraftManagerSheet(
-                          isArticle: false,
                           onDraftSelected: (draftId) {
                             final draft =
                                 ref.read(
                                   composeStorageNotifierProvider,
                                 )[draftId];
                             if (draft != null) {
-                              state.titleController.text = draft.title;
+                              state.titleController.text = draft.title ?? '';
                               state.descriptionController.text =
-                                  draft.description;
-                              state.contentController.text = draft.content;
+                                  draft.description ?? '';
+                              state.contentController.text =
+                                  draft.content ?? '';
                               state.visibility.value = draft.visibility;
                             }
                           },
@@ -274,39 +325,31 @@ class PostComposeScreen extends HookConsumerWidget {
               onPressed: showSettingsSheet,
               tooltip: 'postSettings'.tr(),
             ),
-            ValueListenableBuilder<bool>(
-              valueListenable: state.submitting,
-              builder: (context, submitting, _) {
-                return IconButton(
-                  onPressed:
-                      submitting
-                          ? null
-                          : () => ComposeLogic.performAction(
-                            ref,
-                            state,
-                            context,
-                            originalPost: originalPost,
-                            repliedPost: repliedPost,
-                            forwardedPost: forwardedPost,
-                            postType: 0, // Regular post type
-                          ),
-                  icon:
-                      submitting
-                          ? SizedBox(
-                            width: 28,
-                            height: 28,
-                            child: const CircularProgressIndicator(
-                              color: Colors.white,
-                              strokeWidth: 2.5,
-                            ),
-                          ).center()
-                          : Icon(
-                            originalPost != null
-                                ? Symbols.edit
-                                : Symbols.upload,
-                          ),
-                );
-              },
+            IconButton(
+              onPressed:
+                  state.submitting.value
+                      ? null
+                      : () => ComposeLogic.performAction(
+                        ref,
+                        state,
+                        context,
+                        originalPost: originalPost,
+                        repliedPost: repliedPost,
+                        forwardedPost: forwardedPost,
+                      ),
+              icon:
+                  state.submitting.value
+                      ? SizedBox(
+                        width: 28,
+                        height: 28,
+                        child: const CircularProgressIndicator(
+                          color: Colors.white,
+                          strokeWidth: 2.5,
+                        ),
+                      ).center()
+                      : Icon(
+                        originalPost != null ? Symbols.edit : Symbols.upload,
+                      ),
             ),
             const Gap(8),
           ],
@@ -320,7 +363,7 @@ class PostComposeScreen extends HookConsumerWidget {
             // Main content area
             Expanded(
               child: ConstrainedBox(
-                constraints: const BoxConstraints(maxWidth: 480),
+                constraints: const BoxConstraints(maxWidth: 560),
                 child: Row(
                   spacing: 12,
                   crossAxisAlignment: CrossAxisAlignment.start,
@@ -367,7 +410,6 @@ class PostComposeScreen extends HookConsumerWidget {
                                     originalPost: originalPost,
                                     repliedPost: repliedPost,
                                     forwardedPost: forwardedPost,
-                                    postType: 0, // Regular post type
                                   ),
                               child: TextField(
                                 controller: state.contentController,
@@ -388,22 +430,17 @@ class PostComposeScreen extends HookConsumerWidget {
                             const Gap(8),
 
                             // Attachments preview
-                            ValueListenableBuilder<List<UniversalFile>>(
-                              valueListenable: state.attachments,
-                              builder: (context, attachments, _) {
-                                if (attachments.isEmpty) {
-                                  return const SizedBox.shrink();
-                                }
-                                return LayoutBuilder(
-                                  builder: (context, constraints) {
-                                    final isWide = isWideScreen(context);
-                                    return isWide
-                                        ? buildWideAttachmentGrid()
-                                        : buildNarrowAttachmentList();
-                                  },
-                                );
-                              },
-                            ),
+                            if (state.attachments.value.isNotEmpty)
+                              LayoutBuilder(
+                                builder: (context, constraints) {
+                                  final isWide = isWideScreen(context);
+                                  return isWide
+                                      ? buildWideAttachmentGrid()
+                                      : buildNarrowAttachmentList();
+                                },
+                              )
+                            else
+                              const SizedBox.shrink(),
                           ],
                         ),
                       ),

lib/screens/posts/compose.freezed.dart

@@ -0,0 +1,166 @@
+// dart format width=80
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'compose.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+
+/// @nodoc
+mixin _$PostComposeInitialState {
+
+ String? get title; String? get description; String? get content; List<UniversalFile> get attachments; int? get visibility;
+/// Create a copy of PostComposeInitialState
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$PostComposeInitialStateCopyWith<PostComposeInitialState> get copyWith => _$PostComposeInitialStateCopyWithImpl<PostComposeInitialState>(this as PostComposeInitialState, _$identity);
+
+  /// Serializes this PostComposeInitialState to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is PostComposeInitialState&&(identical(other.title, title) || other.title == title)&&(identical(other.description, description) || other.description == description)&&(identical(other.content, content) || other.content == content)&&const DeepCollectionEquality().equals(other.attachments, attachments)&&(identical(other.visibility, visibility) || other.visibility == visibility));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,title,description,content,const DeepCollectionEquality().hash(attachments),visibility);
+
+@override
+String toString() {
+  return 'PostComposeInitialState(title: $title, description: $description, content: $content, attachments: $attachments, visibility: $visibility)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $PostComposeInitialStateCopyWith<$Res>  {
+  factory $PostComposeInitialStateCopyWith(PostComposeInitialState value, $Res Function(PostComposeInitialState) _then) = _$PostComposeInitialStateCopyWithImpl;
+@useResult
+$Res call({
+ String? title, String? description, String? content, List<UniversalFile> attachments, int? visibility
+});
+
+
+
+
+}
+/// @nodoc
+class _$PostComposeInitialStateCopyWithImpl<$Res>
+    implements $PostComposeInitialStateCopyWith<$Res> {
+  _$PostComposeInitialStateCopyWithImpl(this._self, this._then);
+
+  final PostComposeInitialState _self;
+  final $Res Function(PostComposeInitialState) _then;
+
+/// Create a copy of PostComposeInitialState
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? title = freezed,Object? description = freezed,Object? content = freezed,Object? attachments = null,Object? visibility = freezed,}) {
+  return _then(_self.copyWith(
+title: freezed == title ? _self.title : title // ignore: cast_nullable_to_non_nullable
+as String?,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
+as String?,content: freezed == content ? _self.content : content // ignore: cast_nullable_to_non_nullable
+as String?,attachments: null == attachments ? _self.attachments : attachments // ignore: cast_nullable_to_non_nullable
+as List<UniversalFile>,visibility: freezed == visibility ? _self.visibility : visibility // ignore: cast_nullable_to_non_nullable
+as int?,
+  ));
+}
+
+}
+
+
+/// @nodoc
+@JsonSerializable()
+
+class _PostComposeInitialState implements PostComposeInitialState {
+  const _PostComposeInitialState({this.title, this.description, this.content, final  List<UniversalFile> attachments = const [], this.visibility}): _attachments = attachments;
+  factory _PostComposeInitialState.fromJson(Map<String, dynamic> json) => _$PostComposeInitialStateFromJson(json);
+
+@override final  String? title;
+@override final  String? description;
+@override final  String? content;
+ final  List<UniversalFile> _attachments;
+@override@JsonKey() List<UniversalFile> get attachments {
+  if (_attachments is EqualUnmodifiableListView) return _attachments;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableListView(_attachments);
+}
+
+@override final  int? visibility;
+
+/// Create a copy of PostComposeInitialState
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$PostComposeInitialStateCopyWith<_PostComposeInitialState> get copyWith => __$PostComposeInitialStateCopyWithImpl<_PostComposeInitialState>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$PostComposeInitialStateToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _PostComposeInitialState&&(identical(other.title, title) || other.title == title)&&(identical(other.description, description) || other.description == description)&&(identical(other.content, content) || other.content == content)&&const DeepCollectionEquality().equals(other._attachments, _attachments)&&(identical(other.visibility, visibility) || other.visibility == visibility));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,title,description,content,const DeepCollectionEquality().hash(_attachments),visibility);
+
+@override
+String toString() {
+  return 'PostComposeInitialState(title: $title, description: $description, content: $content, attachments: $attachments, visibility: $visibility)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$PostComposeInitialStateCopyWith<$Res> implements $PostComposeInitialStateCopyWith<$Res> {
+  factory _$PostComposeInitialStateCopyWith(_PostComposeInitialState value, $Res Function(_PostComposeInitialState) _then) = __$PostComposeInitialStateCopyWithImpl;
+@override @useResult
+$Res call({
+ String? title, String? description, String? content, List<UniversalFile> attachments, int? visibility
+});
+
+
+
+
+}
+/// @nodoc
+class __$PostComposeInitialStateCopyWithImpl<$Res>
+    implements _$PostComposeInitialStateCopyWith<$Res> {
+  __$PostComposeInitialStateCopyWithImpl(this._self, this._then);
+
+  final _PostComposeInitialState _self;
+  final $Res Function(_PostComposeInitialState) _then;
+
+/// Create a copy of PostComposeInitialState
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? title = freezed,Object? description = freezed,Object? content = freezed,Object? attachments = null,Object? visibility = freezed,}) {
+  return _then(_PostComposeInitialState(
+title: freezed == title ? _self.title : title // ignore: cast_nullable_to_non_nullable
+as String?,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
+as String?,content: freezed == content ? _self.content : content // ignore: cast_nullable_to_non_nullable
+as String?,attachments: null == attachments ? _self._attachments : attachments // ignore: cast_nullable_to_non_nullable
+as List<UniversalFile>,visibility: freezed == visibility ? _self.visibility : visibility // ignore: cast_nullable_to_non_nullable
+as int?,
+  ));
+}
+
+
+}
+
+// dart format on

lib/screens/posts/compose.g.dart

@@ -0,0 +1,31 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'compose.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_PostComposeInitialState _$PostComposeInitialStateFromJson(
+  Map<String, dynamic> json,
+) => _PostComposeInitialState(
+  title: json['title'] as String?,
+  description: json['description'] as String?,
+  content: json['content'] as String?,
+  attachments:
+      (json['attachments'] as List<dynamic>?)
+          ?.map((e) => UniversalFile.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      const [],
+  visibility: (json['visibility'] as num?)?.toInt(),
+);
+
+Map<String, dynamic> _$PostComposeInitialStateToJson(
+  _PostComposeInitialState instance,
+) => <String, dynamic>{
+  'title': instance.title,
+  'description': instance.description,
+  'content': instance.content,
+  'attachments': instance.attachments.map((e) => e.toJson()).toList(),
+  'visibility': instance.visibility,
+};

lib/screens/posts/compose_article.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
-import 'dart:developer';
-import 'package:auto_route/auto_route.dart';
+
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -9,6 +8,7 @@ import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/file.dart';
 import 'package:island/models/post.dart';
+
 import 'package:island/screens/creators/publishers.dart';
 import 'package:island/services/responsive.dart';
 import 'package:island/widgets/app_scaffold.dart';
@@ -21,13 +21,13 @@ import 'package:island/widgets/post/compose_settings_sheet.dart';
 import 'package:island/services/compose_storage_db.dart';
 import 'package:island/widgets/post/publishers_modal.dart';
 import 'package:island/widgets/post/draft_manager.dart';
+
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:styled_widget/styled_widget.dart';
 
-@RoutePage()
 class ArticleEditScreen extends HookConsumerWidget {
   final String id;
-  const ArticleEditScreen({super.key, @PathParam('id') required this.id});
+  const ArticleEditScreen({super.key, required this.id});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -48,7 +48,6 @@ class ArticleEditScreen extends HookConsumerWidget {
   }
 }
 
-@RoutePage()
 class ArticleComposeScreen extends HookConsumerWidget {
   final SnPost? originalPost;
 
@@ -61,7 +60,10 @@ class ArticleComposeScreen extends HookConsumerWidget {
 
     final publishers = ref.watch(publishersManagedProvider);
     final state = useMemoized(
-      () => ComposeLogic.createState(originalPost: originalPost),
+      () => ComposeLogic.createState(
+        originalPost: originalPost,
+        postType: 1, // Article type
+      ),
       [originalPost],
     );
 
@@ -71,7 +73,7 @@ class ArticleComposeScreen extends HookConsumerWidget {
       if (originalPost == null) {
         // Only auto-save for new articles, not edits
         autoSaveTimer = Timer.periodic(const Duration(seconds: 3), (_) {
-          _saveArticleDraft(ref, state);
+          ComposeLogic.saveDraftWithoutUpload(ref, state);
         });
       }
       return () {
@@ -79,7 +81,7 @@ class ArticleComposeScreen extends HookConsumerWidget {
         state.stopAutoSave();
         // Save final draft before disposing
         if (originalPost == null) {
-          _saveArticleDraft(ref, state);
+          ComposeLogic.saveDraftWithoutUpload(ref, state);
         }
         ComposeLogic.dispose(state);
         autoSaveTimer?.cancel();
@@ -100,17 +102,22 @@ class ArticleComposeScreen extends HookConsumerWidget {
     useEffect(() {
       if (originalPost == null) {
         // Try to load the most recent article draft
-        final drafts = ref.read(articleStorageNotifierProvider);
+        final drafts = ref.read(composeStorageNotifierProvider);
         if (drafts.isNotEmpty) {
           final mostRecentDraft = drafts.values.reduce(
-            (a, b) => a.lastModified.isAfter(b.lastModified) ? a : b,
+            (a, b) =>
+                (a.updatedAt ?? DateTime(0)).isAfter(b.updatedAt ?? DateTime(0))
+                    ? a
+                    : b,
           );
 
           // Only load if the draft has meaningful content
-          if (!mostRecentDraft.isEmpty) {
-            state.titleController.text = mostRecentDraft.title;
-            state.descriptionController.text = mostRecentDraft.description;
-            state.contentController.text = mostRecentDraft.content;
+          if (mostRecentDraft.content?.isNotEmpty == true ||
+              mostRecentDraft.title?.isNotEmpty == true) {
+            state.titleController.text = mostRecentDraft.title ?? '';
+            state.descriptionController.text =
+                mostRecentDraft.description ?? '';
+            state.contentController.text = mostRecentDraft.content ?? '';
             state.visibility.value = mostRecentDraft.visibility;
           }
         }
@@ -136,6 +143,8 @@ class ArticleComposeScreen extends HookConsumerWidget {
               titleController: state.titleController,
               descriptionController: state.descriptionController,
               visibility: state.visibility,
+              tagsController: state.tagsController,
+              categoriesController: state.categoriesController,
               onVisibilityChanged: () {
                 // Trigger rebuild if needed
               },
@@ -356,7 +365,7 @@ class ArticleComposeScreen extends HookConsumerWidget {
     return PopScope(
       onPopInvoked: (_) {
         if (originalPost == null) {
-          _saveArticleDraft(ref, state);
+          ComposeLogic.saveDraftWithoutUpload(ref, state);
         }
       },
       child: AppScaffold(
@@ -383,17 +392,17 @@ class ArticleComposeScreen extends HookConsumerWidget {
                     isScrollControlled: true,
                     builder:
                         (context) => DraftManagerSheet(
-                          isArticle: true,
                           onDraftSelected: (draftId) {
                             final draft =
                                 ref.read(
-                                  articleStorageNotifierProvider,
+                                  composeStorageNotifierProvider,
                                 )[draftId];
                             if (draft != null) {
-                              state.titleController.text = draft.title;
+                              state.titleController.text = draft.title ?? '';
                               state.descriptionController.text =
-                                  draft.description;
-                              state.contentController.text = draft.content;
+                                  draft.description ?? '';
+                              state.contentController.text =
+                                  draft.content ?? '';
                               state.visibility.value = draft.visibility;
                             }
                           },
@@ -404,7 +413,7 @@ class ArticleComposeScreen extends HookConsumerWidget {
               ),
             IconButton(
               icon: const Icon(Symbols.save),
-              onPressed: () => _saveArticleDraft(ref, state),
+              onPressed: () => ComposeLogic.saveDraft(ref, state),
               tooltip: 'saveDraft'.tr(),
             ),
             IconButton(
@@ -431,7 +440,6 @@ class ArticleComposeScreen extends HookConsumerWidget {
                             state,
                             context,
                             originalPost: originalPost,
-                            postType: 1, // Article type
                           ),
                   icon:
                       submitting
@@ -524,36 +532,17 @@ class ArticleComposeScreen extends HookConsumerWidget {
     if (isPaste && isModifierPressed) {
       ComposeLogic.handlePaste(state);
     } else if (isSave && isModifierPressed) {
-      _saveArticleDraft(ref, state);
+      ComposeLogic.saveDraft(ref, state);
+      ComposeLogic.saveDraft(ref, state);
     } else if (isSubmit && isModifierPressed && !state.submitting.value) {
       ComposeLogic.performAction(
         ref,
         state,
         context,
         originalPost: originalPost,
-        postType: 1, // Article type
       );
     }
   }
 
   // Helper method to save article draft
-  Future<void> _saveArticleDraft(WidgetRef ref, ComposeState state) async {
-    try {
-      final draft = ArticleDraftModel(
-        id: state.draftId,
-        title: state.titleController.text,
-        description: state.descriptionController.text,
-        content: state.contentController.text,
-        visibility: state.visibility.value,
-        lastModified: DateTime.now(),
-      );
-
-      await ref.read(articleStorageNotifierProvider.notifier).saveDraft(draft);
-    } catch (e) {
-      log('[ArticleCompose] Failed to save draft, error: $e');
-      // Silently fail for auto-save to avoid disrupting user experience
-    }
-  }
-
-
 }

lib/screens/posts/detail.dart

@@ -1,4 +1,3 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -22,10 +21,9 @@ Future<SnPost?> post(Ref ref, String id) async {
   return SnPost.fromJson(resp.data);
 }
 
-@RoutePage()
 class PostDetailScreen extends HookConsumerWidget {
   final String id;
-  const PostDetailScreen({super.key, @PathParam('id') required this.id});
+  const PostDetailScreen({super.key, required this.id});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {

lib/screens/posts/pub_profile.dart

@@ -1,6 +1,6 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
@@ -54,26 +54,26 @@ Future<SnSubscriptionStatus> publisherSubscriptionStatus(
 
 @riverpod
 Future<Color?> publisherAppbarForcegroundColor(Ref ref, String pubName) async {
-  final publisher = await ref.watch(publisherProvider(pubName).future);
-  if (publisher.background == null) return null;
-  final palette = await PaletteGenerator.fromImageProvider(
-    CloudImageWidget.provider(
-      fileId: publisher.background!.id,
-      serverUrl: ref.watch(serverUrlProvider),
-    ),
-  );
-  final dominantColor = palette.dominantColor?.color;
-  if (dominantColor == null) return null;
-  return dominantColor.computeLuminance() > 0.5 ? Colors.black : Colors.white;
+  try {
+    final publisher = await ref.watch(publisherProvider(pubName).future);
+    if (publisher.background == null) return null;
+    final palette = await PaletteGenerator.fromImageProvider(
+      CloudImageWidget.provider(
+        fileId: publisher.background!.id,
+        serverUrl: ref.watch(serverUrlProvider),
+      ),
+    );
+    final dominantColor = palette.dominantColor?.color;
+    if (dominantColor == null) return null;
+    return dominantColor.computeLuminance() > 0.5 ? Colors.black : Colors.white;
+  } catch (_) {
+    return null;
+  }
 }
 
-@RoutePage()
 class PublisherProfileScreen extends HookConsumerWidget {
   final String name;
-  const PublisherProfileScreen({
-    super.key,
-    @PathParam("name") required this.name,
-  });
+  const PublisherProfileScreen({super.key, required this.name});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -186,7 +186,7 @@ class PublisherProfileScreen extends HookConsumerWidget {
                         ),
                         onTap: () {
                           Navigator.pop(context, true);
-                          context.router.pushPath('/account/${data.name}');
+                          context.push('/account/${data.name}');
                         },
                       ),
                       Expanded(

lib/screens/realm/detail.dart

@@ -1,13 +1,17 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
+import 'package:island/screens/chat/chat.dart';
 import 'package:flutter/material.dart';
+import 'package:island/models/chat.dart';
+import 'package:island/services/color.dart';
+import 'package:palette_generator/palette_generator.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
+import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/realm.dart';
 import 'package:island/pods/network.dart';
-import 'package:island/route.gr.dart';
+import 'package:island/pods/config.dart';
 import 'package:island/screens/realm/realms.dart';
 import 'package:island/widgets/account/account_picker.dart';
 import 'package:island/widgets/alert.dart';
@@ -21,23 +25,53 @@ import 'package:styled_widget/styled_widget.dart';
 part 'detail.g.dart';
 
 @riverpod
-Future<SnRealmMember?> realmIdentity(Ref ref, String realmSlug) async {
-  final apiClient = ref.watch(apiClientProvider);
-  final response = await apiClient.get('/realms/$realmSlug/members/me');
-  return SnRealmMember.fromJson(response.data);
+Future<Color?> realmAppbarForegroundColor(Ref ref, String realmSlug) async {
+  final realm = await ref.watch(realmProvider(realmSlug).future);
+  if (realm?.background == null) return null;
+  final palette = await PaletteGenerator.fromImageProvider(
+    CloudImageWidget.provider(
+      fileId: realm!.background!.id,
+      serverUrl: ref.watch(serverUrlProvider),
+    ),
+  );
+  final dominantColor = palette.dominantColor?.color;
+  if (dominantColor == null) return null;
+  return dominantColor.computeLuminance() > 0.5 ? Colors.black : Colors.white;
+}
+
+@riverpod
+Future<SnRealmMember?> realmIdentity(Ref ref, String realmSlug) async {
+  try {
+    final apiClient = ref.watch(apiClientProvider);
+    final response = await apiClient.get('/realms/$realmSlug/members/me');
+    return SnRealmMember.fromJson(response.data);
+  } catch (err) {
+    if (err is DioException && err.response?.statusCode == 404) {
+      return null; // No identity found, user is not a member
+    }
+    rethrow;
+  }
+}
+
+@riverpod
+Future<List<SnChatRoom>> realmChatRooms(Ref ref, String realmSlug) async {
+  final apiClient = ref.watch(apiClientProvider);
+  final response = await apiClient.get('/realms/$realmSlug/chat');
+  return (response.data as List).map((e) => SnChatRoom.fromJson(e)).toList();
 }
 
-@RoutePage()
 class RealmDetailScreen extends HookConsumerWidget {
   final String slug;
-  const RealmDetailScreen({super.key, @PathParam("slug") required this.slug});
+
+  const RealmDetailScreen({super.key, required this.slug});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final realmState = ref.watch(realmProvider(slug));
+    final appbarColor = ref.watch(realmAppbarForegroundColorProvider(slug));
 
-    const iconShadow = Shadow(
-      color: Colors.black54,
+    final iconShadow = Shadow(
+      color: appbarColor.value?.invert ?? Colors.black54,
       blurRadius: 5.0,
       offset: Offset(1.0, 1.0),
     );
@@ -52,7 +86,11 @@ class RealmDetailScreen extends HookConsumerWidget {
                 SliverAppBar(
                   expandedHeight: 180,
                   pinned: true,
-                  leading: PageBackButton(shadows: [iconShadow]),
+                  foregroundColor: appbarColor.value,
+                  leading: PageBackButton(
+                    color: appbarColor.value,
+                    shadows: [iconShadow],
+                  ),
                   flexibleSpace: FlexibleSpaceBar(
                     background:
                         realm!.background?.id != null
@@ -64,14 +102,16 @@ class RealmDetailScreen extends HookConsumerWidget {
                     title: Text(
                       realm.name,
                       style: TextStyle(
-                        color: Theme.of(context).appBarTheme.foregroundColor,
+                        color:
+                            appbarColor.value ??
+                            Theme.of(context).appBarTheme.foregroundColor,
                         shadows: [iconShadow],
                       ),
                     ),
                   ),
                   actions: [
                     IconButton(
-                      icon: const Icon(Icons.people, shadows: [iconShadow]),
+                      icon: Icon(Icons.people, shadows: [iconShadow]),
                       onPressed: () {
                         showModalBottomSheet(
                           isScrollControlled: true,
@@ -87,18 +127,97 @@ class RealmDetailScreen extends HookConsumerWidget {
                   ],
                 ),
                 SliverToBoxAdapter(
-                  child: Padding(
-                    padding: const EdgeInsets.all(16.0),
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Text(
-                          realm.description,
-                          style: const TextStyle(fontSize: 16),
-                        ),
-                      ],
-                    ),
-                  ),
+                  child: ref
+                      .watch(realmIdentityProvider(slug))
+                      .when(
+                        loading: () => const SizedBox.shrink(),
+                        error: (_, _) => const SizedBox.shrink(),
+                        data:
+                            (identity) => Column(
+                              crossAxisAlignment: CrossAxisAlignment.stretch,
+                              children: [
+                                ExpansionTile(
+                                  title: const Text('description').tr(),
+                                  initiallyExpanded: identity == null,
+                                  tilePadding: EdgeInsets.symmetric(
+                                    horizontal: 20,
+                                  ),
+                                  expandedCrossAxisAlignment:
+                                      CrossAxisAlignment.stretch,
+                                  children: [
+                                    Text(
+                                      realm.description,
+                                      style: const TextStyle(fontSize: 16),
+                                    ).padding(
+                                      horizontal: 20,
+                                      bottom: 16,
+                                      top: 8,
+                                    ),
+                                  ],
+                                ),
+                                if (identity == null && realm.isCommunity)
+                                  FilledButton.tonalIcon(
+                                    onPressed: () async {
+                                      try {
+                                        final apiClient = ref.read(
+                                          apiClientProvider,
+                                        );
+                                        await apiClient.post(
+                                          '/realms/$slug/members/me',
+                                        );
+                                        ref.invalidate(
+                                          realmIdentityProvider(slug),
+                                        );
+                                        ref.invalidate(realmsJoinedProvider);
+                                        showSnackBar('realmJoinSuccess'.tr());
+                                      } catch (err) {
+                                        showErrorAlert(err);
+                                      }
+                                    },
+                                    icon: const Icon(Symbols.add),
+                                    label: const Text('realmJoin').tr(),
+                                  ).padding(horizontal: 16, vertical: 16)
+                                else
+                                  const SizedBox.shrink(),
+                              ],
+                            ),
+                      ),
+                ),
+                const SliverToBoxAdapter(child: Divider(height: 1)),
+                Consumer(
+                  builder: (context, ref, _) {
+                    final chatRooms = ref.watch(realmChatRoomsProvider(slug));
+                    return chatRooms.when(
+                      loading:
+                          () => const SliverToBoxAdapter(
+                            child: Center(child: CircularProgressIndicator()),
+                          ),
+                      error:
+                          (error, _) => SliverToBoxAdapter(
+                            child: Center(child: Text('Error: $error')),
+                          ),
+                      data: (rooms) {
+                        if (rooms.isEmpty) {
+                          return const SliverToBoxAdapter(
+                            child: SizedBox.shrink(),
+                          );
+                        }
+                        return SliverList(
+                          delegate: SliverChildBuilderDelegate((
+                            context,
+                            index,
+                          ) {
+                            return ChatRoomListTile(
+                              room: rooms[index],
+                              onTap: () {
+                                context.push('/chat/${rooms[index].id}');
+                              },
+                            );
+                          }, childCount: rooms.length),
+                        );
+                      },
+                    );
+                  },
                 ),
               ],
             ),
@@ -115,8 +234,8 @@ class _RealmActionMenu extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final realmIdentityAsync = ref.watch(realmIdentityProvider(realmSlug));
-    final isModerator = realmIdentityAsync.when(
+    final realmIdentity = ref.watch(realmIdentityProvider(realmSlug));
+    final isModerator = realmIdentity.when(
       data: (identity) => (identity?.role ?? 0) >= 50,
       loading: () => false,
       error: (_, _) => false,
@@ -129,7 +248,7 @@ class _RealmActionMenu extends HookConsumerWidget {
             if (isModerator)
               PopupMenuItem(
                 onTap: () {
-                  context.router.replace(EditRealmRoute(slug: realmSlug));
+                  context.pushReplacement('/realms/$realmSlug/edit');
                 },
                 child: Row(
                   children: [
@@ -142,7 +261,7 @@ class _RealmActionMenu extends HookConsumerWidget {
                   ],
                 ),
               ),
-            realmIdentityAsync.when(
+            realmIdentity.when(
               data:
                   (identity) =>
                       (identity?.role ?? 0) >= 100
@@ -167,7 +286,7 @@ class _RealmActionMenu extends HookConsumerWidget {
                                   client.delete('/realms/$realmSlug');
                                   ref.invalidate(realmsJoinedProvider);
                                   if (context.mounted) {
-                                    context.router.maybePop(true);
+                                    context.pop(true);
                                   }
                                 }
                               });
@@ -201,7 +320,7 @@ class _RealmActionMenu extends HookConsumerWidget {
                                   );
                                   ref.invalidate(realmsJoinedProvider);
                                   if (context.mounted) {
-                                    context.router.maybePop(true);
+                                    context.pop(true);
                                   }
                                 }
                               });
@@ -239,7 +358,7 @@ class _RealmActionMenu extends HookConsumerWidget {
                           client.delete('/realms/$realmSlug/members/me');
                           ref.invalidate(realmsJoinedProvider);
                           if (context.mounted) {
-                            context.router.maybePop(true);
+                            context.pop(true);
                           }
                         }
                       });

lib/screens/realm/detail.g.dart

@@ -6,7 +6,8 @@ part of 'detail.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$realmIdentityHash() => r'eac6e829b5b46bcfadbf201ab6f918d78c894b9f';
+String _$realmAppbarForegroundColorHash() =>
+    r'14b5563d861996ea182d0d2db7aa5c2bb3bbaf48';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -29,6 +30,133 @@ class _SystemHash {
   }
 }
 
+/// See also [realmAppbarForegroundColor].
+@ProviderFor(realmAppbarForegroundColor)
+const realmAppbarForegroundColorProvider = RealmAppbarForegroundColorFamily();
+
+/// See also [realmAppbarForegroundColor].
+class RealmAppbarForegroundColorFamily extends Family<AsyncValue<Color?>> {
+  /// See also [realmAppbarForegroundColor].
+  const RealmAppbarForegroundColorFamily();
+
+  /// See also [realmAppbarForegroundColor].
+  RealmAppbarForegroundColorProvider call(String realmSlug) {
+    return RealmAppbarForegroundColorProvider(realmSlug);
+  }
+
+  @override
+  RealmAppbarForegroundColorProvider getProviderOverride(
+    covariant RealmAppbarForegroundColorProvider provider,
+  ) {
+    return call(provider.realmSlug);
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'realmAppbarForegroundColorProvider';
+}
+
+/// See also [realmAppbarForegroundColor].
+class RealmAppbarForegroundColorProvider
+    extends AutoDisposeFutureProvider<Color?> {
+  /// See also [realmAppbarForegroundColor].
+  RealmAppbarForegroundColorProvider(String realmSlug)
+    : this._internal(
+        (ref) => realmAppbarForegroundColor(
+          ref as RealmAppbarForegroundColorRef,
+          realmSlug,
+        ),
+        from: realmAppbarForegroundColorProvider,
+        name: r'realmAppbarForegroundColorProvider',
+        debugGetCreateSourceHash:
+            const bool.fromEnvironment('dart.vm.product')
+                ? null
+                : _$realmAppbarForegroundColorHash,
+        dependencies: RealmAppbarForegroundColorFamily._dependencies,
+        allTransitiveDependencies:
+            RealmAppbarForegroundColorFamily._allTransitiveDependencies,
+        realmSlug: realmSlug,
+      );
+
+  RealmAppbarForegroundColorProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.realmSlug,
+  }) : super.internal();
+
+  final String realmSlug;
+
+  @override
+  Override overrideWith(
+    FutureOr<Color?> Function(RealmAppbarForegroundColorRef provider) create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: RealmAppbarForegroundColorProvider._internal(
+        (ref) => create(ref as RealmAppbarForegroundColorRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        realmSlug: realmSlug,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeFutureProviderElement<Color?> createElement() {
+    return _RealmAppbarForegroundColorProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is RealmAppbarForegroundColorProvider &&
+        other.realmSlug == realmSlug;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, realmSlug.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin RealmAppbarForegroundColorRef on AutoDisposeFutureProviderRef<Color?> {
+  /// The parameter `realmSlug` of this provider.
+  String get realmSlug;
+}
+
+class _RealmAppbarForegroundColorProviderElement
+    extends AutoDisposeFutureProviderElement<Color?>
+    with RealmAppbarForegroundColorRef {
+  _RealmAppbarForegroundColorProviderElement(super.provider);
+
+  @override
+  String get realmSlug =>
+      (origin as RealmAppbarForegroundColorProvider).realmSlug;
+}
+
+String _$realmIdentityHash() => r'308d43eef8a6145c762d27bdf7e12e27149524db';
+
 /// See also [realmIdentity].
 @ProviderFor(realmIdentity)
 const realmIdentityProvider = RealmIdentityFamily();
@@ -148,6 +276,128 @@ class _RealmIdentityProviderElement
   String get realmSlug => (origin as RealmIdentityProvider).realmSlug;
 }
 
+String _$realmChatRoomsHash() => r'8207c1e6f0922323967f208efeed027e943039cc';
+
+/// See also [realmChatRooms].
+@ProviderFor(realmChatRooms)
+const realmChatRoomsProvider = RealmChatRoomsFamily();
+
+/// See also [realmChatRooms].
+class RealmChatRoomsFamily extends Family<AsyncValue<List<SnChatRoom>>> {
+  /// See also [realmChatRooms].
+  const RealmChatRoomsFamily();
+
+  /// See also [realmChatRooms].
+  RealmChatRoomsProvider call(String realmSlug) {
+    return RealmChatRoomsProvider(realmSlug);
+  }
+
+  @override
+  RealmChatRoomsProvider getProviderOverride(
+    covariant RealmChatRoomsProvider provider,
+  ) {
+    return call(provider.realmSlug);
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'realmChatRoomsProvider';
+}
+
+/// See also [realmChatRooms].
+class RealmChatRoomsProvider
+    extends AutoDisposeFutureProvider<List<SnChatRoom>> {
+  /// See also [realmChatRooms].
+  RealmChatRoomsProvider(String realmSlug)
+    : this._internal(
+        (ref) => realmChatRooms(ref as RealmChatRoomsRef, realmSlug),
+        from: realmChatRoomsProvider,
+        name: r'realmChatRoomsProvider',
+        debugGetCreateSourceHash:
+            const bool.fromEnvironment('dart.vm.product')
+                ? null
+                : _$realmChatRoomsHash,
+        dependencies: RealmChatRoomsFamily._dependencies,
+        allTransitiveDependencies:
+            RealmChatRoomsFamily._allTransitiveDependencies,
+        realmSlug: realmSlug,
+      );
+
+  RealmChatRoomsProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.realmSlug,
+  }) : super.internal();
+
+  final String realmSlug;
+
+  @override
+  Override overrideWith(
+    FutureOr<List<SnChatRoom>> Function(RealmChatRoomsRef provider) create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: RealmChatRoomsProvider._internal(
+        (ref) => create(ref as RealmChatRoomsRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        realmSlug: realmSlug,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeFutureProviderElement<List<SnChatRoom>> createElement() {
+    return _RealmChatRoomsProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is RealmChatRoomsProvider && other.realmSlug == realmSlug;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, realmSlug.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin RealmChatRoomsRef on AutoDisposeFutureProviderRef<List<SnChatRoom>> {
+  /// The parameter `realmSlug` of this provider.
+  String get realmSlug;
+}
+
+class _RealmChatRoomsProviderElement
+    extends AutoDisposeFutureProviderElement<List<SnChatRoom>>
+    with RealmChatRoomsRef {
+  _RealmChatRoomsProviderElement(super.provider);
+
+  @override
+  String get realmSlug => (origin as RealmChatRoomsProvider).realmSlug;
+}
+
 String _$realmMemberListNotifierHash() =>
     r'b2e3eefc62a597f45df9470b2058fdda62f8853f';
 

lib/screens/realm/realms.dart

@@ -1,8 +1,8 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:croppy/croppy.dart' show CropAspectRatio;
 import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -11,7 +11,6 @@ import 'package:island/models/file.dart';
 import 'package:island/models/realm.dart';
 import 'package:island/pods/config.dart';
 import 'package:island/pods/network.dart';
-import 'package:island/route.gr.dart';
 import 'package:island/services/file.dart';
 import 'package:island/services/responsive.dart';
 import 'package:island/widgets/alert.dart';
@@ -33,7 +32,6 @@ Future<List<SnRealm>> realmsJoined(Ref ref) async {
   return resp.data.map((e) => SnRealm.fromJson(e)).cast<SnRealm>().toList();
 }
 
-@RoutePage()
 class RealmListScreen extends HookConsumerWidget {
   const RealmListScreen({super.key});
 
@@ -48,6 +46,10 @@ class RealmListScreen extends HookConsumerWidget {
       appBar: AppBar(
         title: const Text('realms').tr(),
         actions: [
+          IconButton(
+            icon: const Icon(Symbols.travel_explore),
+            onPressed: () => context.push('/discovery/realms'),
+          ),
           IconButton(
             icon: Badge(
               label: Text(
@@ -68,7 +70,7 @@ class RealmListScreen extends HookConsumerWidget {
               showModalBottomSheet(
                 context: context,
                 isScrollControlled: true,
-                builder: (_) => _RealmInviteSheet(),
+                builder: (_) => const _RealmInviteSheet(),
               );
             },
           ),
@@ -76,10 +78,10 @@ class RealmListScreen extends HookConsumerWidget {
         ],
       ),
       floatingActionButton: FloatingActionButton(
-        heroTag: Key("realms-page-fab"),
+        heroTag: const Key("realms-page-fab"),
         child: const Icon(Symbols.add),
         onPressed: () {
-          context.router.push(NewRealmRoute()).then((value) {
+          context.push('/realms/new').then((value) {
             if (value != null) {
               ref.invalidate(realmsJoinedProvider);
             }
@@ -106,11 +108,9 @@ class RealmListScreen extends HookConsumerWidget {
                           title: Text(value[item].name),
                           subtitle: Text(value[item].description),
                           onTap: () {
-                            context.router.push(
-                              RealmDetailRoute(slug: value[item].slug),
-                            );
+                            context.push('/realms/${value[item].slug}');
                           },
-                          contentPadding: EdgeInsets.only(
+                          contentPadding: const EdgeInsets.only(
                             left: 16,
                             right: 14,
                             top: 8,
@@ -143,7 +143,6 @@ Future<SnRealm?> realm(Ref ref, String? identifier) async {
   return SnRealm.fromJson(resp.data);
 }
 
-@RoutePage()
 class NewRealmScreen extends StatelessWidget {
   const NewRealmScreen({super.key});
 
@@ -153,10 +152,9 @@ class NewRealmScreen extends StatelessWidget {
   }
 }
 
-@RoutePage()
 class EditRealmScreen extends HookConsumerWidget {
   final String? slug;
-  const EditRealmScreen({super.key, @PathParam('slug') this.slug});
+  const EditRealmScreen({super.key, this.slug});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -164,6 +162,8 @@ class EditRealmScreen extends HookConsumerWidget {
 
     final picture = useState<SnCloudFile?>(null);
     final background = useState<SnCloudFile?>(null);
+    final isPublic = useState(true);
+    final isCommunity = useState(false);
 
     final slugController = useTextEditingController();
     final nameController = useTextEditingController();
@@ -180,6 +180,8 @@ class EditRealmScreen extends HookConsumerWidget {
         slugController.text = realm.value!.slug;
         nameController.text = realm.value!.name;
         descriptionController.text = realm.value!.description;
+        isPublic.value = realm.value!.isPublic;
+        isCommunity.value = realm.value!.isCommunity;
       }
       return null;
     }, [realm]);
@@ -200,9 +202,9 @@ class EditRealmScreen extends HookConsumerWidget {
         image: result,
         allowedAspectRatios: [
           if (position == 'background')
-            CropAspectRatio(height: 7, width: 16)
+            const CropAspectRatio(height: 7, width: 16)
           else
-            CropAspectRatio(height: 1, width: 1),
+            const CropAspectRatio(height: 1, width: 1),
         ],
       );
       if (result == null) {
@@ -258,11 +260,13 @@ class EditRealmScreen extends HookConsumerWidget {
             'description': descriptionController.text,
             'background_id': background.value?.id,
             'picture_id': picture.value?.id,
+            'is_public': isPublic.value,
+            'is_community': isCommunity.value,
           },
           options: Options(method: slug == null ? 'POST' : 'PATCH'),
         );
         if (context.mounted) {
-          context.maybePop(SnRealm.fromJson(resp.data));
+          context.pop(SnRealm.fromJson(resp.data));
         }
       } catch (err) {
         showErrorAlert(err);
@@ -290,9 +294,9 @@ class EditRealmScreen extends HookConsumerWidget {
                     child:
                         background.value != null
                             ? CloudFileWidget(
-                              item: background.value!,
-                              fit: BoxFit.cover,
-                            )
+                                item: background.value!,
+                                fit: BoxFit.cover,
+                              )
                             : const SizedBox.shrink(),
                   ),
                   onTap: () {
@@ -320,7 +324,6 @@ class EditRealmScreen extends HookConsumerWidget {
             key: formKey,
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
-              spacing: 16,
               children: [
                 TextFormField(
                   controller: slugController,
@@ -331,12 +334,14 @@ class EditRealmScreen extends HookConsumerWidget {
                   onTapOutside:
                       (_) => FocusManager.instance.primaryFocus?.unfocus(),
                 ),
+                const SizedBox(height: 16),
                 TextFormField(
                   controller: nameController,
                   decoration: InputDecoration(labelText: 'name'.tr()),
                   onTapOutside:
                       (_) => FocusManager.instance.primaryFocus?.unfocus(),
                 ),
+                const SizedBox(height: 16),
                 TextFormField(
                   controller: descriptionController,
                   decoration: InputDecoration(labelText: 'description'.tr()),
@@ -345,6 +350,20 @@ class EditRealmScreen extends HookConsumerWidget {
                   onTapOutside:
                       (_) => FocusManager.instance.primaryFocus?.unfocus(),
                 ),
+                const SizedBox(height: 16),
+                CheckboxListTile(
+                  title: const Text('isPublic').tr(),
+                  subtitle: const Text('isPublicHint').tr(),
+                  value: isPublic.value,
+                  onChanged: (value) => isPublic.value = value ?? false,
+                ),
+                CheckboxListTile(
+                  title: const Text('isCommunity').tr(),
+                  subtitle: const Text('isCommunityHint').tr(),
+                  value: isCommunity.value,
+                  onChanged: (value) => isCommunity.value = value ?? false,
+                ),
+                const SizedBox(height: 16),
                 Align(
                   alignment: Alignment.centerRight,
                   child: TextButton.icon(
@@ -416,47 +435,47 @@ class _RealmInviteSheet extends HookConsumerWidget {
             (items) =>
                 items.isEmpty
                     ? Center(
-                      child:
-                          Text(
-                            'invitesEmpty',
-                            textAlign: TextAlign.center,
-                          ).tr(),
-                    )
+                        child:
+                            Text(
+                              'invitesEmpty',
+                              textAlign: TextAlign.center,
+                            ).tr(),
+                      )
                     : ListView.builder(
-                      shrinkWrap: true,
-                      itemCount: items.length,
-                      itemBuilder: (context, index) {
-                        final invite = items[index];
-                        return ListTile(
-                          leading: ProfilePictureWidget(
-                            fileId: invite.realm!.picture?.id,
-                            fallbackIcon: Symbols.group,
-                          ),
-                          title: Text(invite.realm!.name),
-                          subtitle:
-                              Text(
-                                invite.role >= 100
-                                    ? 'permissionOwner'
-                                    : invite.role >= 50
-                                    ? 'permissionModerator'
-                                    : 'permissionMember',
-                              ).tr(),
-                          trailing: Row(
-                            mainAxisSize: MainAxisSize.min,
-                            children: [
-                              IconButton(
-                                icon: const Icon(Symbols.check),
-                                onPressed: () => acceptInvite(invite),
-                              ),
-                              IconButton(
-                                icon: const Icon(Symbols.close),
-                                onPressed: () => declineInvite(invite),
-                              ),
-                            ],
-                          ),
-                        );
-                      },
-                    ),
+                        shrinkWrap: true,
+                        itemCount: items.length,
+                        itemBuilder: (context, index) {
+                          final invite = items[index];
+                          return ListTile(
+                            leading: ProfilePictureWidget(
+                              fileId: invite.realm!.picture?.id,
+                              fallbackIcon: Symbols.group,
+                            ),
+                            title: Text(invite.realm!.name),
+                            subtitle:
+                                Text(
+                                  invite.role >= 100
+                                      ? 'permissionOwner'
+                                      : invite.role >= 50
+                                      ? 'permissionModerator'
+                                      : 'permissionMember',
+                                ).tr(),
+                            trailing: Row(
+                              mainAxisSize: MainAxisSize.min,
+                              children: [
+                                IconButton(
+                                  icon: const Icon(Symbols.check),
+                                  onPressed: () => acceptInvite(invite),
+                                ),
+                                IconButton(
+                                  icon: const Icon(Symbols.close),
+                                  onPressed: () => declineInvite(invite),
+                                ),
+                              ],
+                            ),
+                          );
+                        },
+                      ),
         loading: () => const Center(child: CircularProgressIndicator()),
         error:
             (error, _) => ResponseErrorWidget(
@@ -466,4 +485,4 @@ class _RealmInviteSheet extends HookConsumerWidget {
       ),
     );
   }
-}
+}

lib/screens/settings.dart

@@ -1,11 +1,11 @@
 import 'dart:io';
 
-import 'package:auto_route/auto_route.dart';
 import 'package:collection/collection.dart';
 import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_colorpicker/flutter_colorpicker.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
@@ -21,7 +21,6 @@ import 'package:path_provider/path_provider.dart';
 import 'package:styled_widget/styled_widget.dart';
 import 'package:island/pods/config.dart';
 
-@RoutePage()
 class SettingsScreen extends HookConsumerWidget {
   const SettingsScreen({super.key});
 
@@ -110,7 +109,7 @@ class SettingsScreen extends HookConsumerWidget {
                   ref
                       .read(appSettingsNotifierProvider.notifier)
                       .setCustomFonts(null);
-                  showSnackBar(context, 'settingsApplied'.tr());
+                  showSnackBar('settingsApplied'.tr());
                 },
               ),
               border: OutlineInputBorder(
@@ -122,7 +121,7 @@ class SettingsScreen extends HookConsumerWidget {
               ref
                   .read(appSettingsNotifierProvider.notifier)
                   .setCustomFonts(value.isEmpty ? null : value);
-              showSnackBar(context, 'settingsApplied'.tr());
+              showSnackBar('settingsApplied'.tr());
             },
           ),
         ),
@@ -215,7 +214,7 @@ class SettingsScreen extends HookConsumerWidget {
             prefs.setBool(kAppBackgroundStoreKey, true);
             ref.invalidate(backgroundImageFileProvider);
             if (context.mounted) {
-              showSnackBar(context, 'settingsApplied'.tr());
+              showSnackBar('settingsApplied'.tr());
             }
           },
         ),
@@ -243,7 +242,7 @@ class SettingsScreen extends HookConsumerWidget {
                 prefs.remove(kAppBackgroundStoreKey);
                 ref.invalidate(backgroundImageFileProvider);
                 if (context.mounted) {
-                  showSnackBar(context, 'settingsApplied'.tr());
+                  showSnackBar('settingsApplied'.tr());
                 }
               },
             );
@@ -290,7 +289,7 @@ class SettingsScreen extends HookConsumerWidget {
                     .setAppColorScheme(color.value);
                 if (context.mounted) {
                   hideLoadingModal(context);
-                  showSnackBar(context, 'settingsApplied'.tr());
+                  showSnackBar('settingsApplied'.tr());
                 }
               },
             );
@@ -321,7 +320,7 @@ class SettingsScreen extends HookConsumerWidget {
                     kNetworkServerDefault,
                   );
                   ref.invalidate(serverUrlProvider);
-                  showSnackBar(context, 'settingsApplied'.tr());
+                  showSnackBar('settingsApplied'.tr());
                 },
               ),
               border: OutlineInputBorder(
@@ -333,7 +332,7 @@ class SettingsScreen extends HookConsumerWidget {
               if (value.isNotEmpty) {
                 prefs.setString(kNetworkServerStoreKey, value);
                 ref.invalidate(serverUrlProvider);
-                showSnackBar(context, 'settingsApplied'.tr());
+                showSnackBar('settingsApplied'.tr());
               }
             },
           ),
@@ -590,7 +589,7 @@ class SettingsScreen extends HookConsumerWidget {
           if (isDesktop &&
               event is KeyDownEvent &&
               event.logicalKey == LogicalKeyboardKey.escape) {
-            context.router.pop();
+            context.pop();
             return KeyEventResult.handled;
           }
           return KeyEventResult.ignored;

lib/screens/tabs.dart

@@ -1,20 +1,32 @@
 import 'dart:ui';
-import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:island/route.gr.dart';
+import 'package:go_router/go_router.dart';
 import 'package:island/screens/notification.dart';
 import 'package:island/services/responsive.dart';
+import 'package:island/widgets/navigation/conditional_bottom_nav.dart';
 import 'package:material_symbols_icons/symbols.dart';
 
-@RoutePage()
+final currentRouteProvider = StateProvider<String?>((ref) => null);
+
 class TabsScreen extends HookConsumerWidget {
-  const TabsScreen({super.key});
+  final Widget? child;
+  const TabsScreen({super.key, this.child});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final useHorizontalLayout = isWideScreen(context);
+    // final useHorizontalLayout = isWideScreen(context);
+    final currentLocation = GoRouterState.of(context).uri.toString();
+    
+    // Update the current route provider whenever the location changes
+    useEffect(() {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        ref.read(currentRouteProvider.notifier).state = currentLocation;
+      });
+      return null;
+    }, [currentLocation]);
 
     final notificationUnreadCount = ref.watch(
       notificationUnreadCountNotifierProvider,
@@ -40,83 +52,89 @@ class TabsScreen extends HookConsumerWidget {
       ),
     ];
 
-    final routes = <PageRouteInfo>[
-      ExploreRoute(),
-      ChatListRoute(),
-      RealmListRoute(),
-      AccountRoute(),
+    final routes = [
+      '/',
+      '/chat',
+      '/realms',
+      '/account',
     ];
 
-    return AutoTabsRouter.tabBar(
-      routes: routes,
-      scrollDirection: useHorizontalLayout ? Axis.vertical : Axis.horizontal,
-      physics: const NeverScrollableScrollPhysics(),
-      builder: (context, child, _) {
-        final tabsRouter = AutoTabsRouter.of(context);
+    int getCurrentIndex() {
+      if (currentLocation.startsWith('/chat')) return 1;
+      if (currentLocation.startsWith('/realms')) return 2;
+      if (currentLocation.startsWith('/account')) return 3;
+      return 0; // Default to explore
+    }
 
-        if (isWideScreen(context)) {
-          return Row(
-            children: [
-              NavigationRail(
-                destinations:
-                    destinations
-                        .map(
-                          (e) => NavigationRailDestination(
-                            icon: e.icon,
-                            label: Text(e.label),
-                          ),
-                        )
-                        .toList(),
-                selectedIndex: tabsRouter.activeIndex,
-                onDestinationSelected: tabsRouter.setActiveIndex,
-              ),
-              const VerticalDivider(width: 1),
-              Expanded(child: child),
-            ],
-          );
-        }
+    void onDestinationSelected(int index) {
+      context.go(routes[index]);
+    }
 
-        return Stack(
-          children: [
-            Positioned.fill(child: child),
-            Positioned(
-              left: 0,
-              right: 0,
-              bottom: 0,
-              child: ClipRRect(
-                child: BackdropFilter(
-                  filter: ImageFilter.blur(sigmaX: 10, sigmaY: 10),
-                  child: Container(
-                    decoration: BoxDecoration(
-                      color: Theme.of(
-                        context,
-                      ).colorScheme.surface.withOpacity(0.8),
-                    ),
-                    child: MediaQuery.removePadding(
-                      context: context,
-                      removeTop: true,
-                      child: NavigationBar(
-                        backgroundColor: Colors.transparent,
-                        shadowColor: Colors.transparent,
-                        overlayColor: WidgetStatePropertyAll(
-                          Colors.transparent,
-                        ),
-                        surfaceTintColor: Colors.transparent,
-                        height: 56,
-                        labelBehavior:
-                            NavigationDestinationLabelBehavior.alwaysHide,
-                        selectedIndex: tabsRouter.activeIndex,
-                        onDestinationSelected: tabsRouter.setActiveIndex,
-                        destinations: destinations,
+    final currentIndex = getCurrentIndex();
+
+    if (isWideScreen(context)) {
+      return Row(
+        children: [
+          NavigationRail(
+            destinations:
+                destinations
+                    .map(
+                      (e) => NavigationRailDestination(
+                        icon: e.icon,
+                        label: Text(e.label),
                       ),
+                    )
+                    .toList(),
+            selectedIndex: currentIndex,
+            onDestinationSelected: onDestinationSelected,
+          ),
+          const VerticalDivider(width: 1),
+          Expanded(child: child ?? const SizedBox.shrink()),
+        ],
+      );
+    }
+
+    return Stack(
+      children: [
+        Positioned.fill(child: child ?? const SizedBox.shrink()),
+        Positioned(
+          left: 0,
+          right: 0,
+          bottom: 0,
+          child: ConditionalBottomNav(
+            child: ClipRRect(
+              child: BackdropFilter(
+                filter: ImageFilter.blur(sigmaX: 10, sigmaY: 10),
+                child: Container(
+                  decoration: BoxDecoration(
+                    color: Theme.of(
+                      context,
+                    ).colorScheme.surface.withOpacity(0.8),
+                  ),
+                  child: MediaQuery.removePadding(
+                    context: context,
+                    removeTop: true,
+                    child: NavigationBar(
+                      backgroundColor: Colors.transparent,
+                      shadowColor: Colors.transparent,
+                      overlayColor: const WidgetStatePropertyAll(
+                        Colors.transparent,
+                      ),
+                      surfaceTintColor: Colors.transparent,
+                      height: 56,
+                      labelBehavior:
+                          NavigationDestinationLabelBehavior.alwaysHide,
+                      selectedIndex: currentIndex,
+                      onDestinationSelected: onDestinationSelected,
+                      destinations: destinations,
                     ),
                   ),
                 ),
               ),
             ),
-          ],
-        );
-      },
+          ),
+        ),
+      ],
     );
   }
 }
@@ -144,7 +162,7 @@ class TabbedFabLocation extends FloatingActionButtonLocation {
         scaffoldGeometry.floatingActionButtonSize.height -
         scaffoldGeometry.bottomSheetSize.height -
         safeAreaPadding.bottom -
-        (isWideScreen(context) ? 24 : 80) +
+        (isWideScreen(context) ? 32 : 80) +
         16;
 
     return Offset(fabX, fabY);

lib/screens/wallet.dart

@@ -1,4 +1,3 @@
-import 'package:auto_route/annotations.dart';
 import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
@@ -72,7 +71,6 @@ class TransactionListNotifier extends _$TransactionListNotifier
   }
 }
 
-@RoutePage()
 class WalletScreen extends HookConsumerWidget {
   const WalletScreen({super.key});
 

lib/services/compose_storage_db.dart

@@ -1,183 +1,16 @@
 import 'dart:convert';
 import 'package:drift/drift.dart';
-import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:island/database/drift_db.dart';
+import 'package:island/models/post.dart';
 import 'package:island/pods/database.dart';
-import 'package:island/services/file.dart';
-import 'package:island/models/file.dart';
-import 'package:island/pods/config.dart';
-import 'package:island/pods/network.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'compose_storage_db.g.dart';
 
-class ComposeDraftModel {
-  final String id;
-  final String title;
-  final String description;
-  final String content;
-  final List<UniversalFile> attachments;
-  final int visibility;
-  final DateTime lastModified;
-
-  ComposeDraftModel({
-    required this.id,
-    required this.title,
-    required this.description,
-    required this.content,
-    required this.attachments,
-    required this.visibility,
-    required this.lastModified,
-  });
-
-  Map<String, dynamic> toJson() => {
-    'id': id,
-    'title': title,
-    'description': description,
-    'content': content,
-    'attachments': attachments.map((e) => e.toJson()).toList(),
-    'visibility': visibility,
-    'lastModified': lastModified.toIso8601String(),
-  };
-
-  factory ComposeDraftModel.fromJson(Map<String, dynamic> json) => ComposeDraftModel(
-    id: json['id'] as String,
-    title: json['title'] as String? ?? '',
-    description: json['description'] as String? ?? '',
-    content: json['content'] as String? ?? '',
-    attachments: (json['attachments'] as List? ?? [])
-        .map((e) => UniversalFile.fromJson(e as Map<String, dynamic>))
-        .toList(),
-    visibility: json['visibility'] as int? ?? 0,
-    lastModified: DateTime.parse(json['lastModified'] as String),
-  );
-
-  factory ComposeDraftModel.fromDbRow(ComposeDraft row) => ComposeDraftModel(
-    id: row.id,
-    title: row.title,
-    description: row.description,
-    content: row.content,
-    attachments: (jsonDecode(row.attachmentIds) as List)
-        .map((e) => UniversalFile.fromJson(e as Map<String, dynamic>))
-        .toList(),
-    visibility: row.visibility,
-    lastModified: row.lastModified,
-  );
-
-  ComposeDraftsCompanion toDbCompanion() => ComposeDraftsCompanion(
-    id: Value(id),
-    title: Value(title),
-    description: Value(description),
-    content: Value(content),
-    attachmentIds: Value(jsonEncode(attachments.map((e) => e.toJson()).toList())),
-    visibility: Value(visibility),
-    lastModified: Value(lastModified),
-  );
-
-  ComposeDraftModel copyWith({
-    String? id,
-    String? title,
-    String? description,
-    String? content,
-    List<UniversalFile>? attachments,
-    int? visibility,
-    DateTime? lastModified,
-  }) {
-    return ComposeDraftModel(
-      id: id ?? this.id,
-      title: title ?? this.title,
-      description: description ?? this.description,
-      content: content ?? this.content,
-      attachments: attachments ?? this.attachments,
-      visibility: visibility ?? this.visibility,
-      lastModified: lastModified ?? this.lastModified,
-    );
-  }
-
-  bool get isEmpty =>
-      title.isEmpty &&
-      description.isEmpty &&
-      content.isEmpty &&
-      attachments.isEmpty;
-}
-
-class ArticleDraftModel {
-  final String id;
-  final String title;
-  final String description;
-  final String content;
-  final int visibility;
-  final DateTime lastModified;
-
-  ArticleDraftModel({
-    required this.id,
-    required this.title,
-    required this.description,
-    required this.content,
-    required this.visibility,
-    required this.lastModified,
-  });
-
-  Map<String, dynamic> toJson() => {
-    'id': id,
-    'title': title,
-    'description': description,
-    'content': content,
-    'visibility': visibility,
-    'lastModified': lastModified.toIso8601String(),
-  };
-
-  factory ArticleDraftModel.fromJson(Map<String, dynamic> json) => ArticleDraftModel(
-    id: json['id'] as String,
-    title: json['title'] as String? ?? '',
-    description: json['description'] as String? ?? '',
-    content: json['content'] as String? ?? '',
-    visibility: json['visibility'] as int? ?? 0,
-    lastModified: DateTime.parse(json['lastModified'] as String),
-  );
-
-  factory ArticleDraftModel.fromDbRow(ArticleDraft row) => ArticleDraftModel(
-    id: row.id,
-    title: row.title,
-    description: row.description,
-    content: row.content,
-    visibility: row.visibility,
-    lastModified: row.lastModified,
-  );
-
-  ArticleDraftsCompanion toDbCompanion() => ArticleDraftsCompanion(
-    id: Value(id),
-    title: Value(title),
-    description: Value(description),
-    content: Value(content),
-    visibility: Value(visibility),
-    lastModified: Value(lastModified),
-  );
-
-  ArticleDraftModel copyWith({
-    String? id,
-    String? title,
-    String? description,
-    String? content,
-    int? visibility,
-    DateTime? lastModified,
-  }) {
-    return ArticleDraftModel(
-      id: id ?? this.id,
-      title: title ?? this.title,
-      description: description ?? this.description,
-      content: content ?? this.content,
-      visibility: visibility ?? this.visibility,
-      lastModified: lastModified ?? this.lastModified,
-    );
-  }
-
-  bool get isEmpty => title.isEmpty && description.isEmpty && content.isEmpty;
-}
-
 @riverpod
 class ComposeStorageNotifier extends _$ComposeStorageNotifier {
   @override
-  Map<String, ComposeDraftModel> build() {
+  Map<String, SnPost> build() {
     _loadDrafts();
     return {};
   }
@@ -185,10 +18,9 @@ class ComposeStorageNotifier extends _$ComposeStorageNotifier {
   void _loadDrafts() async {
     try {
       final database = ref.read(databaseProvider);
-      final dbDrafts = await database.getAllComposeDrafts();
-      final drafts = <String, ComposeDraftModel>{};
-      for (final dbDraft in dbDrafts) {
-        final draft = ComposeDraftModel.fromDbRow(dbDraft);
+      final dbDrafts = await database.getAllPostDrafts();
+      final drafts = <String, SnPost>{};
+      for (final draft in dbDrafts) {
         drafts[draft.id] = draft;
       }
       state = drafts;
@@ -198,52 +30,22 @@ class ComposeStorageNotifier extends _$ComposeStorageNotifier {
     }
   }
 
-  Future<void> saveDraft(ComposeDraftModel draft) async {
-    if (draft.isEmpty) {
-      await deleteDraft(draft.id);
-      return;
-    }
-
-    // Upload all attachments that are not yet uploaded
-    final uploadedAttachments = <UniversalFile>[];
-    final serverUrl = ref.read(serverUrlProvider);
-    final token = ref.read(tokenProvider);
-    
-    for (final attachment in draft.attachments) {
-      if (!attachment.isOnCloud) {
-        try {
-          final completer = putMediaToCloud(
-            fileData: attachment,
-            atk: token?.token ?? '',
-            baseUrl: serverUrl,
-          );
-          final uploadedFile = await completer.future;
-          if (uploadedFile != null) {
-            uploadedAttachments.add(UniversalFile.fromAttachment(uploadedFile));
-          } else {
-            uploadedAttachments.add(attachment);
-          }
-        } catch (e) {
-          // If upload fails, keep the original file
-          uploadedAttachments.add(attachment);
-        }
-      } else {
-        uploadedAttachments.add(attachment);
-      }
-    }
-
-    final updatedDraft = draft.copyWith(
-      attachments: uploadedAttachments,
-      lastModified: DateTime.now(),
-    );
+  Future<void> saveDraft(SnPost draft) async {
+    final updatedDraft = draft.copyWith(updatedAt: DateTime.now());
     state = {...state, updatedDraft.id: updatedDraft};
-    
+
     try {
       final database = ref.read(databaseProvider);
-      await database.saveComposeDraft(updatedDraft.toDbCompanion());
+      await database.addPostDraft(
+        PostDraftsCompanion(
+          id: Value(updatedDraft.id),
+          post: Value(jsonEncode(updatedDraft.toJson())),
+          lastModified: Value(updatedDraft.updatedAt ?? DateTime.now()),
+        ),
+      );
     } catch (e) {
       // Revert state on error
-      final newState = Map<String, ComposeDraftModel>.from(state);
+      final newState = Map<String, SnPost>.from(state);
       newState.remove(updatedDraft.id);
       state = newState;
       rethrow;
@@ -252,13 +54,13 @@ class ComposeStorageNotifier extends _$ComposeStorageNotifier {
 
   Future<void> deleteDraft(String id) async {
     final oldDraft = state[id];
-    final newState = Map<String, ComposeDraftModel>.from(state);
+    final newState = Map<String, SnPost>.from(state);
     newState.remove(id);
     state = newState;
-    
+
     try {
       final database = ref.read(databaseProvider);
-      await database.deleteComposeDraft(id);
+      await database.deletePostDraft(id);
     } catch (e) {
       // Revert state on error
       if (oldDraft != null) {
@@ -268,22 +70,22 @@ class ComposeStorageNotifier extends _$ComposeStorageNotifier {
     }
   }
 
-  ComposeDraftModel? getDraft(String id) {
+  SnPost? getDraft(String id) {
     return state[id];
   }
 
-  List<ComposeDraftModel> getAllDrafts() {
+  List<SnPost> getAllDrafts() {
     final drafts = state.values.toList();
-    drafts.sort((a, b) => b.lastModified.compareTo(a.lastModified));
+    drafts.sort((a, b) => b.updatedAt!.compareTo(a.updatedAt!));
     return drafts;
   }
 
   Future<void> clearAllDrafts() async {
     state = {};
-    
+
     try {
       final database = ref.read(databaseProvider);
-      await database.clearAllComposeDrafts();
+      await database.clearAllPostDrafts();
     } catch (e) {
       // If clearing fails, we might want to reload from database
       _loadDrafts();
@@ -291,90 +93,3 @@ class ComposeStorageNotifier extends _$ComposeStorageNotifier {
     }
   }
 }
-
-@riverpod
-class ArticleStorageNotifier extends _$ArticleStorageNotifier {
-  @override
-  Map<String, ArticleDraftModel> build() {
-    _loadDrafts();
-    return {};
-  }
-
-  void _loadDrafts() async {
-    try {
-      final database = ref.read(databaseProvider);
-      final dbDrafts = await database.getAllArticleDrafts();
-      final drafts = <String, ArticleDraftModel>{};
-      for (final dbDraft in dbDrafts) {
-        final draft = ArticleDraftModel.fromDbRow(dbDraft);
-        drafts[draft.id] = draft;
-      }
-      state = drafts;
-    } catch (e) {
-      // If there's an error loading drafts, start with empty state
-      state = {};
-    }
-  }
-
-  Future<void> saveDraft(ArticleDraftModel draft) async {
-    if (draft.isEmpty) {
-      await deleteDraft(draft.id);
-      return;
-    }
-
-    final updatedDraft = draft.copyWith(lastModified: DateTime.now());
-    state = {...state, updatedDraft.id: updatedDraft};
-    
-    try {
-      final database = ref.read(databaseProvider);
-      await database.saveArticleDraft(updatedDraft.toDbCompanion());
-    } catch (e) {
-      // Revert state on error
-      final newState = Map<String, ArticleDraftModel>.from(state);
-      newState.remove(updatedDraft.id);
-      state = newState;
-      rethrow;
-    }
-  }
-
-  Future<void> deleteDraft(String id) async {
-    final oldDraft = state[id];
-    final newState = Map<String, ArticleDraftModel>.from(state);
-    newState.remove(id);
-    state = newState;
-    
-    try {
-      final database = ref.read(databaseProvider);
-      await database.deleteArticleDraft(id);
-    } catch (e) {
-      // Revert state on error
-      if (oldDraft != null) {
-        state = {...state, id: oldDraft};
-      }
-      rethrow;
-    }
-  }
-
-  ArticleDraftModel? getDraft(String id) {
-    return state[id];
-  }
-
-  List<ArticleDraftModel> getAllDrafts() {
-    final drafts = state.values.toList();
-    drafts.sort((a, b) => b.lastModified.compareTo(a.lastModified));
-    return drafts;
-  }
-
-  Future<void> clearAllDrafts() async {
-    state = {};
-    
-    try {
-      final database = ref.read(databaseProvider);
-      await database.clearAllArticleDrafts();
-    } catch (e) {
-      // If clearing fails, we might want to reload from database
-      _loadDrafts();
-      rethrow;
-    }
-  }
-}

lib/services/compose_storage_db.g.dart

@@ -7,13 +7,13 @@ part of 'compose_storage_db.dart';
 // **************************************************************************
 
 String _$composeStorageNotifierHash() =>
-    r'fcdb006dca44d30916a20804922e93d0caad49ca';
+    r'4ab4dce85d0a961f096dc3b11505f8f0964dee9d';
 
 /// See also [ComposeStorageNotifier].
 @ProviderFor(ComposeStorageNotifier)
 final composeStorageNotifierProvider = AutoDisposeNotifierProvider<
   ComposeStorageNotifier,
-  Map<String, ComposeDraftModel>
+  Map<String, SnPost>
 >.internal(
   ComposeStorageNotifier.new,
   name: r'composeStorageNotifierProvider',
@@ -25,28 +25,6 @@ final composeStorageNotifierProvider = AutoDisposeNotifierProvider<
   allTransitiveDependencies: null,
 );
 
-typedef _$ComposeStorageNotifier =
-    AutoDisposeNotifier<Map<String, ComposeDraftModel>>;
-String _$articleStorageNotifierHash() =>
-    r'21ee0f8ee87528bebf8f5f4b0b2892cd8058e230';
-
-/// See also [ArticleStorageNotifier].
-@ProviderFor(ArticleStorageNotifier)
-final articleStorageNotifierProvider = AutoDisposeNotifierProvider<
-  ArticleStorageNotifier,
-  Map<String, ArticleDraftModel>
->.internal(
-  ArticleStorageNotifier.new,
-  name: r'articleStorageNotifierProvider',
-  debugGetCreateSourceHash:
-      const bool.fromEnvironment('dart.vm.product')
-          ? null
-          : _$articleStorageNotifierHash,
-  dependencies: null,
-  allTransitiveDependencies: null,
-);
-
-typedef _$ArticleStorageNotifier =
-    AutoDisposeNotifier<Map<String, ArticleDraftModel>>;
+typedef _$ComposeStorageNotifier = AutoDisposeNotifier<Map<String, SnPost>>;
 // ignore_for_file: type=lint
 // ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/services/file.dart

@@ -185,7 +185,6 @@ Completer<SnCloudFile?> _processUpload(
         onProgress: (double progress, Duration estimate) {
           onProgress?.call(progress, estimate);
         },
-        measureUploadSpeed: true,
       )
       .catchError(completer.completeError);
 

lib/services/notify.dart

@@ -1,9 +1,67 @@
+import 'dart:async';
 import 'dart:developer';
 import 'dart:io';
 
 import 'package:dio/dio.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:go_router/go_router.dart';
+import 'package:island/main.dart';
+import 'package:island/route.dart';
+import 'package:island/models/user.dart';
+import 'package:island/pods/websocket.dart';
+import 'package:island/widgets/app_notification.dart';
+import 'package:top_snackbar_flutter/top_snack_bar.dart';
+import 'package:url_launcher/url_launcher_string.dart';
+
+StreamSubscription<WebSocketPacket> setupNotificationListener(
+  BuildContext context,
+  WidgetRef ref,
+) {
+  final ws = ref.watch(websocketProvider);
+  return ws.dataStream.listen((pkt) {
+    if (pkt.type == "notifications.new") {
+      final notification = SnNotification.fromJson(pkt.data!);
+      showTopSnackBar(
+        globalOverlay.currentState!,
+        NotificationCard(notification: notification),
+        onTap: () {
+          if (notification.meta['action_uri'] != null) {
+            var uri = notification.meta['action_uri'] as String;
+            if (uri.startsWith('/')) {
+              // In-app routes
+              rootNavigatorKey.currentContext?.push(
+                notification.meta['action_uri'],
+              );
+            } else {
+              // External URLs
+              launchUrlString(uri);
+            }
+          }
+        },
+        onDismissed: () {},
+        dismissType: DismissType.onSwipe,
+        displayDuration: const Duration(seconds: 5),
+        snackBarPosition: SnackBarPosition.top,
+        padding: EdgeInsets.only(
+          left: 16,
+          right: 16,
+          top:
+              (!kIsWeb &&
+                      (Platform.isMacOS ||
+                          Platform.isWindows ||
+                          Platform.isLinux))
+                  ? 24
+                  // ignore: use_build_context_synchronously
+                  : MediaQuery.of(context).padding.top + 8,
+          bottom: 16,
+        ),
+      );
+    }
+  });
+}
 
 Future<void> subscribePushNotification(Dio apiClient) async {
   await FirebaseMessaging.instance.requestPermission(