🐛 Bug fixes

⚡ Cache link expansion image

ios/Podfile.lock

@@ -51,6 +51,9 @@ PODS:
   - Firebase/Messaging (10.29.0):
     - Firebase/CoreOnly
     - FirebaseMessaging (~> 10.29.0)
+  - Firebase/Performance (10.29.0):
+    - Firebase/CoreOnly
+    - FirebasePerformance (~> 10.29.0)
   - firebase_analytics (11.2.1):
     - Firebase/Analytics (= 10.29.0)
     - firebase_core
@@ -66,6 +69,12 @@ PODS:
     - Firebase/Messaging (= 10.29.0)
     - firebase_core
     - Flutter
+  - firebase_performance (0.10.0-4):
+    - Firebase/Performance (= 10.29.0)
+    - firebase_core
+    - Flutter
+  - FirebaseABTesting (10.29.0):
+    - FirebaseCore (~> 10.0)
   - FirebaseAnalytics (10.29.0):
     - FirebaseAnalytics/AdIdSupport (= 10.29.0)
     - FirebaseCore (~> 10.0)
@@ -115,6 +124,25 @@ PODS:
     - GoogleUtilities/Reachability (~> 7.8)
     - GoogleUtilities/UserDefaults (~> 7.8)
     - nanopb (< 2.30911.0, >= 2.30908.0)
+  - FirebasePerformance (10.29.0):
+    - FirebaseCore (~> 10.5)
+    - FirebaseInstallations (~> 10.0)
+    - FirebaseRemoteConfig (~> 10.0)
+    - FirebaseSessions (~> 10.5)
+    - GoogleDataTransport (~> 9.2)
+    - GoogleUtilities/Environment (~> 7.13)
+    - GoogleUtilities/ISASwizzler (~> 7.13)
+    - GoogleUtilities/MethodSwizzler (~> 7.13)
+    - GoogleUtilities/UserDefaults (~> 7.13)
+    - nanopb (< 2.30911.0, >= 2.30908.0)
+  - FirebaseRemoteConfig (10.29.0):
+    - FirebaseABTesting (~> 10.0)
+    - FirebaseCore (~> 10.0)
+    - FirebaseInstallations (~> 10.0)
+    - FirebaseRemoteConfigInterop (~> 10.23)
+    - FirebaseSharedSwift (~> 10.0)
+    - GoogleUtilities/Environment (~> 7.8)
+    - "GoogleUtilities/NSData+zlib (~> 7.8)"
   - FirebaseRemoteConfigInterop (10.29.0)
   - FirebaseSessions (10.29.0):
     - FirebaseCore (~> 10.5)
@@ -125,6 +153,7 @@ PODS:
     - GoogleUtilities/UserDefaults (~> 7.13)
     - nanopb (< 2.30911.0, >= 2.30908.0)
     - PromisesSwift (~> 2.1)
+  - FirebaseSharedSwift (10.29.0)
   - Flutter (1.0.0)
   - flutter_keyboard_visibility (0.0.1):
     - Flutter
@@ -168,6 +197,8 @@ PODS:
   - GoogleUtilities/Environment (7.13.3):
     - GoogleUtilities/Privacy
     - PromisesObjC (< 3.0, >= 1.2)
+  - GoogleUtilities/ISASwizzler (7.13.3):
+    - GoogleUtilities/Privacy
   - GoogleUtilities/Logger (7.13.3):
     - GoogleUtilities/Environment
     - GoogleUtilities/Privacy
@@ -196,6 +227,12 @@ PODS:
   - livekit_client (2.2.4):
     - Flutter
     - WebRTC-SDK (= 125.6422.04)
+  - media_kit_libs_ios_video (1.0.4):
+    - Flutter
+  - media_kit_native_event_loop (1.0.0):
+    - Flutter
+  - media_kit_video (0.0.1):
+    - Flutter
   - nanopb (2.30910.0):
     - nanopb/decode (= 2.30910.0)
     - nanopb/encode (= 2.30910.0)
@@ -217,6 +254,8 @@ PODS:
     - PromisesObjC (= 2.4.0)
   - protocol_handler_ios (0.0.1):
     - Flutter
+  - screen_brightness_ios (0.1.0):
+    - Flutter
   - SDWebImage (5.19.6):
     - SDWebImage/Core (= 5.19.6)
   - SDWebImage/Core (5.19.6)
@@ -232,9 +271,8 @@ PODS:
   - TOCropViewController (2.7.4)
   - url_launcher_ios (0.0.1):
     - Flutter
-  - video_player_avfoundation (0.0.1):
+  - volume_controller (0.0.1):
     - Flutter
-    - FlutterMacOS
   - wakelock_plus (0.0.1):
     - Flutter
   - WebRTC-SDK (125.6422.04)
@@ -247,6 +285,7 @@ DEPENDENCIES:
   - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
   - firebase_crashlytics (from `.symlinks/plugins/firebase_crashlytics/ios`)
   - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
+  - firebase_performance (from `.symlinks/plugins/firebase_performance/ios`)
   - Flutter (from `Flutter`)
   - flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`)
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
@@ -255,17 +294,21 @@ DEPENDENCIES:
   - image_cropper (from `.symlinks/plugins/image_cropper/ios`)
   - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
   - livekit_client (from `.symlinks/plugins/livekit_client/ios`)
+  - media_kit_libs_ios_video (from `.symlinks/plugins/media_kit_libs_ios_video/ios`)
+  - media_kit_native_event_loop (from `.symlinks/plugins/media_kit_native_event_loop/ios`)
+  - media_kit_video (from `.symlinks/plugins/media_kit_video/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - pasteboard (from `.symlinks/plugins/pasteboard/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - pointer_interceptor_ios (from `.symlinks/plugins/pointer_interceptor_ios/ios`)
   - protocol_handler_ios (from `.symlinks/plugins/protocol_handler_ios/ios`)
+  - screen_brightness_ios (from `.symlinks/plugins/screen_brightness_ios/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - sqflite (from `.symlinks/plugins/sqflite/darwin`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
-  - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`)
+  - volume_controller (from `.symlinks/plugins/volume_controller/ios`)
   - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
 
 SPEC REPOS:
@@ -273,6 +316,7 @@ SPEC REPOS:
     - DKImagePickerController
     - DKPhotoGallery
     - Firebase
+    - FirebaseABTesting
     - FirebaseAnalytics
     - FirebaseCore
     - FirebaseCoreExtension
@@ -280,8 +324,11 @@ SPEC REPOS:
     - FirebaseCrashlytics
     - FirebaseInstallations
     - FirebaseMessaging
+    - FirebasePerformance
+    - FirebaseRemoteConfig
     - FirebaseRemoteConfigInterop
     - FirebaseSessions
+    - FirebaseSharedSwift
     - GoogleAppMeasurement
     - GoogleDataTransport
     - GoogleUtilities
@@ -308,6 +355,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/firebase_crashlytics/ios"
   firebase_messaging:
     :path: ".symlinks/plugins/firebase_messaging/ios"
+  firebase_performance:
+    :path: ".symlinks/plugins/firebase_performance/ios"
   Flutter:
     :path: Flutter
   flutter_keyboard_visibility:
@@ -324,6 +373,12 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/image_picker_ios/ios"
   livekit_client:
     :path: ".symlinks/plugins/livekit_client/ios"
+  media_kit_libs_ios_video:
+    :path: ".symlinks/plugins/media_kit_libs_ios_video/ios"
+  media_kit_native_event_loop:
+    :path: ".symlinks/plugins/media_kit_native_event_loop/ios"
+  media_kit_video:
+    :path: ".symlinks/plugins/media_kit_video/ios"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
   pasteboard:
@@ -336,6 +391,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/pointer_interceptor_ios/ios"
   protocol_handler_ios:
     :path: ".symlinks/plugins/protocol_handler_ios/ios"
+  screen_brightness_ios:
+    :path: ".symlinks/plugins/screen_brightness_ios/ios"
   share_plus:
     :path: ".symlinks/plugins/share_plus/ios"
   shared_preferences_foundation:
@@ -344,8 +401,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/sqflite/darwin"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
-  video_player_avfoundation:
+  volume_controller:
-    :path: ".symlinks/plugins/video_player_avfoundation/darwin"
+    :path: ".symlinks/plugins/volume_controller/ios"
   wakelock_plus:
     :path: ".symlinks/plugins/wakelock_plus/ios"
 
@@ -360,6 +417,8 @@ SPEC CHECKSUMS:
   firebase_core: 57aeb91680e5d5e6df6b888064be7c785f146efb
   firebase_crashlytics: e3d3e0c99bad5aaab5908385133dea8ec344693f
   firebase_messaging: c862b3d2b973ecc769194dc8de09bd22c77ae757
+  firebase_performance: 8643e815a354ee94da1192cd69335a48a7b625a4
+  FirebaseABTesting: d87f56707159bae64e269757a6e963d490f2eebe
   FirebaseAnalytics: 23717de130b779aa506e757edb9713d24b6ffeda
   FirebaseCore: 30e9c1cbe3d38f5f5e75f48bfcea87d7c358ec16
   FirebaseCoreExtension: 705ca5b14bf71d2564a0ddc677df1fc86ffa600f
@@ -367,8 +426,11 @@ SPEC CHECKSUMS:
   FirebaseCrashlytics: 34647b41e18de773717fdd348a22206f2f9bc774
   FirebaseInstallations: 913cf60d0400ebd5d6b63a28b290372ab44590dd
   FirebaseMessaging: 7b5d8033e183ab59eb5b852a53201559e976d366
+  FirebasePerformance: d0ac4aa90f8c1aedeb8d0329a56e2d77d8d9e004
+  FirebaseRemoteConfig: 48ef3f243742a8d72422ccfc9f986e19d7de53fd
   FirebaseRemoteConfigInterop: 6efda51fb5e2f15b16585197e26eaa09574e8a4d
   FirebaseSessions: dbd14adac65ce996228652c1fc3a3f576bdf3ecc
+  FirebaseSharedSwift: 20530f495084b8d840f78a100d8c5ee613375f6e
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
   flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
@@ -380,6 +442,9 @@ SPEC CHECKSUMS:
   image_cropper: 37d40f62177c101ff4c164906d259ea2c3aa70cf
   image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
   livekit_client: d079c5f040d4bf2b80440ff0ae997725a183e4bc
+  media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1
+  media_kit_native_event_loop: e6b2ab20cf0746eb1c33be961fcf79667304fa2a
+  media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
   nanopb: 438bc412db1928dac798aa6fd75726007be04262
   package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
   pasteboard: 982969ebaa7c78af3e6cc7761e8f5e77565d9ce0
@@ -389,6 +454,7 @@ SPEC CHECKSUMS:
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
   protocol_handler_ios: a5db8abc38526ee326988b808be621e5fd568990
+  screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
   SDWebImage: a79252b60f4678812d94316c91da69ec83089c9f
   share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
@@ -396,7 +462,7 @@ SPEC CHECKSUMS:
   SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
   TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654
   url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
-  video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
+  volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9
   wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1
   WebRTC-SDK: c3d69a87e7185fad3568f6f3cff7c9ac5890acf3
 

ios/Runner.xcodeproj/project.pbxproj

@@ -254,6 +254,7 @@
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
 				B1CDA9DD5B638A2BB88053CB /* [CP] Check Pods Manifest.lock */,
+				7356FAC42C72724B0051A465 /* [Crashlytics] Clear dSYM */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
@@ -263,7 +264,7 @@
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				287A33C298CA352A7E7F32A4 /* [CP] Embed Pods Frameworks */,
 				0818E8E4321C0D7433E07576 /* [CP] Copy Pods Resources */,
-				1A9FD6BE5DEE99CDA7399504 /* FlutterFire: "flutterfire upload-crashlytics-symbols" */,
+				1A9FD6BE5DEE99CDA7399504 /* [Crashlytics] Upload dSYM */,
 			);
 			buildRules = (
 			);
@@ -366,7 +367,7 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		1A9FD6BE5DEE99CDA7399504 /* FlutterFire: "flutterfire upload-crashlytics-symbols" */ = {
+		1A9FD6BE5DEE99CDA7399504 /* [Crashlytics] Upload dSYM */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -375,14 +376,14 @@
 			);
 			inputPaths = (
 			);
-			name = "FlutterFire: \"flutterfire upload-crashlytics-symbols\"";
+			name = "[Crashlytics] Upload dSYM";
 			outputFileListPaths = (
 			);
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\n#!/bin/bash\nPATH=${PATH}:$FLUTTER_ROOT/bin:$HOME/.pub-cache/bin\nflutterfire upload-crashlytics-symbols --upload-symbols-script-path=$PODS_ROOT/FirebaseCrashlytics/upload-symbols --platform=ios --apple-project-path=${SRCROOT} --env-platform-name=${PLATFORM_NAME} --env-configuration=${CONFIGURATION} --env-project-dir=${PROJECT_DIR} --env-built-products-dir=${BUILT_PRODUCTS_DIR} --env-dwarf-dsym-folder-path=${DWARF_DSYM_FOLDER_PATH} --env-dwarf-dsym-file-name=${DWARF_DSYM_FILE_NAME} --env-infoplist-path=${INFOPLIST_PATH} --default-config=default\n";
+			shellScript = "\n#!/bin/bash\nsleep 1 # Without this, there seems a chance that the script runs before dSYM generation is finished \n$PODS_ROOT/FirebaseCrashlytics/upload-symbols -gsp $PROJECT_DIR/Runner/GoogleService-Info.plist -p ios $DWARF_DSYM_FOLDER_PATH/$DWARF_DSYM_FILE_NAME\n";
 		};
 		259653AE41D478F4C6BAE9B2 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -439,6 +440,24 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
+		7356FAC42C72724B0051A465 /* [Crashlytics] Clear dSYM */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "[Crashlytics] Clear dSYM";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\n#!/bin/bash\nrm -rf $DWARF_DSYM_FOLDER_PATH/$DWARF_DSYM_FILE_NAME\n";
+		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -452,7 +471,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
 		};
 		B1CDA9DD5B638A2BB88053CB /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;

lib/controllers/post_editor_controller.dart

@@ -31,9 +31,9 @@ class PostEditorController extends GetxController {
   Rx<Realm?> realmZone = Rx(null);
   Rx<DateTime?> publishedAt = Rx(null);
   Rx<DateTime?> publishedUntil = Rx(null);
-  RxList<int> attachments = RxList<int>.empty(growable: true);
+  RxList<String> attachments = RxList<String>.empty(growable: true);
   RxList<String> tags = RxList<String>.empty(growable: true);
-  Rx<int?> thumbnail = Rx(null);
+  Rx<String?> thumbnail = Rx(null);
 
   RxList<int> visibleUsers = RxList.empty(growable: true);
   RxList<int> invisibleUsers = RxList.empty(growable: true);
@@ -116,12 +116,12 @@ class PostEditorController extends GetxController {
     return showModalBottomSheet(
       context: context,
       builder: (context) => AttachmentEditorPopup(
-        usage: 'i.attachment',
+        pool: 'interactive',
         initialAttachments: attachments,
-        onAdd: (int value) {
+        onAdd: (String value) {
           attachments.add(value);
         },
-        onRemove: (int value) {
+        onRemove: (String value) {
           attachments.remove(value);
         },
       ),
@@ -169,6 +169,7 @@ class PostEditorController extends GetxController {
   }
 
   void currentClear() {
+    aliasController.clear();
     titleController.clear();
     descriptionController.clear();
     contentController.clear();

lib/controllers/post_list_controller.dart

@@ -9,11 +9,12 @@ class PostListController extends GetxController {
 
   /// The polling source modifier.
   /// - `0`: default recommendations
-  /// - `1`: shuffle mode
+  /// - `1`: friend mode
+  /// - `2`: shuffle mode
   RxInt mode = 0.obs;
 
   /// The paging controller for infinite loading.
-  /// Only available when mode is `0`.
+  /// Only available when mode is `0` or `1`.
   PagingController<int, Post> pagingController =
       PagingController(firstPageKey: 0);
 
@@ -111,10 +112,23 @@ class PostListController extends GetxController {
           author: author,
         );
       } else {
+        switch (mode.value) {
+          case 2:
             resp = await provider.listRecommendations(
               pageKey,
-          channel: mode.value == 0 ? null : 'shuffle',
+              channel: 'shuffle',
             );
+            break;
+          case 1:
+            resp = await provider.listRecommendations(
+              pageKey,
+              channel: 'friends',
+            );
+            break;
+          default:
+            resp = await provider.listRecommendations(pageKey);
+            break;
+        }
       }
     } catch (e) {
       rethrow;

lib/main.dart

@@ -6,12 +6,14 @@ import 'package:flutter/material.dart';
 import 'package:flutter_acrylic/flutter_acrylic.dart';
 import 'package:get/get.dart';
 import 'package:go_router/go_router.dart';
+import 'package:media_kit/media_kit.dart';
 import 'package:protocol_handler/protocol_handler.dart';
 import 'package:provider/provider.dart';
 import 'package:solian/bootstrapper.dart';
 import 'package:solian/firebase_options.dart';
 import 'package:solian/platform.dart';
 import 'package:solian/providers/attachment_uploader.dart';
+import 'package:solian/providers/link_expander.dart';
 import 'package:solian/providers/stickers.dart';
 import 'package:solian/providers/theme_switcher.dart';
 import 'package:solian/providers/websocket.dart';
@@ -31,6 +33,7 @@ import 'package:flutter_web_plugins/url_strategy.dart' show usePathUrlStrategy;
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
+  MediaKit.ensureInitialized();
 
   await Future.wait([
     _initializeFirebase(),
@@ -126,5 +129,6 @@ class SolianApp extends StatelessWidget {
     Get.lazyPut(() => RealmProvider());
     Get.lazyPut(() => ChatCallProvider());
     Get.lazyPut(() => AttachmentUploaderController());
+    Get.lazyPut(() => LinkExpandController());
   }
 }

lib/models/attachment.dart

@@ -5,11 +5,11 @@ class Attachment {
   DateTime createdAt;
   DateTime updatedAt;
   DateTime? deletedAt;
+  String rid;
   String uuid;
   int size;
   String name;
   String alt;
-  String usage;
   String mimetype;
   String hash;
   int destination;
@@ -24,11 +24,11 @@ class Attachment {
     required this.createdAt,
     required this.updatedAt,
     required this.deletedAt,
+    required this.rid,
     required this.uuid,
     required this.size,
     required this.name,
     required this.alt,
-    required this.usage,
     required this.mimetype,
     required this.hash,
     required this.destination,
@@ -43,19 +43,22 @@ class Attachment {
         id: json['id'],
         createdAt: DateTime.parse(json['created_at']),
         updatedAt: DateTime.parse(json['updated_at']),
-    deletedAt: json['deleted_at'] != null ? DateTime.parse(json['deleted_at']) : null,
+        deletedAt: json['deleted_at'] != null
+            ? DateTime.parse(json['deleted_at'])
+            : null,
+        rid: json['rid'],
         uuid: json['uuid'],
         size: json['size'],
         name: json['name'],
         alt: json['alt'],
-    usage: json['usage'],
         mimetype: json['mimetype'],
         hash: json['hash'],
         destination: json['destination'],
         isAnalyzed: json['is_analyzed'],
         metadata: json['metadata'],
         isMature: json['is_mature'],
-    account: json['account'] != null ? Account.fromJson(json['account']) : null,
+        account:
+            json['account'] != null ? Account.fromJson(json['account']) : null,
         accountId: json['account_id'],
       );
 
@@ -64,11 +67,11 @@ class Attachment {
         'created_at': createdAt.toIso8601String(),
         'updated_at': updatedAt.toIso8601String(),
         'deleted_at': deletedAt?.toIso8601String(),
+        'rid': rid,
         'uuid': uuid,
         'size': size,
         'name': name,
         'alt': alt,
-    'usage': usage,
         'mimetype': mimetype,
         'hash': hash,
         'destination': destination,

lib/models/event.dart

@@ -63,7 +63,7 @@ class Event {
 class EventMessageBody {
   String text;
   String algorithm;
-  List<int>? attachments;
+  List<String>? attachments;
   int? quoteEvent;
   int? relatedEvent;
   List<int>? relatedUsers;
@@ -82,7 +82,7 @@ class EventMessageBody {
         text: json['text'] ?? '',
         algorithm: json['algorithm'] ?? 'plain',
         attachments: json['attachments'] != null
-            ? List<int>.from(json['attachments'].map((x) => x))
+            ? List<String>.from(json['attachments']?.whereType<String>())
             : null,
         quoteEvent: json['quote_event'],
         relatedEvent: json['related_event'],

lib/models/link.dart

@@ -0,0 +1,65 @@
+class LinkMeta {
+  int id;
+  DateTime createdAt;
+  DateTime updatedAt;
+  DateTime? deletedAt;
+  String entryId;
+  String? icon;
+  String url;
+  String? title;
+  String? image;
+  String? video;
+  String? audio;
+  String? description;
+  String? siteName;
+
+  LinkMeta({
+    required this.id,
+    required this.createdAt,
+    required this.updatedAt,
+    required this.deletedAt,
+    required this.entryId,
+    required this.icon,
+    required this.url,
+    required this.title,
+    required this.image,
+    required this.video,
+    required this.audio,
+    required this.description,
+    required this.siteName,
+  });
+
+  factory LinkMeta.fromJson(Map<String, dynamic> json) => LinkMeta(
+        id: json['id'],
+        createdAt: DateTime.parse(json['created_at']),
+        updatedAt: DateTime.parse(json['updated_at']),
+        deletedAt: json['deleted_at'] != null
+            ? DateTime.parse(json['deleted_at'])
+            : null,
+        entryId: json['entry_id'],
+        icon: json['icon'],
+        url: json['url'],
+        title: json['title'],
+        image: json['image'],
+        video: json['video'],
+        audio: json['audio'],
+        description: json['description'],
+        siteName: json['site_name'],
+      );
+
+  Map<String, dynamic> toJson() => {
+        'id': id,
+        'created_at': createdAt.toIso8601String(),
+        'updated_at': updatedAt.toIso8601String(),
+        'deleted_at': deletedAt?.toIso8601String(),
+        'entry_id': entryId,
+        'icon': icon,
+        'url': url,
+        'title': title,
+        'image': image,
+        'video': video,
+        'audio': audio,
+        'description': description,
+        'site_name': siteName,
+      };
+}

lib/models/stickers.dart

@@ -36,7 +36,7 @@ class Sticker {
 
   String get imageUrl => ServiceFinder.buildUrl(
         'files',
-        '/attachments/$attachmentId',
+        '/attachments/${attachment.rid}',
       );
 
   factory Sticker.fromJson(Map<String, dynamic> json) => Sticker(

lib/providers/attachment_uploader.dart

@@ -148,7 +148,7 @@ class AttachmentUploaderController extends GetxController {
   Future<void> uploadAttachmentWithCallback(
     Uint8List data,
     String path,
-    String usage,
+    String pool,
     Map<String, dynamic>? metadata,
     Function(Attachment?) callback,
   ) async {
@@ -158,7 +158,7 @@ class AttachmentUploaderController extends GetxController {
     final result = await _rawUploadAttachment(
       data,
       path,
-      usage,
+      pool,
       metadata,
       onProgress: (progress) {
         progressOfUpload.value = progress;
@@ -171,7 +171,7 @@ class AttachmentUploaderController extends GetxController {
   Future<Attachment?> uploadAttachment(
     Uint8List data,
     String path,
-    String usage,
+    String pool,
     Map<String, dynamic>? metadata,
   ) async {
     if (isUploading.value) throw Exception('uploading blocked');
@@ -180,7 +180,7 @@ class AttachmentUploaderController extends GetxController {
     final result = await _rawUploadAttachment(
       data,
       path,
-      usage,
+      pool,
       metadata,
       onProgress: (progress) {
         progressOfUpload.value = progress;
@@ -191,14 +191,14 @@ class AttachmentUploaderController extends GetxController {
   }
 
   Future<Attachment?> _rawUploadAttachment(
-      Uint8List data, String path, String usage, Map<String, dynamic>? metadata,
+      Uint8List data, String path, String pool, Map<String, dynamic>? metadata,
       {Function(double)? onProgress, Function(dynamic err)? onError}) async {
     final AttachmentProvider provider = Get.find();
     try {
       final result = await provider.createAttachment(
         data,
         path,
-        usage,
+        pool,
         metadata,
         onProgress: onProgress,
       );

lib/providers/call.dart

@@ -17,6 +17,10 @@ class ChatCallProvider extends GetxController {
   RxBool isReady = false.obs;
   RxBool isMounted = false.obs;
   RxBool isInitialized = false.obs;
+  RxBool isBusy = false.obs;
+
+  RxString lastDuration = '00:00:00'.obs;
+  Timer? lastDurationUpdateTimer;
 
   String? token;
   String? endpoint;
@@ -38,6 +42,34 @@ class ChatCallProvider extends GetxController {
   RxList<ParticipantTrack> participantTracks = RxList.empty(growable: true);
   Rx<ParticipantTrack?> focusTrack = Rx(null);
 
+  void _updateDuration() {
+    if (current.value == null) {
+      lastDuration.value = '00:00:00';
+      return;
+    }
+
+    Duration duration = DateTime.now().difference(current.value!.createdAt);
+
+    String twoDigits(int n) => n.toString().padLeft(2, '0');
+    String formattedTime = '${twoDigits(duration.inHours)}:'
+        '${twoDigits(duration.inMinutes.remainder(60))}:'
+        '${twoDigits(duration.inSeconds.remainder(60))}';
+    lastDuration.value = formattedTime;
+  }
+
+  void enableDurationUpdater() {
+    _updateDuration();
+    lastDurationUpdateTimer = Timer.periodic(
+      const Duration(seconds: 1),
+      (_) => _updateDuration(),
+    );
+  }
+
+  void disableDurationUpdater() {
+    lastDurationUpdateTimer?.cancel();
+    lastDurationUpdateTimer = null;
+  }
+
   Future<void> checkPermissions() async {
     if (lkPlatformIs(PlatformType.macOS) || lkPlatformIs(PlatformType.linux)) {
       return;
@@ -88,22 +120,7 @@ class ChatCallProvider extends GetxController {
 
   void initRoom() {
     initHardware();
-    room = Room();
+    room = Room(
-    listener = room.createListener();
-    WakelockPlus.enable();
-  }
-
-  void joinRoom(String url, String token) async {
-    if (isMounted.value) {
-      return;
-    } else {
-      isMounted.value = true;
-    }
-
-    try {
-      await room.connect(
-        url,
-        token,
       roomOptions: const RoomOptions(
         dynacast: true,
         adaptiveStream: true,
@@ -126,6 +143,20 @@ class ChatCallProvider extends GetxController {
           params: VideoParametersPresets.h1080_169,
         ),
       ),
+    );
+    listener = room.createListener();
+    WakelockPlus.enable();
+  }
+
+  void joinRoom(String url, String token) async {
+    if (isMounted.value) {
+      return;
+    }
+
+    try {
+      await room.connect(
+        url,
+        token,
         fastConnectOptions: FastConnectOptions(
           microphone: TrackOption(track: audioTrack.value),
           camera: TrackOption(track: videoTrack.value),
@@ -133,6 +164,8 @@ class ChatCallProvider extends GetxController {
       );
     } catch (e) {
       rethrow;
+    } finally {
+      isMounted.value = true;
     }
   }
 
@@ -164,6 +197,7 @@ class ChatCallProvider extends GetxController {
       Hardware.instance.setSpeakerphoneOn(true);
     }
 
+    isBusy.value = false;
     isInitialized.value = true;
   }
 
@@ -366,6 +400,7 @@ class ChatCallProvider extends GetxController {
   }
 
   void disposeRoom() {
+    isBusy.value = false;
     isMounted.value = false;
     isInitialized.value = false;
     current.value = null;

lib/providers/content/attachment.dart

@@ -20,22 +20,22 @@ class AttachmentProvider extends GetConnect {
     httpClient.baseUrl = ServiceFinder.buildUrl('files', null);
   }
 
-  final Map<int, Attachment> _cachedResponses = {};
+  final Map<String, Attachment> _cachedResponses = {};
 
   Future<List<Attachment?>> listMetadata(
-    List<int> id, {
+    List<String> rid, {
     noCache = false,
   }) async {
-    if (id.isEmpty) return List.empty();
+    if (rid.isEmpty) return List.empty();
 
-    List<Attachment?> result = List.filled(id.length, null);
+    List<Attachment?> result = List.filled(rid.length, null);
-    List<int> pendingQuery = List.empty(growable: true);
+    List<String> pendingQuery = List.empty(growable: true);
     if (!noCache) {
-      for (var idx = 0; idx < id.length; idx++) {
+      for (var idx = 0; idx < rid.length; idx++) {
-        if (_cachedResponses.containsKey(id[idx])) {
+        if (_cachedResponses.containsKey(rid[idx])) {
-          result[idx] = _cachedResponses[id[idx]];
+          result[idx] = _cachedResponses[rid[idx]];
         } else {
-          pendingQuery.add(id[idx]);
+          pendingQuery.add(rid[idx]);
         }
       }
     }
@@ -52,12 +52,12 @@ class AttachmentProvider extends GetConnect {
         rawOut.data!.map((x) => Attachment.fromJson(x)).toList();
     for (final item in out) {
       if (item.destination != 0 && item.isAnalyzed) {
-        _cachedResponses[item.id] = item;
+        _cachedResponses[item.rid] = item;
       }
     }
     for (var i = 0; i < out.length; i++) {
-      for (var j = 0; j < id.length; j++) {
+      for (var j = 0; j < rid.length; j++) {
-        if (out[i].id == id[j]) {
+        if (out[i].rid == rid[j]) {
           result[j] = out[i];
         }
       }
@@ -66,16 +66,16 @@ class AttachmentProvider extends GetConnect {
     return result;
   }
 
-  Future<Attachment?> getMetadata(int id, {noCache = false}) async {
+  Future<Attachment?> getMetadata(String rid, {noCache = false}) async {
-    if (!noCache && _cachedResponses.containsKey(id)) {
+    if (!noCache && _cachedResponses.containsKey(rid)) {
-      return _cachedResponses[id]!;
+      return _cachedResponses[rid]!;
     }
 
-    final resp = await get('/attachments/$id/meta');
+    final resp = await get('/attachments/$rid/meta');
     if (resp.statusCode == 200) {
       final result = Attachment.fromJson(resp.body);
       if (result.destination != 0 && result.isAnalyzed) {
-        _cachedResponses[id] = result;
+        _cachedResponses[rid] = result;
       }
       return result;
     }
@@ -84,7 +84,7 @@ class AttachmentProvider extends GetConnect {
   }
 
   Future<Attachment> createAttachment(
-      Uint8List data, String path, String usage, Map<String, dynamic>? metadata,
+      Uint8List data, String path, String pool, Map<String, dynamic>? metadata,
       {Function(double)? onProgress}) async {
     final AuthProvider auth = Get.find();
     if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
@@ -108,7 +108,7 @@ class AttachmentProvider extends GetConnect {
     final payload = dio.FormData.fromMap({
       'alt': fileAlt,
       'file': filePayload,
-      'usage': usage,
+      'pool': pool,
       if (mimetypeOverride != null) 'mimetype': mimetypeOverride,
       'metadata': jsonEncode(metadata),
     });
@@ -133,8 +133,7 @@ class AttachmentProvider extends GetConnect {
 
   Future<Response> updateAttachment(
     int id,
-    String alt,
+    String alt, {
-    String usage, {
     bool isMature = false,
   }) async {
     final AuthProvider auth = Get.find();
@@ -144,7 +143,6 @@ class AttachmentProvider extends GetConnect {
 
     var resp = await client.put('/attachments/$id', {
       'alt': alt,
-      'usage': usage,
       'is_mature': isMature,
     });
 
@@ -169,7 +167,7 @@ class AttachmentProvider extends GetConnect {
     return resp;
   }
 
-  void clearCache({int? id}) {
+  void clearCache({String? id}) {
     if (id != null) {
       _cachedResponses.remove(id);
     } else {

lib/providers/content/posts.dart

@@ -9,13 +9,20 @@ class PostProvider extends GetConnect {
   }
 
   Future<Response> listRecommendations(int page,
-      {int? realm, String? channel}) async {
+      {String? realm, String? channel}) async {
+    GetConnect client;
+    final AuthProvider auth = Get.find();
     final queries = [
       'take=${10}',
       'offset=$page',
-      if (realm != null) 'realmId=$realm',
+      if (realm != null) 'realm=$realm',
     ];
-    final resp = await get(
+    if (auth.isAuthorized.value) {
+      client = auth.configureClient('co');
+    } else {
+      client = ServiceFinder.configureClient('co');
+    }
+    final resp = await client.get(
       channel == null
           ? '/recommendations?${queries.join('&')}'
           : '/recommendations/$channel?${queries.join('&')}',
@@ -45,14 +52,14 @@ class PostProvider extends GetConnect {
   }
 
   Future<Response> listPost(int page,
-      {int? realm, String? author, tag, category}) async {
+      {String? realm, String? author, tag, category}) async {
     final queries = [
       'take=${10}',
       'offset=$page',
       if (tag != null) 'tag=$tag',
       if (category != null) 'category=$category',
       if (author != null) 'author=$author',
-      if (realm != null) 'realmId=$realm',
+      if (realm != null) 'realm=$realm',
     ];
     final resp = await get('/posts?${queries.join('&')}');
     if (resp.statusCode != 200) {

lib/providers/link_expander.dart

@@ -0,0 +1,25 @@
+import 'dart:convert';
+import 'dart:developer';
+
+import 'package:get/get.dart';
+import 'package:solian/models/link.dart';
+import 'package:solian/services.dart';
+
+class LinkExpandController extends GetxController {
+  final Map<String, LinkMeta?> _cachedResponse = {};
+
+  Future<LinkMeta?> expandLink(String url) async {
+    final target = utf8.fuse(base64).encode(url);
+    if (_cachedResponse.containsKey(target)) return _cachedResponse[target];
+    final client = ServiceFinder.configureClient('dealer');
+    final resp = await client.get('/api/links/$target');
+    if (resp.statusCode != 200) {
+      log('Unable to expand link ($url), status: ${resp.statusCode}, response: ${resp.body}');
+      _cachedResponse[target] = null;
+      return null;
+    }
+    final result = LinkMeta.fromJson(resp.body);
+    _cachedResponse[target] = result;
+    return result;
+  }
+}

lib/screens/account/personalize.dart

@@ -116,7 +116,7 @@ class _PersonalizeScreenState extends State<PersonalizeScreen> {
       attachResult = await provider.createAttachment(
         await file.readAsBytes(),
         file.path,
-        'p.$position',
+        'avatar',
         null,
       );
     } catch (e) {

lib/screens/account/stickers.dart

@@ -66,7 +66,7 @@ class _StickerScreenState extends State<StickerScreen> {
   Widget _buildEmoteEntry(Sticker item, String prefix) {
     final imageUrl = ServiceFinder.buildUrl(
       'files',
-      '/attachments/${item.attachmentId}',
+      '/attachments/${item.attachment.rid}',
     );
     return ListTile(
       title: Text(item.name),

lib/screens/channel/call/call.dart

@@ -12,16 +12,15 @@ import 'package:solian/widgets/chat/call/call_participant.dart';
 import 'package:livekit_client/livekit_client.dart' as livekit;
 
 class CallScreen extends StatefulWidget {
-  const CallScreen({super.key});
+  final bool hideAppBar;
+
+  const CallScreen({super.key, this.hideAppBar = false});
 
   @override
   State<CallScreen> createState() => _CallScreenState();
 }
 
 class _CallScreenState extends State<CallScreen> with TickerProviderStateMixin {
-  Timer? _timer;
-  String _currentDuration = '00:00:00';
-
   int _layoutMode = 0;
 
   bool _showControls = true;
@@ -37,26 +36,6 @@ class _CallScreenState extends State<CallScreen> with TickerProviderStateMixin {
     curve: Curves.fastOutSlowIn,
   );
 
-  String _parseDuration() {
-    final ChatCallProvider provider = Get.find();
-    if (provider.current.value == null) return '00:00:00';
-    Duration duration =
-        DateTime.now().difference(provider.current.value!.createdAt);
-
-    String twoDigits(int n) => n.toString().padLeft(2, '0');
-    String formattedTime = '${twoDigits(duration.inHours)}:'
-        '${twoDigits(duration.inMinutes.remainder(60))}:'
-        '${twoDigits(duration.inSeconds.remainder(60))}';
-
-    return formattedTime;
-  }
-
-  void _updateDuration() {
-    setState(() {
-      _currentDuration = _parseDuration();
-    });
-  }
-
   void _switchLayout() {
     if (_layoutMode < 1) {
       setState(() => _layoutMode++);
@@ -191,15 +170,15 @@ class _CallScreenState extends State<CallScreen> with TickerProviderStateMixin {
 
   @override
   void initState() {
-    Get.find<ChatCallProvider>().setupRoom();
     super.initState();
 
-    _updateDuration();
+    Future.delayed(Duration.zero, () {
+      Get.find<ChatCallProvider>()
+        ..setupRoom()
+        ..enableDurationUpdater();
+
       _planAutoHideControls();
-    _timer = Timer.periodic(
+    });
-      const Duration(seconds: 1),
-      (_) => _updateDuration(),
-    );
   }
 
   @override
@@ -210,16 +189,19 @@ class _CallScreenState extends State<CallScreen> with TickerProviderStateMixin {
 
   @override
   Widget build(BuildContext context) {
-    final ChatCallProvider provider = Get.find();
+    final ChatCallProvider ctrl = Get.find();
 
     return Material(
       color: Theme.of(context).colorScheme.surface,
       child: Scaffold(
-        appBar: AppBar(
+        appBar: widget.hideAppBar
+            ? null
+            : AppBar(
                 leading: AppBarLeadingButton.adaptive(context),
                 centerTitle: true,
                 toolbarHeight: SolianTheme.toolbarHeight(context),
-          title: RichText(
+                title: Obx(
+                  () => RichText(
                     textAlign: TextAlign.center,
                     text: TextSpan(children: [
                       TextSpan(
@@ -228,12 +210,13 @@ class _CallScreenState extends State<CallScreen> with TickerProviderStateMixin {
                       ),
                       const TextSpan(text: '\n'),
                       TextSpan(
-                text: _currentDuration,
+                        text: ctrl.lastDuration.value,
                         style: Theme.of(context).textTheme.bodySmall,
                       ),
                     ]),
                   ),
                 ),
+              ),
         body: SafeArea(
           child: GestureDetector(
             behavior: HitTestBehavior.translucent,
@@ -259,13 +242,21 @@ class _CallScreenState extends State<CallScreen> with TickerProviderStateMixin {
                               mainAxisSize: MainAxisSize.min,
                               crossAxisAlignment: CrossAxisAlignment.start,
                               children: [
-                                Row(
+                                Obx(() {
+                                  return Row(
                                     children: [
-                                    Text(call.room.serverRegion ?? 'unknown'),
+                                      Text(
-                                    const SizedBox(width: 6),
+                                        call.channel.value?.name ??
-                                    Text(call.room.serverVersion ?? 'unknown')
+                                            'unknown'.tr,
-                                  ],
+                                        style: const TextStyle(
+                                          fontWeight: FontWeight.bold,
                                         ),
+                                      ),
+                                      const SizedBox(width: 6),
+                                      Text(call.lastDuration.value)
+                                    ],
+                                  );
+                                }),
                                 Row(
                                   children: [
                                     Text(
@@ -332,7 +323,6 @@ class _CallScreenState extends State<CallScreen> with TickerProviderStateMixin {
                 Expanded(
                   child: Material(
                     color: Theme.of(context).colorScheme.surfaceContainerLow,
-                    elevation: 2,
                     child: Builder(
                       builder: (context) {
                         switch (_layoutMode) {
@@ -345,15 +335,15 @@ class _CallScreenState extends State<CallScreen> with TickerProviderStateMixin {
                     ),
                   ),
                 ),
-                if (provider.room.localParticipant != null)
+                if (ctrl.room.localParticipant != null)
                   SizeTransition(
                     sizeFactor: _controlsAnimation,
                     axis: Axis.vertical,
                     child: SizedBox(
                       width: MediaQuery.of(context).size.width,
                       child: ControlsWidget(
-                        provider.room,
+                        ctrl.room,
-                        provider.room.localParticipant!,
+                        ctrl.room.localParticipant!,
                       ),
                     ),
                   ),
@@ -370,17 +360,13 @@ class _CallScreenState extends State<CallScreen> with TickerProviderStateMixin {
 
   @override
   void deactivate() {
-    _timer?.cancel();
+    Get.find<ChatCallProvider>().disableDurationUpdater();
-    _timer = null;
     super.deactivate();
   }
 
   @override
   void activate() {
-    _timer ??= Timer.periodic(
+    Get.find<ChatCallProvider>().enableDurationUpdater();
-      const Duration(seconds: 1),
-      (_) => _updateDuration(),
-    );
     super.activate();
   }
 }

lib/screens/channel/channel_chat.dart

@@ -11,9 +11,11 @@ import 'package:solian/models/channel.dart';
 import 'package:solian/models/event.dart';
 import 'package:solian/models/packet.dart';
 import 'package:solian/providers/auth.dart';
+import 'package:solian/providers/call.dart';
 import 'package:solian/providers/content/channel.dart';
 import 'package:solian/providers/websocket.dart';
 import 'package:solian/router.dart';
+import 'package:solian/screens/channel/call/call.dart';
 import 'package:solian/screens/channel/channel_detail.dart';
 import 'package:solian/theme.dart';
 import 'package:solian/widgets/app_bar_leading.dart';
@@ -39,7 +41,7 @@ class ChannelChatScreen extends StatefulWidget {
 }
 
 class _ChannelChatScreenState extends State<ChannelChatScreen>
-    with WidgetsBindingObserver {
+    with WidgetsBindingObserver, TickerProviderStateMixin {
   DateTime? _isOutOfSyncSince;
 
   bool _isBusy = false;
@@ -238,12 +240,21 @@ class _ChannelChatScreenState extends State<ChannelChatScreen>
           );
         }
 
-        return Column(
+        return Row(
+          children: [
+            Expanded(
+              child: Column(
                 children: [
                   if (_ongoingCall != null)
                     ChannelCallIndicator(
                       channel: _channel!,
                       ongoingCall: _ongoingCall!,
+                      onJoin: () {
+                        if (!SolianTheme.isLargeScreen(context)) {
+                          final ChatCallProvider call = Get.find();
+                          call.gotoScreen(context);
+                        }
+                      },
                     ),
                   Expanded(
                     child: ChatEventList(
@@ -261,7 +272,8 @@ class _ChannelChatScreenState extends State<ChannelChatScreen>
                   if (_isOutOfSyncSince != null)
                     ListTile(
                       contentPadding: const EdgeInsets.only(left: 16, right: 8),
-                tileColor: Theme.of(context).colorScheme.surfaceContainerLow,
+                      tileColor:
+                          Theme.of(context).colorScheme.surfaceContainerLow,
                       leading: const Icon(Icons.history_toggle_off),
                       title: Text('messageOutOfSync'.tr),
                       subtitle: Text('messageOutOfSyncCaption'.tr),
@@ -310,6 +322,23 @@ class _ChannelChatScreenState extends State<ChannelChatScreen>
                     ),
                   ),
                 ],
+              ),
+            ),
+            Obx(() {
+              final ChatCallProvider call = Get.find();
+              if (call.isMounted.value && SolianTheme.isLargeScreen(context)) {
+                return const Expanded(
+                  child: Row(children: [
+                    VerticalDivider(width: 0.3, thickness: 0.3),
+                    Expanded(
+                      child: CallScreen(hideAppBar: true),
+                    ),
+                  ]),
+                );
+              }
+              return const SizedBox();
+            }),
+          ],
         );
       }),
     );

lib/screens/home.dart

@@ -5,6 +5,7 @@ import 'package:solian/providers/auth.dart';
 import 'package:solian/router.dart';
 import 'package:solian/screens/account/notification.dart';
 import 'package:solian/theme.dart';
+import 'package:solian/widgets/account/signin_required_overlay.dart';
 import 'package:solian/widgets/app_bar_title.dart';
 import 'package:solian/widgets/current_state_action.dart';
 import 'package:solian/widgets/app_bar_leading.dart';
@@ -27,20 +28,18 @@ class _HomeScreenState extends State<HomeScreen>
   void initState() {
     super.initState();
     _postController = PostListController();
-    _tabController = TabController(length: 2, vsync: this);
+    _tabController = TabController(length: 3, vsync: this);
     _tabController.addListener(() {
-      switch (_tabController.index) {
-        case 0:
-        case 1:
       if (_postController.mode.value == _tabController.index) return;
       _postController.mode.value = _tabController.index;
       _postController.reloadAllOver();
-      }
     });
   }
 
   @override
   Widget build(BuildContext context) {
+    final AuthProvider auth = Get.find();
+
     return Material(
       color: Theme.of(context).colorScheme.surface,
       child: Scaffold(
@@ -82,6 +81,7 @@ class _HomeScreenState extends State<HomeScreen>
                   controller: _tabController,
                   tabs: [
                     Tab(text: 'postListNews'.tr),
+                    Tab(text: 'postListFriends'.tr),
                     Tab(text: 'postListShuffle'.tr),
                   ],
                 ),
@@ -108,6 +108,23 @@ class _HomeScreenState extends State<HomeScreen>
                     ),
                   ]),
                 ),
+                Obx(() {
+                  if (auth.isAuthorized.value) {
+                    return RefreshIndicator(
+                      onRefresh: () => _postController.reloadAllOver(),
+                      child: CustomScrollView(slivers: [
+                        PostWarpedListWidget(
+                          controller: _postController.pagingController,
+                          onUpdate: () => _postController.reloadAllOver(),
+                        ),
+                      ]),
+                    );
+                  } else {
+                    return SigninRequiredOverlay(
+                      onSignedIn: () => _postController.reloadAllOver(),
+                    );
+                  }
+                }),
                 PostShuffleSwiper(controller: _postController),
               ],
             );

lib/screens/posts/post_editor.dart

@@ -65,7 +65,7 @@ class _PostPublishScreenState extends State<PostPublishScreen> {
 
     final AttachmentUploaderController uploader = Get.find();
     if (uploader.queueOfUpload.any(
-      ((x) => x.usage == 'i.attachment' && x.isUploading),
+      ((x) => x.isUploading),
     )) {
       context.showErrorDialog('attachmentUploadInProgress'.tr);
       return;
@@ -90,8 +90,8 @@ class _PostPublishScreenState extends State<PostPublishScreen> {
     if (resp.statusCode != 200) {
       context.showErrorDialog(resp.bodyString);
     } else {
-      _editorController.localClear();
       _editorController.currentClear();
+      _editorController.localClear();
       AppRouter.instance.pop(resp.body);
     }
 

lib/screens/realms/realm_view.dart

@@ -171,7 +171,7 @@ class _RealmPostListWidgetState extends State<RealmPostListWidget> {
 
     Response resp;
     try {
-      resp = await provider.listPost(pageKey, realm: widget.realm.id);
+      resp = await provider.listPost(pageKey, realm: widget.realm.alias);
     } catch (e) {
       _pagingController.error = e;
       return;

lib/shells/root_shell.dart

@@ -1,3 +1,4 @@
+import 'package:firebase_analytics/firebase_analytics.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:solian/theme.dart';
@@ -29,6 +30,15 @@ class RootShell extends StatelessWidget {
   Widget build(BuildContext context) {
     final routeName = state.topRoute?.name;
 
+    if (routeName != null) {
+      FirebaseAnalytics.instance.logEvent(
+        name: 'screen_view',
+        parameters: {
+          'firebase_screen': routeName,
+        },
+      );
+    }
+
     return Scaffold(
       key: rootScaffoldKey,
       drawer: SolianTheme.isLargeScreen(context)

lib/translations/en_us.dart

@@ -125,6 +125,7 @@ const i18nEnglish = {
   'postThumbnailAttachment': 'Attachment serial number',
   'postPinned': 'Pinned',
   'postListNews': 'News',
+  'postListFriends': 'Friends',
   'postListShuffle': 'Random',
   'postEditorModeStory': 'Post a post',
   'postEditorModeArticle': 'Post an article',
@@ -268,6 +269,7 @@ const i18nEnglish = {
   'callOngoing': 'A call is ongoing...',
   'callOngoingEmpty': 'A call is on hold...',
   'callOngoingParticipants': '@count people are calling...',
+  'callOngoingJoined': 'Call last @duration',
   'callJoin': 'Join',
   'callResume': 'Resume',
   'callMicrophone': 'Microphone',
@@ -378,4 +380,5 @@ const i18nEnglish = {
   'messageOutOfSyncCaption':
       'Since the App has entered the background, there may be a time difference between the message list and the server. Click to Refresh.',
   'messageHistoryWipe': 'Wipe local message history',
+  'unknown': 'Unknown',
 };

lib/translations/zh_cn.dart

@@ -125,6 +125,7 @@ const i18nSimplifiedChinese = {
   'articleDetail': '文章详情',
   'draftBoxOpen': '打开草稿箱',
   'postListNews': '新鲜事',
+  'postListFriends': '好友圈',
   'postListShuffle': '打乱看',
   'postNew': '创建新帖子',
   'postNewInRealmHint': '在领域 @realm 里发表新帖子',
@@ -246,6 +247,7 @@ const i18nSimplifiedChinese = {
   'callOngoing': '一则通话正在进行中…',
   'callOngoingEmpty': '一则通话待机中…',
   'callOngoingParticipants': '@count 人正在进行通话…',
+  'callOngoingJoined': '通话进行 @duration',
   'callJoin': '加入',
   'callResume': '恢复',
   'callMicrophone': '麦克风',
@@ -344,4 +346,5 @@ const i18nSimplifiedChinese = {
   'messageOutOfSync': '消息可能与服务器脱节',
   'messageOutOfSyncCaption': '由于 App 进入后台，消息列表可能与服务器存在时差，点击刷新。',
   'messageHistoryWipe': '清除消息记录',
+  'unknown': '未知',
 };

lib/widgets/account/account_avatar.dart

@@ -24,7 +24,6 @@ class AccountAvatar extends StatelessWidget {
     if (content is String) {
       direct = content.startsWith('http');
       if (!isEmpty) isEmpty = content.isEmpty;
-      if (!isEmpty) isEmpty = content.endsWith('/attachments/0');
     }
 
     final url = direct

lib/widgets/attachments/attachment_attr_editor.dart

@@ -16,10 +16,12 @@ class AttachmentAttrEditorDialog extends StatefulWidget {
   });
 
   @override
-  State<AttachmentAttrEditorDialog> createState() => _AttachmentAttrEditorDialogState();
+  State<AttachmentAttrEditorDialog> createState() =>
+      _AttachmentAttrEditorDialogState();
 }
 
-class _AttachmentAttrEditorDialogState extends State<AttachmentAttrEditorDialog> {
+class _AttachmentAttrEditorDialogState
+    extends State<AttachmentAttrEditorDialog> {
   final _altController = TextEditingController();
 
   bool _isBusy = false;
@@ -33,11 +35,10 @@ class _AttachmentAttrEditorDialogState extends State<AttachmentAttrEditorDialog>
       final resp = await provider.updateAttachment(
         widget.item.id,
         _altController.value.text,
-        widget.item.usage,
         isMature: _isMature,
       );
 
-      Get.find<AttachmentProvider>().clearCache(id: widget.item.id);
+      Get.find<AttachmentProvider>().clearCache(id: widget.item.rid);
 
       setState(() => _isBusy = false);
       return Attachment.fromJson(resp.body);

lib/widgets/attachments/attachment_editor.dart

@@ -22,19 +22,19 @@ import 'package:solian/widgets/attachments/attachment_attr_editor.dart';
 import 'package:solian/widgets/attachments/attachment_fullscreen.dart';
 
 class AttachmentEditorPopup extends StatefulWidget {
-  final String usage;
+  final String pool;
   final bool singleMode;
   final bool imageOnly;
   final bool autoUpload;
   final double? imageMaxWidth;
   final double? imageMaxHeight;
-  final List<int>? initialAttachments;
+  final List<String>? initialAttachments;
-  final void Function(int) onAdd;
+  final void Function(String) onAdd;
-  final void Function(int) onRemove;
+  final void Function(String) onRemove;
 
   const AttachmentEditorPopup({
     super.key,
-    required this.usage,
+    required this.pool,
     required this.onAdd,
     required this.onRemove,
     this.singleMode = false,
@@ -73,7 +73,7 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {
 
       _enqueueTaskBatch(medias.map((x) {
         final file = File(x.path);
-        return AttachmentUploadTask(file: file, usage: widget.usage);
+        return AttachmentUploadTask(file: file, usage: widget.pool);
       }));
     } else {
       final media = await _imagePicker.pickMedia(
@@ -83,7 +83,7 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {
       if (media == null) return;
 
       _enqueueTask(
-        AttachmentUploadTask(file: File(media.path), usage: widget.usage),
+        AttachmentUploadTask(file: File(media.path), usage: widget.pool),
       );
     }
   }
@@ -97,7 +97,7 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {
 
     final file = File(media.path);
     _enqueueTask(
-      AttachmentUploadTask(file: file, usage: widget.usage),
+      AttachmentUploadTask(file: file, usage: widget.pool),
     );
   }
 
@@ -113,7 +113,7 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {
     List<File> files = result.paths.map((path) => File(path!)).toList();
 
     _enqueueTaskBatch(files.map((x) {
-      return AttachmentUploadTask(file: x, usage: widget.usage);
+      return AttachmentUploadTask(file: x, usage: widget.pool);
     }));
   }
 
@@ -131,7 +131,7 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {
 
     final file = File(media.path);
     _enqueueTask(
-      AttachmentUploadTask(file: file, usage: widget.usage),
+      AttachmentUploadTask(file: file, usage: widget.pool),
     );
   }
 
@@ -181,13 +181,11 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {
     WidgetsBinding.instance.addPostFrameCallback((_) => controller.dispose());
 
     if (input == null || input.isEmpty) return;
-    final value = int.tryParse(input);
-    if (value == null) return;
 
     final AttachmentProvider attach = Get.find();
-    final result = await attach.getMetadata(value);
+    final result = await attach.getMetadata(input);
     if (result != null) {
-      widget.onAdd(result.id);
+      widget.onAdd(result.rid);
       setState(() => _attachments.add(result));
       if (widget.singleMode) Navigator.pop(context);
     }
@@ -202,11 +200,11 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {
     _uploadController.uploadAttachmentWithCallback(
       data,
       'Pasted Image',
-      widget.usage,
+      widget.pool,
       null,
       (item) {
         if (item == null) return;
-        widget.onAdd(item.id);
+        widget.onAdd(item.rid);
         if (mounted) {
           setState(() => _attachments.add(item));
           if (widget.singleMode) Navigator.pop(context);
@@ -254,7 +252,7 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {
         .listMetadata(widget.initialAttachments ?? List.empty())
         .then((result) {
       setState(() {
-        _attachments = result;
+        _attachments = List.from(result, growable: true);
         _isBusy = false;
         _isFirstTimeBusy = false;
       });
@@ -413,11 +411,11 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {
                             : () {
                                 _uploadController
                                     .performSingleTask(index)
-                                    .then((r) {
+                                    .then((out) {
-                                  if (r == null) return;
+                                  if (out == null) return;
-                                  widget.onAdd(r.id);
+                                  widget.onAdd(out.rid);
                                   if (mounted) {
-                                    setState(() => _attachments.add(r));
+                                    setState(() => _attachments.add(out));
                                     if (widget.singleMode) {
                                       Navigator.pop(context);
                                     }
@@ -515,7 +513,7 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {
                         ),
                         onTap: () {
                           _deleteAttachment(element).then((_) {
-                            widget.onRemove(element.id);
+                            widget.onRemove(element.rid);
                             setState(() => _attachments.removeAt(index));
                           });
                         },
@@ -529,7 +527,7 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {
                           ),
                         ),
                         onTap: () {
-                          widget.onRemove(element.id);
+                          widget.onRemove(element.rid);
                           setState(() => _attachments.removeAt(index));
                         },
                       ),
@@ -560,7 +558,7 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {
 
   void _startUploading() {
     _uploadController.performUploadQueue(onData: (r) {
-      widget.onAdd(r.id);
+      widget.onAdd(r.rid);
       if (mounted) {
         setState(() => _attachments.add(r));
         if (widget.singleMode) Navigator.pop(context);
@@ -584,7 +582,7 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {
           if (_uploadController.isUploading.value) return;
           _enqueueTaskBatch(detail.files.map((x) {
             final file = File(x.path);
-            return AttachmentUploadTask(file: file, usage: widget.usage);
+            return AttachmentUploadTask(file: file, usage: widget.pool);
           }));
         },
         child: Column(

lib/widgets/attachments/attachment_fullscreen.dart

@@ -67,7 +67,7 @@ class _AttachmentFullScreenState extends State<AttachmentFullScreen> {
   Future<void> _saveToAlbum() async {
     final url = ServiceFinder.buildUrl(
       'files',
-      '/attachments/${widget.item.id}',
+      '/attachments/${widget.item.rid}',
     );
 
     if (PlatformInfo.isWeb || PlatformInfo.isDesktop) {
@@ -258,7 +258,7 @@ class _AttachmentFullScreenState extends State<AttachmentFullScreen> {
                         spacing: 6,
                         children: [
                           Text(
-                            '#${widget.item.id}',
+                            '#${widget.item.rid}',
                             style: metaTextStyle,
                           ),
                           if (widget.item.metadata?['width'] != null &&

lib/widgets/attachments/attachment_item.dart

@@ -1,14 +1,14 @@
 import 'package:cached_network_image/cached_network_image.dart';
-import 'package:chewie/chewie.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_animate/flutter_animate.dart';
 import 'package:get/get.dart';
+import 'package:media_kit/media_kit.dart';
+import 'package:media_kit_video/media_kit_video.dart';
 import 'package:solian/models/attachment.dart';
 import 'package:solian/platform.dart';
 import 'package:solian/services.dart';
 import 'package:solian/widgets/sized_container.dart';
 import 'package:url_launcher/url_launcher_string.dart';
-import 'package:video_player/video_player.dart';
 
 class AttachmentItem extends StatefulWidget {
   final String parentId;
@@ -91,7 +91,7 @@ class _AttachmentItemState extends State<AttachmentItem> {
                     launchUrlString(
                       ServiceFinder.buildUrl(
                         'files',
-                        '/attachments/${widget.item.id}',
+                        '/attachments/${widget.item.rid}',
                       ),
                     );
                   },
@@ -135,7 +135,7 @@ class _AttachmentItemImage extends StatelessWidget {
               fit: fit,
               imageUrl: ServiceFinder.buildUrl(
                 'files',
-                '/attachments/${item.id}',
+                '/attachments/${item.rid}',
               ),
               progressIndicatorBuilder: (context, url, downloadProgress) {
                 return Center(
@@ -231,22 +231,20 @@ class _AttachmentItemVideo extends StatefulWidget {
 }
 
 class _AttachmentItemVideoState extends State<_AttachmentItemVideo> {
-  VideoPlayerController? _playerController;
+  late final _player = Player(
-  ChewieController? _chewieController;
+    configuration: const PlayerConfiguration(
+      logLevel: MPVLogLevel.error,
+    ),
+  );
+
+  late final _controller = VideoController(_player);
 
   bool _showContent = false;
 
   Future<void> _startLoad() async {
-    final ratio = widget.item.metadata?['ratio'] ?? 16 / 9;
+    await _player.open(
-    _playerController = VideoPlayerController.networkUrl(
+      Media(ServiceFinder.buildUrl('files', '/attachments/${widget.item.rid}')),
-      Uri.parse(
+      play: false,
-        ServiceFinder.buildUrl('files', '/attachments/${widget.item.id}'),
-      ),
-    );
-    _playerController!.initialize();
-    _chewieController = ChewieController(
-      aspectRatio: ratio,
-      videoPlayerController: _playerController!,
     );
     setState(() => _showContent = true);
   }
@@ -259,17 +257,10 @@ class _AttachmentItemVideoState extends State<_AttachmentItemVideo> {
     }
   }
 
-  @override
-  void dispose() {
-    _playerController?.dispose();
-    _chewieController?.dispose();
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     final ratio = widget.item.metadata?['ratio'] ?? 16 / 9;
-    if (!_showContent || _chewieController == null) {
+    if (!_showContent) {
       return GestureDetector(
         child: AspectRatio(
           aspectRatio: ratio,
@@ -307,8 +298,15 @@ class _AttachmentItemVideoState extends State<_AttachmentItemVideo> {
       );
     }
 
-    return Chewie(
+    return Video(
-      controller: _chewieController!,
+      aspectRatio: ratio,
+      controller: _controller,
     );
   }
+
+  @override
+  void dispose() {
+    _player.dispose();
+    super.dispose();
+  }
 }

lib/widgets/attachments/attachment_list.dart

@@ -1,4 +1,4 @@
-import 'dart:math' show min;
+import 'dart:math' as math;
 import 'dart:ui';
 
 import 'package:carousel_slider/carousel_slider.dart';
@@ -14,11 +14,13 @@ import 'package:solian/widgets/sized_container.dart';
 
 class AttachmentList extends StatefulWidget {
   final String parentId;
-  final List<int> attachmentsId;
+  final List<String> attachmentsId;
   final bool isGrid;
+  final bool isColumn;
   final bool isForceGrid;
   final bool autoload;
   final double flatMaxHeight;
+  final double columnMaxWidth;
 
   final double? width;
   final double? viewport;
@@ -28,9 +30,11 @@ class AttachmentList extends StatefulWidget {
     required this.parentId,
     required this.attachmentsId,
     this.isGrid = false,
+    this.isColumn = false,
     this.isForceGrid = false,
     this.autoload = false,
     this.flatMaxHeight = 720,
+    this.columnMaxWidth = 480,
     this.width,
     this.viewport,
   });
@@ -72,7 +76,8 @@ class _AttachmentListState extends State<AttachmentList> {
     double? consistentValue;
     int portrait = 0, square = 0, landscape = 0;
     for (var entry in _attachmentsMeta) {
-      if (entry!.metadata?['ratio'] != null) {
+      if (entry == null) continue;
+      if (entry.metadata?['ratio'] != null) {
         if (entry.metadata?['ratio'] is int) {
           consistentValue ??= entry.metadata?['ratio'].toDouble();
         } else {
@@ -104,13 +109,14 @@ class _AttachmentListState extends State<AttachmentList> {
     }
   }
 
-  Widget _buildEntry(Attachment? element, int idx) {
+  Widget _buildEntry(Attachment? element, int idx, {double? width}) {
     return AttachmentListEntry(
       item: element,
       parentId: widget.parentId,
-      width: widget.width,
+      width: width ?? widget.width,
       badgeContent: '${idx + 1}/${_attachmentsMeta.length}',
-      showBadge: _attachmentsMeta.length > 1 && !widget.isGrid,
+      showBadge:
+          _attachmentsMeta.length > 1 && !widget.isGrid && !widget.isColumn,
       showBorder: widget.attachmentsId.length > 1,
       showMature: _showMature,
       autoload: widget.autoload,
@@ -141,6 +147,43 @@ class _AttachmentListState extends State<AttachmentList> {
       );
     }
 
+    if (widget.isColumn) {
+      var idx = 0;
+      const radius = BorderRadius.all(Radius.circular(8));
+      return Wrap(
+        spacing: 8,
+        runSpacing: 8,
+        children: widget.attachmentsId.map((x) {
+          final element = _attachmentsMeta[idx];
+          idx++;
+          if (element == null) return const SizedBox();
+          double ratio = element.metadata!['ratio']?.toDouble() ?? 16 / 9;
+          return Container(
+            constraints: BoxConstraints(
+              maxWidth: widget.columnMaxWidth,
+              maxHeight: 640,
+            ),
+            child: AspectRatio(
+              aspectRatio: ratio,
+              child: Container(
+                decoration: BoxDecoration(
+                  border: Border.all(
+                    color: Theme.of(context).dividerColor,
+                    width: 1,
+                  ),
+                  borderRadius: radius,
+                ),
+                child: ClipRRect(
+                  borderRadius: radius,
+                  child: _buildEntry(element, idx),
+                ),
+              ),
+            ),
+          );
+        }).toList(),
+      );
+    }
+
     final isNotPureImage = _attachmentsMeta.any(
       (x) => x?.mimetype.split('/').firstOrNull != 'image',
     );
@@ -152,7 +195,7 @@ class _AttachmentListState extends State<AttachmentList> {
         physics: const NeverScrollableScrollPhysics(),
         shrinkWrap: true,
         gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-          crossAxisCount: min(3, widget.attachmentsId.length),
+          crossAxisCount: math.min(3, widget.attachmentsId.length),
           mainAxisSpacing: 8.0,
           crossAxisSpacing: 8.0,
         ),
@@ -212,6 +255,7 @@ class AttachmentListEntry extends StatelessWidget {
   final Attachment? item;
   final String? badgeContent;
   final double? width;
+  final double? height;
   final bool showBorder;
   final bool showBadge;
   final bool showMature;
@@ -226,6 +270,7 @@ class AttachmentListEntry extends StatelessWidget {
     this.item,
     this.badgeContent,
     this.width,
+    this.height,
     this.showBorder = false,
     this.showBadge = false,
     this.showMature = false,
@@ -250,6 +295,7 @@ class AttachmentListEntry extends StatelessWidget {
     return GestureDetector(
       child: Container(
         width: width ?? MediaQuery.of(context).size.width,
+        height: height,
         decoration: BoxDecoration(
           border: showBorder
               ? Border.symmetric(
@@ -334,13 +380,13 @@ class AttachmentListEntry extends StatelessWidget {
 }
 
 class AttachmentSelfContainedEntry extends StatefulWidget {
-  final int id;
+  final String rid;
   final String parentId;
   final bool isDense;
 
   const AttachmentSelfContainedEntry({
     super.key,
-    required this.id,
+    required this.rid,
     required this.parentId,
     this.isDense = false,
   });
@@ -359,10 +405,12 @@ class _AttachmentSelfContainedEntryState
     final AttachmentProvider attachments = Get.find();
 
     return FutureBuilder(
-      future: attachments.getMetadata(widget.id),
+      future: attachments.getMetadata(widget.rid),
       builder: (context, snapshot) {
         if (!snapshot.hasData) {
-          return const Text('Loading...');
+          return const Center(
+            child: CircularProgressIndicator(),
+          );
         }
 
         return AttachmentListEntry(
@@ -370,7 +418,6 @@ class _AttachmentSelfContainedEntryState
           isDense: widget.isDense,
           parentId: widget.parentId,
           showMature: _showMature,
-          showBorder: true,
           onReveal: (value) {
             setState(() => _showMature = value);
           },

lib/widgets/channel/channel_call_indicator.dart

@@ -9,14 +9,20 @@ import 'package:solian/models/call.dart';
 import 'package:solian/models/channel.dart';
 import 'package:solian/platform.dart';
 import 'package:solian/providers/call.dart';
+import 'package:solian/theme.dart';
 import 'package:solian/widgets/chat/call/call_prejoin.dart';
 
 class ChannelCallIndicator extends StatelessWidget {
   final Channel channel;
   final Call ongoingCall;
+  final Function onJoin;
 
-  const ChannelCallIndicator(
+  const ChannelCallIndicator({
-      {super.key, required this.channel, required this.ongoingCall});
+    super.key,
+    required this.channel,
+    required this.ongoingCall,
+    required this.onJoin,
+  });
 
   void _showCallPrejoin(BuildContext context) {
     showModalBottomSheet(
@@ -25,6 +31,7 @@ class ChannelCallIndicator extends StatelessWidget {
       builder: (context) => ChatCallPrejoinPopup(
         ongoingCall: ongoingCall,
         channel: channel,
+        onJoin: onJoin,
       ),
     );
   }
@@ -40,48 +47,72 @@ class ChannelCallIndicator extends StatelessWidget {
       dividerColor: Colors.transparent,
       content: Row(
         children: [
-          if (ongoingCall.participants.isEmpty) Text('callOngoingEmpty'.tr),
+          Obx(() {
-          if (ongoingCall.participants.isNotEmpty)
+            if (call.isInitialized.value) {
-            Text('callOngoingParticipants'.trParams({
+              return Text('callOngoingJoined'.trParams({
+                'duration': call.lastDuration.value,
+              }));
+            } else if (ongoingCall.participants.isEmpty) {
+              return Text('callOngoingEmpty'.tr);
+            } else {
+              return Text('callOngoingParticipants'.trParams({
                 'count': ongoingCall.participants.length.toString(),
-            })),
+              }));
+            }
+          }),
           const SizedBox(width: 6),
-          if (ongoingCall.participants.isNotEmpty)
+          Obx(() {
-            Container(
+            if (call.isInitialized.value) {
+              return const SizedBox();
+            }
+            if (ongoingCall.participants.isNotEmpty) {
+              return Container(
                 height: 28,
                 constraints: const BoxConstraints(maxWidth: 120),
                 child: AvatarStack(
                   height: 28,
                   borderWidth: 0,
                   avatars: ongoingCall.participants.map((x) {
-                  final userinfo = Account.fromJson(jsonDecode(x['metadata']));
+                    final userinfo =
+                        Account.fromJson(jsonDecode(x['metadata']));
                     return PlatformInfo.canCacheImage
                         ? CachedNetworkImageProvider(userinfo.avatar)
                             as ImageProvider
                         : NetworkImage(userinfo.avatar) as ImageProvider;
                   }).toList(),
                 ),
-            ),
+              );
+            }
+            return const SizedBox();
+          })
         ],
       ),
       actions: [
         Obx(() {
-          if (call.current.value == null) {
+          if (call.isBusy.value) {
+            return const SizedBox(
+              height: 20,
+              width: 20,
+              child: CircularProgressIndicator(strokeWidth: 3),
+            ).paddingAll(16);
+          } else if (call.current.value == null) {
             return TextButton(
               onPressed: () => _showCallPrejoin(context),
               child: Text('callJoin'.tr),
             );
-          } else if (call.channel.value?.id == channel.id) {
+          } else if (call.channel.value?.id == channel.id &&
+              !SolianTheme.isLargeScreen(context)) {
             return TextButton(
-              onPressed: () => call.gotoScreen(context),
+              onPressed: () => onJoin(),
               child: Text('callResume'.tr),
             );
-          } else {
+          } else if (!SolianTheme.isLargeScreen(context)) {
             return TextButton(
               onPressed: null,
               child: Text('callJoin'.tr),
             );
           }
+          return const SizedBox();
         })
       ],
     );

lib/widgets/chat/call/call_controls.dart

@@ -88,12 +88,14 @@ class _ControlsWidgetState extends State<ControlsWidget> {
   void _disconnect() async {
     if (await showDisconnectDialog() != true) return;
 
-    final ChatCallProvider provider = Get.find();
+    final ChatCallProvider call = Get.find();
-    if (provider.current.value != null) {
+    if (call.current.value != null) {
-      provider.disposeRoom();
+      call.disposeRoom();
+      if (Navigator.canPop(context)) {
         Navigator.pop(context);
       }
     }
+  }
 
   void _disableAudio() async {
     await _participant.setMicrophoneEnabled(false);
@@ -209,8 +211,7 @@ class _ControlsWidgetState extends State<ControlsWidget> {
         runSpacing: 5,
         children: [
           IconButton(
-            icon: Transform.flip(
+            icon: const Icon(Icons.exit_to_app),
-                flipX: true, child: const Icon(Icons.exit_to_app)),
             color: Theme.of(context).colorScheme.onSurface,
             onPressed: _disconnect,
           ),

lib/widgets/chat/call/call_prejoin.dart

@@ -11,11 +11,13 @@ import 'package:solian/providers/call.dart';
 class ChatCallPrejoinPopup extends StatefulWidget {
   final Call ongoingCall;
   final Channel channel;
+  final Function onJoin;
 
   const ChatCallPrejoinPopup({
     super.key,
     required this.ongoingCall,
     required this.channel,
+    required this.onJoin,
   });
 
   @override
@@ -25,22 +27,23 @@ class ChatCallPrejoinPopup extends StatefulWidget {
 class _ChatCallPrejoinPopupState extends State<ChatCallPrejoinPopup> {
   bool _isBusy = false;
 
-  void performJoin() async {
+  void _performJoin() async {
     final AuthProvider auth = Get.find();
-    final ChatCallProvider provider = Get.find();
+    final ChatCallProvider call = Get.find();
     if (auth.isAuthorized.isFalse) return;
 
     setState(() => _isBusy = true);
 
-    provider.setCall(widget.ongoingCall, widget.channel);
+    call.setCall(widget.ongoingCall, widget.channel);
+    call.isBusy.value = true;
 
     try {
-      final resp = await provider.getRoomToken();
+      final resp = await call.getRoomToken();
       final token = resp.$1;
       final endpoint = resp.$2;
 
-      provider.initRoom();
+      call.initRoom();
-      provider.setupRoomListeners(
+      call.setupRoomListeners(
         onDisconnected: (reason) {
           context.showSnackbar(
             'callDisconnected'.trParams({'reason': reason.toString()}),
@@ -48,23 +51,22 @@ class _ChatCallPrejoinPopupState extends State<ChatCallPrejoinPopup> {
         },
       );
 
-      provider.joinRoom(endpoint, token);
+      call.joinRoom(endpoint, token);
 
-      provider.gotoScreen(context).then((_) {
       Navigator.pop(context);
-      });
     } catch (e) {
       context.showErrorDialog(e);
     }
 
+    widget.onJoin();
     setState(() => _isBusy = false);
   }
 
   @override
   void initState() {
-    final ChatCallProvider provider = Get.find();
+    final ChatCallProvider call = Get.find();
-    provider.checkPermissions().then((_) {
+    call.checkPermissions().then((_) {
-      provider.initHardware();
+      call.initHardware();
     });
 
     super.initState();
@@ -169,7 +171,7 @@ class _ChatCallPrejoinPopupState extends State<ChatCallPrejoinPopup> {
                     backgroundColor:
                         Theme.of(context).colorScheme.primaryContainer,
                   ),
-                  onPressed: _isBusy ? null : performJoin,
+                  onPressed: _isBusy ? null : _performJoin,
                   child: Text('callJoin'.tr),
                 ),
             ],

lib/widgets/chat/call/chat_call_indicator.dart

@@ -7,10 +7,10 @@ class ChatCallCurrentIndicator extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final ChatCallProvider provider = Get.find();
+    final ChatCallProvider call = Get.find();
 
     return Obx(() {
-      if (provider.current.value == null || provider.channel.value == null) {
+      if (call.current.value == null || call.channel.value == null) {
         return const SizedBox();
       }
 
@@ -18,11 +18,8 @@ class ChatCallCurrentIndicator extends StatelessWidget {
         tileColor: Theme.of(context).colorScheme.surfaceContainerHigh,
         contentPadding: const EdgeInsets.symmetric(horizontal: 32),
         leading: const Icon(Icons.call),
-        title: Text(provider.channel.value!.name),
+        title: Text(call.channel.value!.name),
         subtitle: Text('callAlreadyOngoing'.tr),
-        onTap: () {
-          provider.gotoScreen(context);
-        },
       );
     });
   }

lib/widgets/chat/chat_event.dart

@@ -8,6 +8,7 @@ import 'package:solian/widgets/account/account_profile_popup.dart';
 import 'package:solian/widgets/attachments/attachment_list.dart';
 import 'package:solian/widgets/chat/chat_event_action_log.dart';
 import 'package:solian/widgets/chat/chat_event_message.dart';
+import 'package:solian/widgets/link_expansion.dart';
 import 'package:timeago/timeago.dart' show format;
 
 class ChatEvent extends StatelessWidget {
@@ -37,10 +38,15 @@ class ChatEvent extends StatelessWidget {
     return '$negativeSign${twoDigits(duration.inHours)}:$twoDigitMinutes:$twoDigitSeconds';
   }
 
+  Widget _buildLinkExpansion() {
+    if (item.body['text'] == null) return const SizedBox();
+    return LinkExpansion(content: item.body['text']);
+  }
+
   Widget _buildAttachment(BuildContext context, {bool isMinimal = false}) {
     final attachments = item.body['attachments'] != null
-        ? List<int>.from(item.body['attachments'].map((x) => x))
+        ? List<String>.from(item.body['attachments']?.whereType<String>())
-        : List<int>.empty();
+        : List<String>.empty();
 
     if (attachments.isEmpty) return const SizedBox();
 
@@ -67,7 +73,7 @@ class ChatEvent extends StatelessWidget {
     return Container(
       key: Key('m${item.uuid}attachments-box'),
       width: MediaQuery.of(context).size.width,
-      padding: EdgeInsets.only(top: isMerged ? 0 : 4),
+      padding: EdgeInsets.only(top: isMerged ? 0 : 4, bottom: 4),
       constraints: const BoxConstraints(
         maxHeight: 720,
       ),
@@ -75,7 +81,7 @@ class ChatEvent extends StatelessWidget {
         key: Key('m${item.uuid}attachments'),
         parentId: item.uuid,
         attachmentsId: attachments,
-        viewport: 1,
+        isColumn: true,
       ),
     );
   }
@@ -90,10 +96,13 @@ class ChatEvent extends StatelessWidget {
           return const SizedBox();
         }
 
-        return ChatEvent(
+        return Container(
+          constraints: const BoxConstraints(maxWidth: 480),
+          child: ChatEvent(
             item: snapshot.data!.data,
             isMerged: false,
             isQuote: true,
+          ),
         ).paddingOnly(left: isMerged ? 52 : 0);
       },
     );
@@ -188,8 +197,9 @@ class ChatEvent extends StatelessWidget {
                 ),
             ],
           ).paddingOnly(right: 12),
-          _buildAttachment(context, isMinimal: isContentPreviewing)
+          _buildAttachment(context, isMinimal: isContentPreviewing).paddingOnly(
-              .paddingOnly(left: isContentPreviewing ? 12 : 0),
+            left: isContentPreviewing ? 12 : 56,
+          ),
         ],
       );
     } else if (isQuote) {
@@ -210,7 +220,9 @@ class ChatEvent extends StatelessWidget {
                   Row(
                     children: [
                       AccountAvatar(
-                          content: item.sender.account.avatar, radius: 9),
+                        content: item.sender.account.avatar,
+                        radius: 9,
+                      ),
                       const SizedBox(width: 5),
                       Text(
                         item.sender.account.nick,
@@ -221,8 +233,7 @@ class ChatEvent extends StatelessWidget {
                     ],
                   ),
                   _buildContent().paddingOnly(left: 0.5),
-                  _buildAttachment(context, isMinimal: true)
+                  _buildAttachment(context, isMinimal: true),
-                      .paddingOnly(left: 0),
                 ],
               ),
             ),
@@ -231,6 +242,7 @@ class ChatEvent extends StatelessWidget {
       ).paddingOnly(left: isMerged ? 52 : 0, right: 4);
     } else {
       return Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
         key: Key('m${item.uuid}'),
         children: [
           Row(
@@ -284,7 +296,8 @@ class ChatEvent extends StatelessWidget {
               ),
             ],
           ).paddingSymmetric(horizontal: 12),
-          _buildAttachment(context),
+          _buildLinkExpansion().paddingOnly(left: 52, right: 8),
+          _buildAttachment(context).paddingOnly(left: 56, right: 8),
         ],
       );
     }

lib/widgets/chat/chat_event_list.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_animate/flutter_animate.dart';
 import 'package:get/get.dart';
 import 'package:solian/controllers/chat_events_controller.dart';
 import 'package:solian/models/channel.dart';
@@ -83,11 +82,6 @@ class ChatEventList extends StatelessWidget {
                     ),
                   );
                 },
-              ).animate(key: Key('m-animation${item.uuid}')).slideY(
-                    duration: 250.ms,
-                    curve: Curves.fastEaseInToSlowEaseOut,
-                    end: 0,
-                    begin: 0.5,
               );
             },
           );

lib/widgets/chat/chat_message_input.dart

@@ -59,7 +59,7 @@ class _ChatMessageInputState extends State<ChatMessageInput> {
   final TextEditingController _textController = TextEditingController();
   final FocusNode _focusNode = FocusNode();
 
-  final List<int> _attachments = List.empty(growable: true);
+  final List<String> _attachments = List.empty(growable: true);
 
   Event? _editTo;
   Event? _replyTo;
@@ -68,7 +68,7 @@ class _ChatMessageInputState extends State<ChatMessageInput> {
     showModalBottomSheet(
       context: context,
       builder: (context) => AttachmentEditorPopup(
-        usage: 'm.attachment',
+        pool: 'messaging',
         initialAttachments: _attachments,
         onAdd: (value) {
           setState(() {
@@ -103,7 +103,7 @@ class _ChatMessageInputState extends State<ChatMessageInput> {
 
     final AttachmentUploaderController uploader = Get.find();
     if (uploader.queueOfUpload.any(
-      ((x) => x.usage == 'm.attachment' && x.isUploading),
+      ((x) => x.isUploading),
     )) {
       context.showErrorDialog('attachmentUploadInProgress'.tr);
       return;

lib/widgets/link_expansion.dart

@@ -0,0 +1,123 @@
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_markdown/flutter_markdown.dart';
+import 'package:get/get.dart';
+import 'package:solian/platform.dart';
+import 'package:solian/providers/link_expander.dart';
+import 'package:url_launcher/url_launcher_string.dart';
+
+class LinkExpansion extends StatelessWidget {
+  final String content;
+
+  const LinkExpansion({super.key, required this.content});
+
+  Widget _buildImage(String url, {double? width, double? height}) {
+    return PlatformInfo.canCacheImage
+        ? CachedNetworkImage(imageUrl: url, width: width, height: height)
+        : Image.network(url, width: width, height: height);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final linkRegex = RegExp(
+      r'(?:(?:https?|ftp):\/\/|www\.)'
+      r'(?:[-_a-z0-9]+\.)*(?:[-a-z0-9]+\.[-a-z0-9]+)'
+      r'[^\s<]*'
+      r'[^\s<?!.,:*_~]',
+    );
+    final matches = linkRegex.allMatches(content);
+    if (matches.isEmpty) {
+      return const SizedBox();
+    }
+
+    final LinkExpandController expandController = Get.find();
+
+    return Wrap(
+      children: matches.map((x) {
+        return Container(
+          constraints: BoxConstraints(
+            maxWidth: matches.length == 1 ? 480 : 340,
+          ),
+          child: FutureBuilder(
+            future: expandController.expandLink(x.group(0)!),
+            builder: (context, snapshot) {
+              if (!snapshot.hasData) {
+                return const SizedBox();
+              }
+
+              final isRichDescription = [
+                "solsynth.dev",
+              ].contains(Uri.parse(snapshot.data!.url).host);
+
+              return GestureDetector(
+                child: Card(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      if ([
+                        (snapshot.data!.icon?.isNotEmpty ?? false),
+                        snapshot.data!.siteName != null
+                      ].any((x) => x))
+                        Row(
+                          children: [
+                            if (snapshot.data!.icon?.isNotEmpty ?? false)
+                              ClipRRect(
+                                borderRadius: const BorderRadius.all(
+                                  Radius.circular(8),
+                                ),
+                                child: _buildImage(
+                                  snapshot.data!.icon!,
+                                  width: 32,
+                                  height: 32,
+                                ),
+                              ).paddingOnly(right: 8),
+                            if (snapshot.data!.siteName != null)
+                              Text(
+                                snapshot.data!.siteName!,
+                                style: Theme.of(context).textTheme.labelLarge,
+                              ),
+                          ],
+                        ).paddingOnly(
+                          bottom: (snapshot.data!.icon?.isNotEmpty ?? false)
+                              ? 8
+                              : 4,
+                        ),
+                      if (snapshot.data!.image != null &&
+                          (snapshot.data!.image?.startsWith('http') ?? false))
+                        ClipRRect(
+                          borderRadius: const BorderRadius.all(
+                            Radius.circular(8),
+                          ),
+                          child: _buildImage(
+                            snapshot.data!.image!,
+                          ),
+                        ).paddingOnly(bottom: 8),
+                      Text(
+                        snapshot.data!.title ?? 'No Title',
+                        maxLines: 1,
+                        overflow: TextOverflow.fade,
+                        style: Theme.of(context).textTheme.bodyLarge,
+                      ),
+                      if (snapshot.data!.description != null &&
+                          isRichDescription)
+                        MarkdownBody(data: snapshot.data!.description!)
+                      else if (snapshot.data!.description != null)
+                        Text(
+                          snapshot.data!.description!,
+                          maxLines: 3,
+                          overflow: TextOverflow.ellipsis,
+                        ),
+                    ],
+                  ).paddingAll(12),
+                ),
+                onTap: () {
+                  launchUrlString(x.group(0)!);
+                },
+              );
+            },
+          ),
+        );
+      }).toList(),
+    );
+  }
+}

lib/widgets/markdown_text_content.dart

@@ -131,7 +131,7 @@ class MarkdownTextContent extends StatelessWidget {
                   child: AttachmentSelfContainedEntry(
                     isDense: true,
                     parentId: parentId,
-                    id: int.parse(segments[1]),
+                    rid: segments[1],
                   ),
                 ),
               ).paddingSymmetric(vertical: 4);

lib/widgets/navigation/app_navigation_drawer.dart

@@ -33,10 +33,12 @@ class _AppNavigationDrawerState extends State<AppNavigationDrawer> {
     final resp = await provider.getCurrentStatus();
     final status = AccountStatus.fromJson(resp.body);
 
+    if (mounted) {
       setState(() {
         _accountStatus = status;
       });
     }
+  }
 
   void _closeDrawer() {
     rootScaffoldKey.currentState!.closeDrawer();

lib/widgets/posts/editor/post_editor_thumbnail.dart

@@ -20,7 +20,7 @@ class _PostEditorThumbnailDialogState extends State<PostEditorThumbnailDialog> {
     showModalBottomSheet(
       context: context,
       builder: (context) => AttachmentEditorPopup(
-        usage: 'i.attachment',
+        pool: 'interactive',
         singleMode: true,
         imageOnly: true,
         autoUpload: true,
@@ -84,8 +84,7 @@ class _PostEditorThumbnailDialogState extends State<PostEditorThumbnailDialog> {
       actions: [
         TextButton(
           onPressed: () {
-            widget.controller.thumbnail.value =
+            widget.controller.thumbnail.value = _attachmentController.text;
-                int.tryParse(_attachmentController.text);
             Navigator.pop(context);
           },
           child: Text('confirm'.tr),

lib/widgets/posts/post_action.dart

@@ -45,7 +45,7 @@ class _PostActionState extends State<PostAction> {
     String id;
     final box = context.findRenderObject() as RenderBox?;
     if (widget.item.alias?.isNotEmpty ?? false) {
-      id = '${widget.item.areaAlias}:${widget.item.alias}';
+      id = '${widget.item.areaAlias}/${widget.item.alias}';
     } else {
       id = '${widget.item.id}';
     }
@@ -55,10 +55,10 @@ class _PostActionState extends State<PostAction> {
         sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
       );
     } else {
-      final extraContent = [
+      final extraContent = <String?>[
         widget.item.body['title'],
         widget.item.body['description'],
-      ];
+      ].where((x) => x != null && x.isNotEmpty).toList();
       final isExtraNotEmpty = extraContent.any((x) => x != null);
       result = await Share.share(
         'postShareContent'.trParams({

lib/widgets/posts/post_item.dart

@@ -10,6 +10,7 @@ import 'package:solian/shells/title_shell.dart';
 import 'package:solian/widgets/account/account_avatar.dart';
 import 'package:solian/widgets/account/account_profile_popup.dart';
 import 'package:solian/widgets/attachments/attachment_list.dart';
+import 'package:solian/widgets/link_expansion.dart';
 import 'package:solian/widgets/markdown_text_content.dart';
 import 'package:solian/widgets/posts/post_tags.dart';
 import 'package:solian/widgets/posts/post_quick_action.dart';
@@ -87,7 +88,7 @@ class _PostItemState extends State<PostItem> {
       child: AspectRatio(
         aspectRatio: 16 / 9,
         child: AttachmentSelfContainedEntry(
-          id: widget.item.body['thumbnail'],
+          rid: widget.item.body['thumbnail'],
           parentId: 'p${item.id}-thumbnail',
         ),
       ),
@@ -288,12 +289,41 @@ class _PostItemState extends State<PostItem> {
     );
   }
 
+  Widget _buildAttachments() {
+    final List<String> attachments = item.body['attachments'] is List
+        ? List.from(item.body['attachments']?.whereType<String>())
+        : List.empty();
+
+    if (attachments.length > 3) {
+      return AttachmentList(
+        parentId: widget.item.id.toString(),
+        attachmentsId: attachments,
+        autoload: true,
+        isGrid: true,
+      ).paddingOnly(left: 36, top: 4, bottom: 4);
+    } else if (attachments.length > 1) {
+      return AttachmentList(
+        parentId: widget.item.id.toString(),
+        attachmentsId: attachments,
+        autoload: true,
+        isColumn: true,
+      ).paddingOnly(left: 60, right: 24);
+    } else {
+      return AttachmentList(
+        flatMaxHeight: MediaQuery.of(context).size.width,
+        parentId: widget.item.id.toString(),
+        attachmentsId: attachments,
+        autoload: true,
+      );
+    }
+  }
+
   double _contentHeight = 0;
 
   @override
   Widget build(BuildContext context) {
-    final List<int> attachments = item.body['attachments'] is List
+    final List<String> attachments = item.body['attachments'] is List
-        ? item.body['attachments']?.cast<int>()
+        ? List.from(item.body['attachments']?.whereType<String>())
         : List.empty();
     final hasAttachment = attachments.isNotEmpty;
 
@@ -301,7 +331,7 @@ class _PostItemState extends State<PostItem> {
       return Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          _buildThumbnail(),
+          _buildThumbnail().paddingOnly(bottom: 8),
           _buildHeader().paddingSymmetric(horizontal: 12),
           _buildHeaderDivider().paddingSymmetric(horizontal: 12),
           Stack(
@@ -349,6 +379,11 @@ class _PostItemState extends State<PostItem> {
                 ),
             ],
           ),
+          LinkExpansion(content: item.body['content']).paddingOnly(
+            left: 8,
+            right: 8,
+            top: 4,
+          ),
           _buildFooter().paddingOnly(left: 16),
           if (attachments.isNotEmpty)
             Row(
@@ -441,27 +476,31 @@ class _PostItemState extends State<PostItem> {
                       ],
                     ),
                     if (widget.item.replyTo != null && widget.isShowEmbed)
-                      _buildReply(context).paddingOnly(top: 4),
+                      Container(
+                        constraints: const BoxConstraints(maxWidth: 480),
+                        padding: const EdgeInsets.only(top: 4),
+                        child: _buildReply(context),
+                      ),
                     if (widget.item.repostTo != null && widget.isShowEmbed)
-                      _buildRepost(context).paddingOnly(top: 4),
+                      Container(
+                        constraints: const BoxConstraints(maxWidth: 480),
+                        padding: const EdgeInsets.only(top: 4),
+                        child: _buildRepost(context),
+                      ),
                     _buildFooter().paddingOnly(left: 12),
+                    LinkExpansion(content: item.body['content'])
+                        .paddingOnly(top: 4),
                   ],
                 ),
               ),
             ],
           ).paddingOnly(
             top: 10,
-            bottom: hasAttachment ? 10 : 0,
+            bottom: attachments.length == 1 ? 10 : 0,
             right: 16,
             left: 16,
           ),
-          AttachmentList(
+          _buildAttachments(),
-            flatMaxHeight: MediaQuery.of(context).size.width,
-            parentId: widget.item.id.toString(),
-            attachmentsId: attachments,
-            autoload: true,
-            isGrid: attachments.length > 1,
-          ),
           if (widget.isShowReply || widget.isReactable)
             PostQuickAction(
               isShowReply: widget.isShowReply,
@@ -474,8 +513,8 @@ class _PostItemState extends State<PostItem> {
                 });
               },
             ).paddingOnly(
-              top: hasAttachment ? 10 : 6,
+              top: attachments.length == 1 ? 10 : 6,
-              left: hasAttachment ? 24 : 60,
+              left: attachments.length == 1 ? 24 : 60,
               right: 16,
               bottom: 10,
             )

lib/widgets/stickers/sticker_uploader.dart

@@ -29,7 +29,7 @@ class _StickerUploadDialogState extends State<StickerUploadDialog> {
     showModalBottomSheet(
       context: context,
       builder: (context) => AttachmentEditorPopup(
-        usage: 'sticker',
+        pool: 'sticker',
         singleMode: true,
         imageOnly: true,
         autoUpload: true,

linux/flutter/generated_plugin_registrant.cc

@@ -11,6 +11,8 @@
 #include <flutter_acrylic/flutter_acrylic_plugin.h>
 #include <flutter_secure_storage_linux/flutter_secure_storage_linux_plugin.h>
 #include <flutter_webrtc/flutter_web_r_t_c_plugin.h>
+#include <media_kit_libs_linux/media_kit_libs_linux_plugin.h>
+#include <media_kit_video/media_kit_video_plugin.h>
 #include <pasteboard/pasteboard_plugin.h>
 #include <url_launcher_linux/url_launcher_plugin.h>
 
@@ -30,6 +32,12 @@ void fl_register_plugins(FlPluginRegistry* registry) {
   g_autoptr(FlPluginRegistrar) flutter_webrtc_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterWebRTCPlugin");
   flutter_web_r_t_c_plugin_register_with_registrar(flutter_webrtc_registrar);
+  g_autoptr(FlPluginRegistrar) media_kit_libs_linux_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "MediaKitLibsLinuxPlugin");
+  media_kit_libs_linux_plugin_register_with_registrar(media_kit_libs_linux_registrar);
+  g_autoptr(FlPluginRegistrar) media_kit_video_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "MediaKitVideoPlugin");
+  media_kit_video_plugin_register_with_registrar(media_kit_video_registrar);
   g_autoptr(FlPluginRegistrar) pasteboard_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "PasteboardPlugin");
   pasteboard_plugin_register_with_registrar(pasteboard_registrar);

linux/flutter/generated_plugins.cmake

@@ -8,11 +8,14 @@ list(APPEND FLUTTER_PLUGIN_LIST
   flutter_acrylic
   flutter_secure_storage_linux
   flutter_webrtc
+  media_kit_libs_linux
+  media_kit_video
   pasteboard
   url_launcher_linux
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST
+  media_kit_native_event_loop
 )
 
 set(PLUGIN_BUNDLED_LIBRARIES)

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -18,15 +18,17 @@ import flutter_webrtc
 import gal
 import livekit_client
 import macos_window_utils
+import media_kit_libs_macos_video
+import media_kit_video
 import package_info_plus
 import pasteboard
 import path_provider_foundation
 import protocol_handler_macos
+import screen_brightness_macos
 import share_plus
 import shared_preferences_foundation
 import sqflite
 import url_launcher_macos
-import video_player_avfoundation
 import wakelock_plus
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
@@ -43,14 +45,16 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   GalPlugin.register(with: registry.registrar(forPlugin: "GalPlugin"))
   LiveKitPlugin.register(with: registry.registrar(forPlugin: "LiveKitPlugin"))
   MacOSWindowUtilsPlugin.register(with: registry.registrar(forPlugin: "MacOSWindowUtilsPlugin"))
+  MediaKitLibsMacosVideoPlugin.register(with: registry.registrar(forPlugin: "MediaKitLibsMacosVideoPlugin"))
+  MediaKitVideoPlugin.register(with: registry.registrar(forPlugin: "MediaKitVideoPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   PasteboardPlugin.register(with: registry.registrar(forPlugin: "PasteboardPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   ProtocolHandlerMacosPlugin.register(with: registry.registrar(forPlugin: "ProtocolHandlerMacosPlugin"))
+  ScreenBrightnessMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenBrightnessMacosPlugin"))
   SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
-  FVPVideoPlayerPlugin.register(with: registry.registrar(forPlugin: "FVPVideoPlayerPlugin"))
   WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin"))
 }

pubspec.lock

@@ -206,14 +206,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.3"
-  chewie:
-    dependency: "direct main"
-    description:
-      name: chewie
-      sha256: "2243e41e79e865d426d9dd9c1a9624aa33c4ad11de2d0cd680f826e2cd30e879"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.8.3"
   cli_util:
     dependency: transitive
     description:
@@ -286,14 +278,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.5"
-  csslib:
-    dependency: transitive
-    description:
-      name: csslib
-      sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -550,6 +534,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.8.12"
+  firebase_performance:
+    dependency: "direct main"
+    description:
+      name: firebase_performance
+      sha256: "6d17133458b9627f15f278d6f71bebbbce885d393f3462b690e55deeb5c36b90"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.10.0+4"
+  firebase_performance_platform_interface:
+    dependency: transitive
+    description:
+      name: firebase_performance_platform_interface
+      sha256: "28dc0a70a3459fe51d1c1be5754803a9a0db0e210322ec7526f6ce42bf6ad83e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.4+40"
+  firebase_performance_web:
+    dependency: transitive
+    description:
+      name: firebase_performance_web
+      sha256: db91d86b34280f5253d2913945fdd51d7114486584a298a7bedf1c4b2ab08f79
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.6+12"
   fixnum:
     dependency: transitive
     description:
@@ -869,14 +877,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.5"
-  html:
-    dependency: transitive
-    description:
-      name: html
-      sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.15.4"
   http:
     dependency: transitive
     description:
@@ -1141,6 +1141,78 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.11.1"
+  media_kit:
+    dependency: "direct main"
+    description:
+      name: media_kit
+      sha256: "3289062540e3b8b9746e5c50d95bd78a9289826b7227e253dff806d002b9e67a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.10+1"
+  media_kit_libs_android_video:
+    dependency: transitive
+    description:
+      name: media_kit_libs_android_video
+      sha256: "9dd8012572e4aff47516e55f2597998f0a378e3d588d0fad0ca1f11a53ae090c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.6"
+  media_kit_libs_ios_video:
+    dependency: transitive
+    description:
+      name: media_kit_libs_ios_video
+      sha256: b5382994eb37a4564c368386c154ad70ba0cc78dacdd3fb0cd9f30db6d837991
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.4"
+  media_kit_libs_linux:
+    dependency: transitive
+    description:
+      name: media_kit_libs_linux
+      sha256: e186891c31daa6bedab4d74dcdb4e8adfccc7d786bfed6ad81fe24a3b3010310
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.3"
+  media_kit_libs_macos_video:
+    dependency: transitive
+    description:
+      name: media_kit_libs_macos_video
+      sha256: f26aa1452b665df288e360393758f84b911f70ffb3878032e1aabba23aa1032d
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.4"
+  media_kit_libs_video:
+    dependency: "direct main"
+    description:
+      name: media_kit_libs_video
+      sha256: "3688e0c31482074578652bf038ce6301a5d21e1eda6b54fc3117ffeb4bdba067"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.4"
+  media_kit_libs_windows_video:
+    dependency: transitive
+    description:
+      name: media_kit_libs_windows_video
+      sha256: "7bace5f35d9afcc7f9b5cdadb7541d2191a66bb3fc71bfa11c1395b3360f6122"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.9"
+  media_kit_native_event_loop:
+    dependency: transitive
+    description:
+      name: media_kit_native_event_loop
+      sha256: a605cf185499d14d58935b8784955a92a4bf0ff4e19a23de3d17a9106303930e
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.8"
+  media_kit_video:
+    dependency: "direct main"
+    description:
+      name: media_kit_video
+      sha256: c048d11a19e379aebbe810647636e3fc6d18374637e2ae12def4ff8a4b99a882
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.4"
   meta:
     dependency: transitive
     description:
@@ -1485,6 +1557,62 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.28.0"
+  safe_local_storage:
+    dependency: transitive
+    description:
+      name: safe_local_storage
+      sha256: ede4eb6cb7d88a116b3d3bf1df70790b9e2038bc37cb19112e381217c74d9440
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
+  screen_brightness:
+    dependency: transitive
+    description:
+      name: screen_brightness
+      sha256: ed8da4a4511e79422fc1aa88138e920e4008cd312b72cdaa15ccb426c0faaedd
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.2+1"
+  screen_brightness_android:
+    dependency: transitive
+    description:
+      name: screen_brightness_android
+      sha256: "3df10961e3a9e968a5e076fe27e7f4741fa8a1d3950bdeb48cf121ed529d0caf"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0+2"
+  screen_brightness_ios:
+    dependency: transitive
+    description:
+      name: screen_brightness_ios
+      sha256: "99adc3ca5490b8294284aad5fcc87f061ad685050e03cf45d3d018fe398fd9a2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0"
+  screen_brightness_macos:
+    dependency: transitive
+    description:
+      name: screen_brightness_macos
+      sha256: "64b34e7e3f4900d7687c8e8fb514246845a73ecec05ab53483ed025bd4a899fd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0+1"
+  screen_brightness_platform_interface:
+    dependency: transitive
+    description:
+      name: screen_brightness_platform_interface
+      sha256: b211d07f0c96637a15fb06f6168617e18030d5d74ad03795dd8547a52717c171
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0"
+  screen_brightness_windows:
+    dependency: transitive
+    description:
+      name: screen_brightness_windows
+      sha256: "9261bf33d0fc2707d8cf16339ce25768100a65e70af0fcabaf032fc12408ba86"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.3"
   sdp_transform:
     dependency: transitive
     description:
@@ -1630,10 +1758,10 @@ packages:
     dependency: transitive
     description:
       name: sqflite_common
-      sha256: c5e5b2a142a893a752cb36ae5888680248686725a54afceff31f9a3a76bc53c2
+      sha256: "7b41b6c3507854a159e24ae90a8e3e9cc01eb26a477c118d6dca065b5f55453e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.4+1"
+    version: "2.5.4+2"
   sqflite_common_ffi:
     dependency: "direct dev"
     description:
@@ -1762,6 +1890,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.3.1"
+  universal_platform:
+    dependency: transitive
+    description:
+      name: universal_platform
+      sha256: "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
+  uri_parser:
+    dependency: transitive
+    description:
+      name: uri_parser
+      sha256: "6543c9fd86d2862fac55d800a43e67c0dcd1a41677cb69c2f8edfe73bbcf1835"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
   url_launcher:
     dependency: "direct main"
     description:
@@ -1842,46 +1986,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
-  video_player:
-    dependency: "direct main"
-    description:
-      name: video_player
-      sha256: e30df0d226c4ef82e2c150ebf6834b3522cf3f654d8e2f9419d376cdc071425d
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.9.1"
-  video_player_android:
-    dependency: transitive
-    description:
-      name: video_player_android
-      sha256: "4de50df9ee786f5891d3281e1e633d7b142ef1acf47392592eb91cba5d355849"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.6.0"
-  video_player_avfoundation:
-    dependency: transitive
-    description:
-      name: video_player_avfoundation
-      sha256: d1e9a824f2b324000dc8fb2dcb2a3285b6c1c7c487521c63306cc5b394f68a7c
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.6.1"
-  video_player_platform_interface:
-    dependency: transitive
-    description:
-      name: video_player_platform_interface
-      sha256: "236454725fafcacf98f0f39af0d7c7ab2ce84762e3b63f2cbb3ef9a7e0550bc6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.2.2"
-  video_player_web:
-    dependency: transitive
-    description:
-      name: video_player_web
-      sha256: "6dcdd298136523eaf7dfc31abaf0dfba9aa8a8dbc96670e87e9d42b6f2caf774"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.2"
   vm_service:
     dependency: transitive
     description:
@@ -1890,6 +1994,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "14.2.4"
+  volume_controller:
+    dependency: transitive
+    description:
+      name: volume_controller
+      sha256: c71d4c62631305df63b72da79089e078af2659649301807fa746088f365cb48e
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.8"
   wakelock_plus:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -2,7 +2,7 @@ name: solian
 description: "The Solar Network App"
 publish_to: "none"
 
-version: 1.2.1+15
+version: 1.2.1+19
 
 environment:
   sdk: ">=3.3.4 <4.0.0"
@@ -67,8 +67,10 @@ dependencies:
   collection: ^1.18.0
   firebase_crashlytics: ^4.0.4
   firebase_analytics: ^11.2.1
-  video_player: ^2.9.1
+  firebase_performance: ^0.10.0+4
-  chewie: ^1.8.3
+  media_kit: ^1.1.10+1
+  media_kit_video: ^1.2.4
+  media_kit_libs_video: ^1.0.4
 
 dev_dependencies:
   flutter_test:

windows/flutter/generated_plugin_registrant.cc

@@ -15,9 +15,12 @@
 #include <flutter_webrtc/flutter_web_r_t_c_plugin.h>
 #include <gal/gal_plugin_c_api.h>
 #include <livekit_client/live_kit_plugin.h>
+#include <media_kit_libs_windows_video/media_kit_libs_windows_video_plugin_c_api.h>
+#include <media_kit_video/media_kit_video_plugin_c_api.h>
 #include <pasteboard/pasteboard_plugin.h>
 #include <permission_handler_windows/permission_handler_windows_plugin.h>
 #include <protocol_handler_windows/protocol_handler_windows_plugin_c_api.h>
+#include <screen_brightness_windows/screen_brightness_windows_plugin.h>
 #include <share_plus/share_plus_windows_plugin_c_api.h>
 #include <url_launcher_windows/url_launcher_windows.h>
 
@@ -40,12 +43,18 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("GalPluginCApi"));
   LiveKitPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("LiveKitPlugin"));
+  MediaKitLibsWindowsVideoPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("MediaKitLibsWindowsVideoPluginCApi"));
+  MediaKitVideoPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("MediaKitVideoPluginCApi"));
   PasteboardPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("PasteboardPlugin"));
   PermissionHandlerWindowsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin"));
   ProtocolHandlerWindowsPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("ProtocolHandlerWindowsPluginCApi"));
+  ScreenBrightnessWindowsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("ScreenBrightnessWindowsPlugin"));
   SharePlusWindowsPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi"));
   UrlLauncherWindowsRegisterWithRegistrar(

windows/flutter/generated_plugins.cmake

@@ -12,14 +12,18 @@ list(APPEND FLUTTER_PLUGIN_LIST
   flutter_webrtc
   gal
   livekit_client
+  media_kit_libs_windows_video
+  media_kit_video
   pasteboard
   permission_handler_windows
   protocol_handler_windows
+  screen_brightness_windows
   share_plus
   url_launcher_windows
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST
+  media_kit_native_event_loop
 )
 
 set(PLUGIN_BUNDLED_LIBRARIES)