🚀 Launch 3.0.0+108

🐛 bunch of bugs fixes

android/app/build.gradle.kts

@@ -57,6 +57,9 @@ android {
 
 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 {

android/app/src/main/AndroidManifest.xml

@@ -46,12 +46,37 @@
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="*/*" />
+                <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="*/*" />
+                <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>
 
@@ -70,6 +95,19 @@
             </intent-filter>
         </activity>
 
+        <receiver
+            android:name=".receiver.ReplyReceiver"
+            android:enabled="true"
+            android:exported="false" />
+
+        <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/dev/solsynth/solian/network/ApiClient.kt

@@ -0,0 +1,48 @@
+package dev.solsynth.solian.network
+
+import android.content.Context
+import okhttp3.*
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.RequestBody.Companion.toRequestBody
+import org.json.JSONObject
+import java.io.IOException
+
+class ApiClient(private val context: Context) {
+    private val client = OkHttpClient()
+
+    fun sendMessage(roomId: String, content: String, repliedMessageId: String, callback: () -> Unit) {
+        val prefs = context.getSharedPreferences("FlutterSharedPreferences", Context.MODE_PRIVATE)
+        val token = prefs.getString("flutter.token", null)
+        val serverUrl = prefs.getString("flutter.serverUrl", null)
+
+        if (token == null || serverUrl == null) {
+            return
+        }
+
+        val url = "$serverUrl/chat/$roomId/messages"
+
+        val json = JSONObject()
+        json.put("content", content)
+        json.put("replied_message_id", repliedMessageId)
+
+        val requestBody = json.toString().toRequestBody("application/json; charset=utf-8".toMediaType())
+
+        val request = Request.Builder()
+            .url(url)
+            .post(requestBody)
+            .addHeader("Authorization", "AtField $token")
+            .build()
+
+        client.newCall(request).enqueue(object : Callback {
+            override fun onFailure(call: Call, e: IOException) {
+                // Handle failure
+                callback()
+            }
+
+            override fun onResponse(call: Call, response: Response) {
+                // Handle success
+                callback()
+            }
+        })
+    }
+}

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,101 @@
+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)
+        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())
+        }
+    }
+}

assets/i18n/en-US.json

@@ -556,5 +556,13 @@
   "tags": "Tags",
   "tagsHint": "Enter tags, separated by commas",
   "categories": "Categories",
-  "categoriesHint": "Enter categories, separated by commas"
+  "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"
 }

ios/Runner.xcodeproj/project.pbxproj

@@ -857,7 +857,7 @@
 				INFOPLIST_FILE = SolianShareExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = SolianShareExtension;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 18.5;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -900,7 +900,7 @@
 				INFOPLIST_FILE = SolianShareExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = SolianShareExtension;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 18.5;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -940,7 +940,7 @@
 				INFOPLIST_FILE = SolianShareExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = SolianShareExtension;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 18.5;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -979,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",
@@ -1021,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",
@@ -1060,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",

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/NotifyDelegate.swift

@@ -10,14 +10,26 @@ 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 {
+        guard let textResponse = response as? UNTextInputNotificationResponse else {
+            completionHandler()
             return
         }
 
-            var token: String? = UserDefaults.standard.getFlutterToken()
-            if token == nil {
+        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
+        }
+        
+        guard let token = UserDefaults.standard.getFlutterToken() else {
+            completionHandler()
             return
         }
         
@@ -30,7 +42,7 @@ class NotifyDelegate: UIResponder, UNUserNotificationCenterDelegate {
         ]
         
         AF.request(url, method: .post, parameters: parameters, encoding: JSONEncoding.default, headers: HTTPHeaders(
-                [HTTPHeader(name: "Authorization", value: "AtField \(token!)")]
+            [HTTPHeader(name: "Authorization", value: "AtField \(token)")]
         ))
             .validate()
             .responseString { response in
@@ -41,9 +53,8 @@ class NotifyDelegate: UIResponder, UNUserNotificationCenterDelegate {
                     print("Failed to send chat reply message: \(error)")
                     break
                 }
-                }
-        }
-        
+                // Call completion handler after network request is finished
                 completionHandler()
             }
     }
+}

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

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 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
+    // 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));
 
-    // 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/models/chat.dart

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

lib/models/chat.freezed.dart

@@ -129,15 +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.isCommunity, 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 final  bool isCommunity;
+@override@JsonKey() final  bool isPublic;
+@override@JsonKey() final  bool isCommunity;
 @override final  SnCloudFile? picture;
 @override final  SnCloudFile? background;
 @override final  String? realmId;

lib/models/chat.g.dart

@@ -11,8 +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,
-  isCommunity: json['is_community'] as bool,
+  isPublic: json['is_public'] as bool? ?? false,
+  isCommunity: json['is_community'] as bool? ?? false,
   picture:
       json['picture'] == null
           ? null

lib/models/realm.dart

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

lib/models/realm.freezed.dart

@@ -117,12 +117,12 @@ $SnCloudFileCopyWith<$Res>? get background {
 @JsonSerializable()
 
 class _SnRealm implements SnRealm {
-  const _SnRealm({required this.id, required this.slug, required 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});
+  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@JsonKey() final  String name;
 @override@JsonKey() final  String description;
 @override final  String? verifiedAs;
 @override final  DateTime? verifiedAt;

lib/models/realm.g.dart

@@ -9,7 +9,7 @@ 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,
+  name: json['name'] as String? ?? '',
   description: json['description'] as String? ?? '',
   verifiedAs: json['verified_as'] as String?,
   verifiedAt:

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

@@ -53,7 +53,10 @@ final routerProvider = Provider<GoRouter>((ref) {
           // Standalone routes without bottom navigation
           GoRoute(
             path: '/posts/compose',
-            builder: (context, state) => const PostComposeScreen(),
+            builder:
+                (context, state) => PostComposeScreen(
+                  initialState: state.extra as PostComposeInitialState?,
+                ),
           ),
           GoRoute(
             path: '/posts/:id/edit',

lib/screens/chat/chat.dart

@@ -434,17 +434,31 @@ class ChatListScreen extends HookConsumerWidget {
 @riverpod
 Future<SnChatRoom?> chatroom(Ref ref, String? identifier) async {
   if (identifier == null) return null;
+  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;
+  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
+  }
 }
 
 class NewChatScreen extends StatelessWidget {

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

@@ -305,7 +305,55 @@ class ChatRoomScreen extends HookConsumerWidget {
       // Identity was not found, user was not joined
       return AppScaffold(
         appBar: AppBar(leading: const PageBackButton()),
-        body: Center(child: Text('You are not a member of this chat room')),
+        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(),
+        ),
       );
     }
 
@@ -443,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)
@@ -617,7 +687,7 @@ class ChatRoomScreen extends HookConsumerWidget {
           IconButton(
             icon: const Icon(Icons.more_vert),
             onPressed: () {
-              context.push('/chat/id/detail');
+              context.push('/chat/$id/detail');
             },
           ),
           const Gap(8),

lib/screens/discovery/realms.dart

@@ -1,24 +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: CustomScrollView(
+      body: Stack(
+        children: [
+          CustomScrollView(
             slivers: [
-          SliverGap(16),
-          SliverRealmList(),
+              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,4 +1,5 @@
 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';
@@ -12,13 +13,13 @@ 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';
@@ -85,8 +86,7 @@ class ExploreScreen extends HookConsumerWidget {
       activityListNotifierProvider(currentFilter.value).notifier,
     );
 
-    return TourTriggerWidget(
-      child: AppScaffold(
+    return AppScaffold(
       extendBody: false, // Prevent conflicts with tabs navigation
       appBar: AppBar(
         toolbarHeight: 0,
@@ -137,13 +137,13 @@ class ExploreScreen extends HookConsumerWidget {
       floatingActionButtonLocation: TabbedFabLocation(context),
       body: TabBarView(
         controller: tabController,
+        physics: const NeverScrollableScrollPhysics(),
         children: [
           _buildActivityList(ref, null),
           _buildActivityList(ref, 'subscriptions'),
           _buildActivityList(ref, 'friends'),
         ],
       ),
-      ),
     );
   }
 
@@ -180,10 +180,8 @@ class _DiscoveryActivityItem extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final items =
-        (data['items'] as List)
-            .map((e) => SnRealm.fromJson(e['data'] as Map<String, dynamic>))
-            .toList();
+    final items = data['items'] as List;
+    final type = items.firstOrNull?['type'] ?? 'unknown';
 
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
@@ -194,7 +192,11 @@ class _DiscoveryActivityItem extends StatelessWidget {
             const Icon(Symbols.explore, size: 19),
             const Gap(8),
             Text(
-              'discoverCommunities'.tr(),
+              (switch (type) {
+                'realm' => 'discoverRealms',
+                'publisher' => 'discoverPublishers',
+                _ => 'unknown',
+              }).tr(),
               style: Theme.of(context).textTheme.titleMedium,
             ).padding(top: 1),
           ],
@@ -204,13 +206,26 @@ class _DiscoveryActivityItem extends StatelessWidget {
           child: ListView.builder(
             scrollDirection: Axis.horizontal,
             itemCount: items.length,
-            padding: const EdgeInsets.only(right: 8),
+            padding: const EdgeInsets.symmetric(horizontal: 8),
             itemBuilder: (context, index) {
-              final realm = items[index];
-              return RealmCard(realm: realm);
+              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),
       ],
     );
   }
@@ -326,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/posts/pub_profile.dart

@@ -54,6 +54,7 @@ Future<SnSubscriptionStatus> publisherSubscriptionStatus(
 
 @riverpod
 Future<Color?> publisherAppbarForcegroundColor(Ref ref, String pubName) async {
+  try {
     final publisher = await ref.watch(publisherProvider(pubName).future);
     if (publisher.background == null) return null;
     final palette = await PaletteGenerator.fromImageProvider(
@@ -65,14 +66,14 @@ Future<Color?> publisherAppbarForcegroundColor(Ref ref, String pubName) async {
     final dominantColor = palette.dominantColor?.color;
     if (dominantColor == null) return null;
     return dominantColor.computeLuminance() > 0.5 ? Colors.black : Colors.white;
+  } catch (_) {
+    return null;
+  }
 }
 
 class PublisherProfileScreen extends HookConsumerWidget {
   final String name;
-  const PublisherProfileScreen({
-    super.key,
-    required this.name,
-  });
+  const PublisherProfileScreen({super.key, required this.name});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {

lib/screens/realm/detail.dart

@@ -155,7 +155,7 @@ class RealmDetailScreen extends HookConsumerWidget {
                                     ),
                                   ],
                                 ),
-                                if (identity == null && realm.isPublic)
+                                if (identity == null && realm.isCommunity)
                                   FilledButton.tonalIcon(
                                     onPressed: () async {
                                       try {
@@ -169,14 +169,14 @@ class RealmDetailScreen extends HookConsumerWidget {
                                           realmIdentityProvider(slug),
                                         );
                                         ref.invalidate(realmsJoinedProvider);
-                                        showSnackBar('joinRealmSuccess'.tr());
+                                        showSnackBar('realmJoinSuccess'.tr());
                                       } catch (err) {
                                         showErrorAlert(err);
                                       }
                                     },
                                     icon: const Icon(Symbols.add),
-                                    label: const Text('joinRealm').tr(),
-                                  ).padding(horizontal: 16, vertical: 8)
+                                    label: const Text('realmJoin').tr(),
+                                  ).padding(horizontal: 16, vertical: 16)
                                 else
                                   const SizedBox.shrink(),
                               ],

lib/services/notify.dart

@@ -32,7 +32,9 @@ StreamSubscription<WebSocketPacket> setupNotificationListener(
             var uri = notification.meta['action_uri'] as String;
             if (uri.startsWith('/')) {
               // In-app routes
-              rootNavigatorKey.currentContext?.push(notification.meta['action_uri']);
+              rootNavigatorKey.currentContext?.push(
+                notification.meta['action_uri'],
+              );
             } else {
               // External URLs
               launchUrlString(uri);
@@ -46,8 +48,14 @@ StreamSubscription<WebSocketPacket> setupNotificationListener(
         padding: EdgeInsets.only(
           left: 16,
           right: 16,
+          top:
+              (!kIsWeb &&
+                      (Platform.isMacOS ||
+                          Platform.isWindows ||
+                          Platform.isLinux))
+                  ? 24
                   // ignore: use_build_context_synchronously
-          top: MediaQuery.of(context).padding.top + 24,
+                  : MediaQuery.of(context).padding.top + 8,
           bottom: 16,
         ),
       );

lib/widgets/app_wrapper.dart

@@ -4,6 +4,7 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/services/notify.dart';
 import 'package:island/services/sharing_intent.dart';
+import 'package:island/widgets/tour/tour.dart';
 
 class AppWrapper extends HookConsumerWidget {
   final Widget child;
@@ -24,6 +25,6 @@ class AppWrapper extends HookConsumerWidget {
       };
     }, const []);
 
-    return child;
+    return TourTriggerWidget(child: child);
   }
 }

lib/widgets/content/cloud_file_collection.dart

@@ -186,13 +186,7 @@ class CloudFileZoomIn extends HookConsumerWidget {
     Future<void> saveToGallery() async {
       try {
         // Show loading indicator
-        final scaffold = ScaffoldMessenger.of(context);
-        scaffold.showSnackBar(
-          const SnackBar(
-            content: Text('Saving image to gallery...'),
-            duration: Duration(seconds: 1),
-          ),
-        );
+        showSnackBar('Saving image to gallery...');
 
         // Get the image URL
         final client = ref.watch(apiClientProvider);
@@ -209,12 +203,7 @@ class CloudFileZoomIn extends HookConsumerWidget {
         await Gal.putImage(filePath, album: 'Solar Network');
 
         // Show success message
-        scaffold.showSnackBar(
-          const SnackBar(
-            content: Text('Image saved to gallery'),
-            duration: Duration(seconds: 2),
-          ),
-        );
+        showSnackBar('Image saved to gallery');
       } catch (e) {
         showErrorAlert(e);
       }

lib/widgets/publisher/publisher_card.dart

@@ -0,0 +1,100 @@
+import 'package:flutter/material.dart';
+import 'package:gap/gap.dart';
+import 'package:go_router/go_router.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/post.dart';
+import 'package:island/widgets/content/cloud_files.dart';
+
+class PublisherCard extends ConsumerWidget {
+  final SnPublisher publisher;
+  final double? maxWidth;
+
+  const PublisherCard({super.key, required this.publisher, this.maxWidth});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    Widget imageWidget;
+    if (publisher.picture != null) {
+      imageWidget = CloudImageWidget(
+        file: publisher.background,
+        fit: BoxFit.cover,
+      );
+    } else {
+      imageWidget = ColoredBox(
+        color: Theme.of(context).colorScheme.secondaryContainer,
+      );
+    }
+
+    Widget card = Card(
+      clipBehavior: Clip.antiAlias,
+      child: InkWell(
+        onTap: () {
+          context.push('/publishers/${publisher.name}');
+        },
+        child: AspectRatio(
+          aspectRatio: 16 / 7,
+          child: Stack(
+            fit: StackFit.expand,
+            children: [
+              imageWidget,
+              Positioned(
+                bottom: 0,
+                left: 0,
+                right: 0,
+                child: Container(
+                  decoration: BoxDecoration(
+                    gradient: LinearGradient(
+                      begin: Alignment.bottomCenter,
+                      end: Alignment.topCenter,
+                      colors: [
+                        Colors.black.withOpacity(0.7),
+                        Colors.transparent,
+                      ],
+                    ),
+                  ),
+                  padding: const EdgeInsets.all(8),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Container(
+                        decoration: BoxDecoration(
+                          shape: BoxShape.circle,
+                          boxShadow: [
+                            BoxShadow(
+                              color: Colors.black.withOpacity(0.5),
+                              blurRadius: 4,
+                              offset: const Offset(0, 2),
+                            ),
+                          ],
+                        ),
+                        child: ProfilePictureWidget(
+                          file: publisher.picture,
+                          radius: 12,
+                        ),
+                      ),
+                      const Gap(2),
+                      Text(
+                        publisher.nick,
+                        style: Theme.of(context).textTheme.titleSmall?.copyWith(
+                          color: Colors.white,
+                          fontWeight: FontWeight.bold,
+                        ),
+                        maxLines: 2,
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+
+    return ConstrainedBox(
+      constraints: BoxConstraints(maxWidth: maxWidth ?? double.infinity),
+      child: card,
+    );
+  }
+}

lib/widgets/realm/realm_card.dart

@@ -1,41 +1,33 @@
 import 'package:flutter/material.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/widgets/content/cloud_files.dart';
 import 'package:material_symbols_icons/symbols.dart';
 
 class RealmCard extends ConsumerWidget {
   final SnRealm realm;
+  final double? maxWidth;
 
-  const RealmCard({super.key, required this.realm});
+  const RealmCard({super.key, required this.realm, this.maxWidth});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final client = ref.watch(apiClientProvider);
-
     Widget imageWidget;
     if (realm.picture != null) {
-      final imageUrl = '${client.options.baseUrl}/files/${realm.picture!.id}';
-      imageWidget = Image.network(
-        imageUrl,
+      imageWidget =
+          imageWidget = CloudImageWidget(
+            file: realm.background,
             fit: BoxFit.cover,
-        width: double.infinity,
-        height: double.infinity,
           );
     } else {
-      imageWidget = Container(
+      imageWidget = ColoredBox(
         color: Theme.of(context).colorScheme.secondaryContainer,
-        child: Center(
-          child: Icon(
-            Symbols.photo_camera,
-            color: Theme.of(context).colorScheme.onSecondaryContainer,
-          ),
-        ),
       );
     }
 
-    return Card(
+    Widget card = Card(
       clipBehavior: Clip.antiAlias,
       child: InkWell(
         onTap: () {
@@ -44,6 +36,7 @@ class RealmCard extends ConsumerWidget {
         child: AspectRatio(
           aspectRatio: 16 / 7,
           child: Stack(
+            fit: StackFit.expand,
             children: [
               imageWidget,
               Positioned(
@@ -62,7 +55,28 @@ class RealmCard extends ConsumerWidget {
                     ),
                   ),
                   padding: const EdgeInsets.all(8),
-                  child: Text(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Container(
+                        decoration: BoxDecoration(
+                          shape: BoxShape.circle,
+                          boxShadow: [
+                            BoxShadow(
+                              color: Colors.black.withOpacity(0.5),
+                              blurRadius: 4,
+                              offset: const Offset(0, 2),
+                            ),
+                          ],
+                        ),
+                        child: ProfilePictureWidget(
+                          file: realm.picture,
+                          fallbackIcon: Symbols.group,
+                          radius: 12,
+                        ),
+                      ),
+                      const Gap(2),
+                      Text(
                         realm.name,
                         style: Theme.of(context).textTheme.titleSmall?.copyWith(
                           color: Colors.white,
@@ -71,6 +85,8 @@ class RealmCard extends ConsumerWidget {
                         maxLines: 2,
                         overflow: TextOverflow.ellipsis,
                       ),
+                    ],
+                  ),
                 ),
               ),
             ],
@@ -78,5 +94,10 @@ class RealmCard extends ConsumerWidget {
         ),
       ),
     );
+
+    return ConstrainedBox(
+      constraints: BoxConstraints(maxWidth: maxWidth ?? double.infinity),
+      child: card,
+    );
   }
 }

lib/widgets/realm/realm_list.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/realm.dart';
 import 'package:island/pods/network.dart';
@@ -14,16 +15,23 @@ class RealmListNotifier extends _$RealmListNotifier
   static const int _pageSize = 20;
 
   @override
-  Future<CursorPagingData<SnRealm>> build() {
-    return fetch(cursor: null);
+  Future<CursorPagingData<SnRealm>> build(String? query) {
+    return fetch(cursor: null, query: query);
   }
 
   @override
-  Future<CursorPagingData<SnRealm>> fetch({required String? cursor}) async {
+  Future<CursorPagingData<SnRealm>> fetch({
+    required String? cursor,
+    String? query,
+  }) async {
     final client = ref.read(apiClientProvider);
     final offset = cursor == null ? 0 : int.parse(cursor);
 
-    final queryParams = {'offset': offset, 'take': _pageSize};
+    final queryParams = {
+      'offset': offset,
+      'take': _pageSize,
+      if (query != null && query.isNotEmpty) 'query': query,
+    };
 
     final response = await client.get(
       '/discovery/realms',
@@ -45,16 +53,18 @@ class RealmListNotifier extends _$RealmListNotifier
 }
 
 class SliverRealmList extends HookConsumerWidget {
-  const SliverRealmList({super.key});
+  const SliverRealmList({super.key, this.query});
+
+  final String? query;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return PagingHelperSliverView(
-      provider: realmListNotifierProvider,
-      futureRefreshable: realmListNotifierProvider.future,
-      notifierRefreshable: realmListNotifierProvider.notifier,
+      provider: realmListNotifierProvider(query),
+      futureRefreshable: realmListNotifierProvider(query).future,
+      notifierRefreshable: realmListNotifierProvider(query).notifier,
       contentBuilder:
-          (data, widgetCount, endItemView) => SliverList.builder(
+          (data, widgetCount, endItemView) => SliverList.separated(
             itemCount: widgetCount,
             itemBuilder: (context, index) {
               if (index == widgetCount - 1) {
@@ -71,6 +81,7 @@ class SliverRealmList extends HookConsumerWidget {
                 child: RealmCard(realm: realm),
               );
             },
+            separatorBuilder: (_, _) => const Gap(8),
           ),
     );
   }

lib/widgets/realm/realm_list.g.dart

@@ -6,25 +6,174 @@ part of 'realm_list.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$realmListNotifierHash() => r'440eb8c61db2059699191b904b6518a0b01ccd25';
+String _$realmListNotifierHash() => r'02dee373a5609a5617b04ffec395d09dea7ae070';
+
+/// 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 _$RealmListNotifier
+    extends BuildlessAutoDisposeAsyncNotifier<CursorPagingData<SnRealm>> {
+  late final String? query;
+
+  FutureOr<CursorPagingData<SnRealm>> build(String? query);
+}
 
 /// See also [RealmListNotifier].
 @ProviderFor(RealmListNotifier)
-final realmListNotifierProvider = AutoDisposeAsyncNotifierProvider<
+const realmListNotifierProvider = RealmListNotifierFamily();
+
+/// See also [RealmListNotifier].
+class RealmListNotifierFamily
+    extends Family<AsyncValue<CursorPagingData<SnRealm>>> {
+  /// See also [RealmListNotifier].
+  const RealmListNotifierFamily();
+
+  /// See also [RealmListNotifier].
+  RealmListNotifierProvider call(String? query) {
+    return RealmListNotifierProvider(query);
+  }
+
+  @override
+  RealmListNotifierProvider getProviderOverride(
+    covariant RealmListNotifierProvider provider,
+  ) {
+    return call(provider.query);
+  }
+
+  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'realmListNotifierProvider';
+}
+
+/// See also [RealmListNotifier].
+class RealmListNotifierProvider
+    extends
+        AutoDisposeAsyncNotifierProviderImpl<
           RealmListNotifier,
           CursorPagingData<SnRealm>
->.internal(
-  RealmListNotifier.new,
+        > {
+  /// See also [RealmListNotifier].
+  RealmListNotifierProvider(String? query)
+    : this._internal(
+        () => RealmListNotifier()..query = query,
+        from: realmListNotifierProvider,
         name: r'realmListNotifierProvider',
         debugGetCreateSourceHash:
             const bool.fromEnvironment('dart.vm.product')
                 ? null
                 : _$realmListNotifierHash,
-  dependencies: null,
-  allTransitiveDependencies: null,
+        dependencies: RealmListNotifierFamily._dependencies,
+        allTransitiveDependencies:
+            RealmListNotifierFamily._allTransitiveDependencies,
+        query: query,
       );
 
-typedef _$RealmListNotifier =
-    AutoDisposeAsyncNotifier<CursorPagingData<SnRealm>>;
+  RealmListNotifierProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.query,
+  }) : super.internal();
+
+  final String? query;
+
+  @override
+  FutureOr<CursorPagingData<SnRealm>> runNotifierBuild(
+    covariant RealmListNotifier notifier,
+  ) {
+    return notifier.build(query);
+  }
+
+  @override
+  Override overrideWith(RealmListNotifier Function() create) {
+    return ProviderOverride(
+      origin: this,
+      override: RealmListNotifierProvider._internal(
+        () => create()..query = query,
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        query: query,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeAsyncNotifierProviderElement<
+    RealmListNotifier,
+    CursorPagingData<SnRealm>
+  >
+  createElement() {
+    return _RealmListNotifierProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is RealmListNotifierProvider && other.query == query;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, query.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin RealmListNotifierRef
+    on AutoDisposeAsyncNotifierProviderRef<CursorPagingData<SnRealm>> {
+  /// The parameter `query` of this provider.
+  String? get query;
+}
+
+class _RealmListNotifierProviderElement
+    extends
+        AutoDisposeAsyncNotifierProviderElement<
+          RealmListNotifier,
+          CursorPagingData<SnRealm>
+        >
+    with RealmListNotifierRef {
+  _RealmListNotifierProviderElement(super.provider);
+
+  @override
+  String? get query => (origin as RealmListNotifierProvider).query;
+}
+
 // ignore_for_file: type=lint
 // ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

lib/widgets/share/share_sheet.dart

@@ -13,6 +13,7 @@ import 'package:island/pods/network.dart';
 import 'package:island/pods/config.dart';
 import 'package:island/pods/userinfo.dart';
 import 'package:island/services/file.dart';
+import 'package:mime/mime.dart';
 
 import 'dart:io';
 import 'package:path/path.dart' as path;
@@ -149,9 +150,9 @@ class _ShareSheetState extends ConsumerState<ShareSheet> {
         case ShareContentType.file:
           if (widget.content.files != null) {
             // Convert XFiles to UniversalFiles
-            for (final xFile in widget.content.files!) {
-              final file = File(xFile.path);
-              final mimeType = xFile.mimeType;
+            for (final file in widget.content.files!) {
+              var mimeType = file.mimeType;
+              mimeType ??= lookupMimeType(file.path);
 
               UniversalFileType fileType;
               if (mimeType?.startsWith('image/') == true) {

macos/Podfile.lock

@@ -49,6 +49,8 @@ PODS:
     - OrderedSet (~> 6.0.3)
   - flutter_platform_alert (0.0.1):
     - FlutterMacOS
+  - flutter_secure_storage_macos (6.1.3):
+    - FlutterMacOS
   - flutter_timezone (0.1.0):
     - FlutterMacOS
   - flutter_udid (0.0.1):
@@ -171,6 +173,7 @@ DEPENDENCIES:
   - firebase_messaging (from `Flutter/ephemeral/.symlinks/plugins/firebase_messaging/macos`)
   - flutter_inappwebview_macos (from `Flutter/ephemeral/.symlinks/plugins/flutter_inappwebview_macos/macos`)
   - flutter_platform_alert (from `Flutter/ephemeral/.symlinks/plugins/flutter_platform_alert/macos`)
+  - flutter_secure_storage_macos (from `Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos`)
   - flutter_timezone (from `Flutter/ephemeral/.symlinks/plugins/flutter_timezone/macos`)
   - flutter_udid (from `Flutter/ephemeral/.symlinks/plugins/flutter_udid/macos`)
   - flutter_webrtc (from `Flutter/ephemeral/.symlinks/plugins/flutter_webrtc/macos`)
@@ -232,6 +235,8 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/flutter_inappwebview_macos/macos
   flutter_platform_alert:
     :path: Flutter/ephemeral/.symlinks/plugins/flutter_platform_alert/macos
+  flutter_secure_storage_macos:
+    :path: Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos
   flutter_timezone:
     :path: Flutter/ephemeral/.symlinks/plugins/flutter_timezone/macos
   flutter_udid:
@@ -295,6 +300,7 @@ SPEC CHECKSUMS:
   FirebaseMessaging: 195bbdb73e6ca1dbc76cd46e73f3552c084ef6e4
   flutter_inappwebview_macos: c2d68649f9f8f1831bfcd98d73fd6256366d9d1d
   flutter_platform_alert: 8fa7a7c21f95b26d08b4a3891936ca27e375f284
+  flutter_secure_storage_macos: 7f45e30f838cf2659862a4e4e3ee1c347c2b3b54
   flutter_timezone: d59eea86178cbd7943cd2431cc2eaa9850f935d8
   flutter_udid: d26e455e8c06174e6aff476e147defc6cae38495
   flutter_webrtc: a7eeb54859e672228c28f4b48b1fb61561976ea3

pubspec.lock

@@ -1470,7 +1470,7 @@ packages:
     source: hosted
     version: "1.16.0"
   mime:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: mime
       sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
@@ -1785,10 +1785,10 @@ packages:
     dependency: transitive
     description:
       name: record_linux
-      sha256: "29e7735b05c1944bb6c9b72a36c08d4a1b24117e712d6a9523c003bde12bf484"
+      sha256: "0626678a092c75ce6af1e32fe7fd1dea709b92d308bc8e3b6d6348e2430beb95"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   record_macos:
     dependency: transitive
     description:
@@ -2254,10 +2254,10 @@ packages:
     dependency: transitive
     description:
       name: synchronized
-      sha256: "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6"
+      sha256: c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.1"
+    version: "3.4.0"
   table_calendar:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 3.0.0+107
+version: 3.0.0+108
 
 environment:
   sdk: ^3.7.2
@@ -126,6 +126,7 @@ dependencies:
    git:
       url: https://github.com/lionelmennig/textfield_tags.git
       ref: fixes/allow-controller-re-registration
+  mime: ^2.0.0
 
 dev_dependencies:
   flutter_test: