⬆️ Support new attachments system

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

@@ -88,7 +88,30 @@ class ChatCallProvider extends GetxController {
 
   void initRoom() {
     initHardware();
-    room = Room();
+    room = Room(
+      roomOptions: const RoomOptions(
+        dynacast: true,
+        adaptiveStream: true,
+        defaultAudioPublishOptions: AudioPublishOptions(
+          name: 'call_voice',
+          stream: 'call_stream',
+        ),
+        defaultVideoPublishOptions: VideoPublishOptions(
+          name: 'call_video',
+          stream: 'call_stream',
+          simulcast: true,
+          backupVideoCodec: BackupVideoCodec(enabled: true),
+        ),
+        defaultScreenShareCaptureOptions: ScreenShareCaptureOptions(
+          useiOSBroadcastExtension: true,
+          params: VideoParametersPresets.screenShareH1080FPS30,
+        ),
+        defaultCameraCaptureOptions: CameraCaptureOptions(
+          maxFrameRate: 30,
+          params: VideoParametersPresets.h1080_169,
+        ),
+      ),
+    );
     listener = room.createListener();
     WakelockPlus.enable();
   }
@@ -104,28 +127,6 @@ class ChatCallProvider extends GetxController {
       await room.connect(
         url,
         token,
-        roomOptions: const RoomOptions(
-          dynacast: true,
-          adaptiveStream: true,
-          defaultAudioPublishOptions: AudioPublishOptions(
-            name: 'call_voice',
-            stream: 'call_stream',
-          ),
-          defaultVideoPublishOptions: VideoPublishOptions(
-            name: 'call_video',
-            stream: 'call_stream',
-            simulcast: true,
-            backupVideoCodec: BackupVideoCodec(enabled: true),
-          ),
-          defaultScreenShareCaptureOptions: ScreenShareCaptureOptions(
-            useiOSBroadcastExtension: true,
-            params: VideoParametersPresets.screenShareH1080FPS30,
-          ),
-          defaultCameraCaptureOptions: CameraCaptureOptions(
-            maxFrameRate: 30,
-            params: VideoParametersPresets.h1080_169,
-          ),
-        ),
         fastConnectOptions: FastConnectOptions(
           microphone: TrackOption(track: audioTrack.value),
           camera: TrackOption(track: videoTrack.value),
@@ -152,7 +153,7 @@ class ChatCallProvider extends GetxController {
   void onRoomDidUpdate() => sortParticipants();
 
   void setupRoom() {
-    if(isInitialized.value) return;
+    if (isInitialized.value) return;
 
     sortParticipants();
     room.addListener(onRoomDidUpdate);

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<int> pendingQuery = List.empty(growable: true);
+    List<Attachment?> result = List.filled(rid.length, null);
+    List<String> pendingQuery = List.empty(growable: true);
     if (!noCache) {
-      for (var idx = 0; idx < id.length; idx++) {
-        if (_cachedResponses.containsKey(id[idx])) {
-          result[idx] = _cachedResponses[id[idx]];
+      for (var idx = 0; idx < rid.length; idx++) {
+        if (_cachedResponses.containsKey(rid[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++) {
-        if (out[i].id == id[j]) {
+      for (var j = 0; j < rid.length; 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 {
-    if (!noCache && _cachedResponses.containsKey(id)) {
-      return _cachedResponses[id]!;
+  Future<Attachment?> getMetadata(String rid, {noCache = false}) async {
+    if (!noCache && _cachedResponses.containsKey(rid)) {
+      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 usage, {
+    String alt, {
     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,
     });