lib/controllers/post_editor_controller.dart

@@ -112,14 +112,13 @@ class PostEditorController extends GetxController {
   Future<void> editAttachment(BuildContext context) {
     return showModalBottomSheet(
       context: context,
+      isScrollControlled: true,
       builder: (context) => AttachmentEditorPopup(
         usage: 'i.attachment',
-        initialAttachments: attachments,
+        current: attachments,
-        onAdd: (value) {
+        onUpdate: (value) {
-          attachments.add(value);
+          attachments.value = value;
-        },
+          attachments.refresh();
-        onRemove: (value) {
-          attachments.remove(value);
         },
       ),
     );
@@ -165,8 +164,6 @@ class PostEditorController extends GetxController {
     visibleUsers.clear();
     invisibleUsers.clear();
     visibility.value = 0;
-    publishedAt.value = null;
-    publishedUntil.value = null;
     isDraft.value = false;
     isRestoreFromLocal.value = false;
     lastSaveTime.value = null;

lib/main.dart

@@ -10,7 +10,6 @@ import 'package:sentry_flutter/sentry_flutter.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/theme_switcher.dart';
 import 'package:solian/providers/websocket.dart';
 import 'package:solian/providers/auth.dart';
@@ -126,6 +125,5 @@ class SolianApp extends StatelessWidget {
     Get.lazyPut(() => ChannelProvider());
     Get.lazyPut(() => RealmProvider());
     Get.lazyPut(() => ChatCallProvider());
-    Get.lazyPut(() => AttachmentUploaderController());
   }
 }

lib/providers/attachment_uploader.dart

@@ -1,165 +0,0 @@
-import 'dart:io';
-import 'dart:typed_data';
-
-import 'package:get/get.dart';
-import 'package:solian/models/attachment.dart';
-import 'package:solian/providers/content/attachment.dart';
-
-class AttachmentUploadTask {
-  File file;
-  String usage;
-  Map<String, dynamic>? metadata;
-
-  double progress = 0;
-  bool isUploading = false;
-  bool isCompleted = false;
-
-  AttachmentUploadTask({
-    required this.file,
-    required this.usage,
-    this.metadata,
-  });
-}
-
-class AttachmentUploaderController extends GetxController {
-  RxBool isUploading = false.obs;
-  RxDouble progressOfUpload = 0.0.obs;
-  RxList<AttachmentUploadTask> queueOfUpload = RxList.empty(growable: true);
-
-  void enqueueTask(AttachmentUploadTask task) {
-    if (isUploading.value) throw Exception('uploading blocked');
-    queueOfUpload.add(task);
-  }
-
-  void dequeueTask(AttachmentUploadTask task) {
-    if (isUploading.value) throw Exception('uploading blocked');
-    queueOfUpload.remove(task);
-  }
-
-  Future<Attachment> performSingleTask(int queueIndex) async {
-    isUploading.value = true;
-    progressOfUpload.value = 0;
-
-    queueOfUpload[queueIndex].isUploading = true;
-    queueOfUpload.refresh();
-
-    final task = queueOfUpload[queueIndex];
-    final result = await _rawUploadAttachment(
-      await task.file.readAsBytes(),
-      task.file.path,
-      task.usage,
-      null,
-      onProgress: (value) {
-        queueOfUpload[queueIndex].progress = value;
-        queueOfUpload.refresh();
-        progressOfUpload.value = value;
-      },
-    );
-
-    queueOfUpload.removeAt(queueIndex);
-    queueOfUpload.refresh();
-
-    isUploading.value = false;
-
-    return result;
-  }
-
-  Future<void> performUploadQueue({
-    required Function(Attachment item) onData,
-  }) async {
-    isUploading.value = true;
-    progressOfUpload.value = 0;
-
-    for (var idx = 0; idx < queueOfUpload.length; idx++) {
-      queueOfUpload[idx].isUploading = true;
-      queueOfUpload.refresh();
-
-      final task = queueOfUpload[idx];
-      final result = await _rawUploadAttachment(
-        await task.file.readAsBytes(),
-        task.file.path,
-        task.usage,
-        null,
-        onProgress: (value) {
-          queueOfUpload[idx].progress = value;
-          queueOfUpload.refresh();
-          progressOfUpload.value = (idx + value) / queueOfUpload.length;
-        },
-      );
-      progressOfUpload.value = (idx + 1) / queueOfUpload.length;
-      onData(result);
-
-      queueOfUpload[idx].isUploading = false;
-      queueOfUpload[idx].isCompleted = false;
-      queueOfUpload.refresh();
-    }
-
-    queueOfUpload.clear();
-    queueOfUpload.refresh();
-    isUploading.value = false;
-  }
-
-  Future<void> uploadAttachmentWithCallback(
-    Uint8List data,
-    String path,
-    String usage,
-    Map<String, dynamic>? metadata,
-    Function(Attachment) callback,
-  ) async {
-    if (isUploading.value) throw Exception('uploading blocked');
-
-    isUploading.value = true;
-    final result = await _rawUploadAttachment(
-      data,
-      path,
-      usage,
-      metadata,
-      onProgress: (progress) {
-        progressOfUpload.value = progress;
-      },
-    );
-    isUploading.value = false;
-    callback(result);
-  }
-
-  Future<Attachment> uploadAttachment(
-    Uint8List data,
-    String path,
-    String usage,
-    Map<String, dynamic>? metadata,
-  ) async {
-    if (isUploading.value) throw Exception('uploading blocked');
-
-    isUploading.value = true;
-    final result = await _rawUploadAttachment(
-      data,
-      path,
-      usage,
-      metadata,
-      onProgress: (progress) {
-        progressOfUpload.value = progress;
-      },
-    );
-    isUploading.value = false;
-    return result;
-  }
-
-  Future<Attachment> _rawUploadAttachment(
-      Uint8List data, String path, String usage, Map<String, dynamic>? metadata,
-      {Function(double)? onProgress}) async {
-    final AttachmentProvider provider = Get.find();
-    try {
-      final resp = await provider.createAttachment(
-        data,
-        path,
-        usage,
-        metadata,
-        onProgress: onProgress,
-      );
-      var result = Attachment.fromJson(resp.body);
-      return result;
-    } catch (err) {
-      rethrow;
-    }
-  }
-}

lib/providers/content/attachment.dart

@@ -38,8 +38,11 @@ class AttachmentProvider extends GetConnect {
   }
 
   Future<Response> createAttachment(
-      Uint8List data, String path, String usage, Map<String, dynamic>? metadata,
+    Uint8List data,
-      {Function(double)? onProgress}) async {
+    String path,
+    String usage,
+    Map<String, dynamic>? metadata,
+  ) async {
     final AuthProvider auth = Get.find();
     if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
 
@@ -68,13 +71,7 @@ class AttachmentProvider extends GetConnect {
       if (mimetypeOverride != null) 'mimetype': mimetypeOverride,
       'metadata': jsonEncode(metadata),
     });
-    final resp = await client.post(
+    final resp = await client.post('/attachments', payload);
-      '/attachments',
-      payload,
-      uploadProgress: (progress) {
-        if (onProgress != null) onProgress(progress);
-      },
-    );
     if (resp.statusCode != 200) {
       throw Exception(resp.bodyString);
     }

lib/translations/en_us.dart

@@ -157,11 +157,6 @@ const i18nEnglish = {
   'reactCompleted': 'Your reaction has been added',
   'reactUncompleted': 'Your reaction has been removed',
   'attachmentUploadBy': 'Upload by',
-  'attachmentAutoUpload': 'Auto Upload',
-  'attachmentUploadQueue': 'Upload Queue',
-  'attachmentUploadQueueStart': 'Start All',
-  'attachmentAttached': 'Exists Files',
-  'attachmentUploadBlocked': 'Upload blocked, there is currently a task in progress...',
   'attachmentAdd': 'Attach attachments',
   'attachmentAddGalleryPhoto': 'Gallery photo',
   'attachmentAddGalleryVideo': 'Gallery video',

lib/translations/zh_cn.dart

@@ -146,11 +146,6 @@ const i18nSimplifiedChinese = {
   'reactCompleted': '你的反应已被添加',
   'reactUncompleted': '你的反应已被移除',
   'attachmentUploadBy': '由上传',
-  'attachmentAutoUpload': '自动上传',
-  'attachmentUploadQueue': '上传队列',
-  'attachmentUploadQueueStart': '整队上传',
-  'attachmentAttached': '已附附件',
-  'attachmentUploadBlocked': '上传受阻，当前已有任务进行中……',
   'attachmentAdd': '附加附件',
   'attachmentAddGalleryPhoto': '相册照片',
   'attachmentAddGalleryVideo': '相册视频',

lib/widgets/attachments/attachment_attr_editor.dart

@@ -1,132 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_animate/flutter_animate.dart';
-import 'package:get/get.dart';
-import 'package:solian/exts.dart';
-import 'package:solian/models/attachment.dart';
-import 'package:solian/providers/content/attachment.dart';
-
-class AttachmentAttrEditorDialog extends StatefulWidget {
-  final Attachment item;
-  final Function(Attachment item) onUpdate;
-
-  const AttachmentAttrEditorDialog({
-    super.key,
-    required this.item,
-    required this.onUpdate,
-  });
-
-  @override
-  State<AttachmentAttrEditorDialog> createState() => _AttachmentAttrEditorDialogState();
-}
-
-class _AttachmentAttrEditorDialogState extends State<AttachmentAttrEditorDialog> {
-  final _altController = TextEditingController();
-
-  bool _isBusy = false;
-  bool _isMature = false;
-
-  Future<Attachment?> _updateAttachment() async {
-    final AttachmentProvider provider = Get.find();
-
-    setState(() => _isBusy = true);
-    try {
-      final resp = await provider.updateAttachment(
-        widget.item.id,
-        _altController.value.text,
-        widget.item.usage,
-        isMature: _isMature,
-      );
-
-      Get.find<AttachmentProvider>().clearCache(id: widget.item.id);
-
-      setState(() => _isBusy = false);
-      return Attachment.fromJson(resp.body);
-    } catch (e) {
-      context.showErrorDialog(e);
-      setState(() => _isBusy = false);
-      return null;
-    }
-  }
-
-  void syncWidget() {
-    _isMature = widget.item.isMature;
-    _altController.text = widget.item.alt;
-  }
-
-  @override
-  void initState() {
-    syncWidget();
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: Text('attachmentSetting'.tr),
-      content: Container(
-        constraints: const BoxConstraints(minWidth: 400),
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            if (_isBusy)
-              ClipRRect(
-                borderRadius: const BorderRadius.all(Radius.circular(8)),
-                child: const LinearProgressIndicator().animate().scaleX(),
-              ),
-            const SizedBox(height: 18),
-            TextField(
-              controller: _altController,
-              decoration: InputDecoration(
-                isDense: true,
-                prefixIcon: const Icon(Icons.image_not_supported),
-                border: const OutlineInputBorder(),
-                labelText: 'attachmentAlt'.tr,
-              ),
-              onTapOutside: (_) =>
-                  FocusManager.instance.primaryFocus?.unfocus(),
-            ),
-            const SizedBox(height: 8),
-            CheckboxListTile(
-              contentPadding: const EdgeInsets.only(left: 4, right: 18),
-              shape: const RoundedRectangleBorder(
-                  borderRadius: BorderRadius.all(Radius.circular(10))),
-              title: Text('matureContent'.tr),
-              secondary: const Icon(Icons.visibility_off),
-              value: _isMature,
-              onChanged: (newValue) {
-                setState(() => _isMature = newValue ?? false);
-              },
-              controlAffinity: ListTileControlAffinity.leading,
-            ),
-          ],
-        ),
-      ),
-      actionsAlignment: MainAxisAlignment.spaceBetween,
-      actions: <Widget>[
-        Row(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            TextButton(
-              style: TextButton.styleFrom(
-                  foregroundColor:
-                  Theme.of(context).colorScheme.onSurfaceVariant),
-              onPressed: () => Navigator.pop(context),
-              child: Text('cancel'.tr),
-            ),
-            TextButton(
-              child: Text('apply'.tr),
-              onPressed: () {
-                _updateAttachment().then((value) {
-                  if (value != null) {
-                    widget.onUpdate(value);
-                    Navigator.pop(context);
-                  }
-                });
-              },
-            ),
-          ],
-        ),
-      ],
-    );
-  }
-}

lib/widgets/attachments/attachment_list.dart

@@ -9,7 +9,7 @@ import 'package:get/get.dart';
 import 'package:solian/models/attachment.dart';
 import 'package:solian/widgets/attachments/attachment_item.dart';
 import 'package:solian/providers/content/attachment.dart';
-import 'package:solian/widgets/attachments/attachment_fullscreen.dart';
+import 'package:solian/widgets/attachments/attachment_list_fullscreen.dart';
 
 class AttachmentList extends StatefulWidget {
   final String parentId;
@@ -320,7 +320,7 @@ class AttachmentListEntry extends StatelessWidget {
           onReveal(true);
         } else if (['image'].contains(item!.mimetype.split('/').first)) {
           context.pushTransparentRoute(
-            AttachmentFullScreen(
+            AttachmentListFullScreen(
               parentId: parentId,
               item: item!,
             ),

lib/widgets/attachments/attachment_list_fullscreen.dart

@@ -16,18 +16,19 @@ import 'package:solian/widgets/attachments/attachment_item.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 import 'package:path/path.dart' show extension;
 
-class AttachmentFullScreen extends StatefulWidget {
+class AttachmentListFullScreen extends StatefulWidget {
   final String parentId;
   final Attachment item;
 
-  const AttachmentFullScreen(
+  const AttachmentListFullScreen(
       {super.key, required this.parentId, required this.item});
 
   @override
-  State<AttachmentFullScreen> createState() => _AttachmentFullScreenState();
+  State<AttachmentListFullScreen> createState() =>
+      _AttachmentListFullScreenState();
 }
 
-class _AttachmentFullScreenState extends State<AttachmentFullScreen> {
+class _AttachmentListFullScreenState extends State<AttachmentListFullScreen> {
   bool _showDetails = true;
 
   bool _isDownloading = false;
@@ -82,7 +83,7 @@ class _AttachmentFullScreenState extends State<AttachmentFullScreen> {
     setState(() => _isDownloading = true);
 
     var extName = extension(widget.item.name);
-    if (extName.isEmpty) extName = '.png';
+    if(extName.isEmpty) extName = '.png';
     final imagePath =
         '${Directory.systemTemp.path}/${widget.item.uuid}$extName';
     await Dio().download(

lib/widgets/chat/chat_event.dart

@@ -112,9 +112,7 @@ class ChatEvent extends StatelessWidget {
       case 'messages.edit':
         return ChatEventMessageActionLog(
           icon: const Icon(Icons.edit_note, size: 16),
-          text: 'messageEditDesc'.trParams({
+          text: 'messageEditDesc'.trParams({'id': '#${item.id}'}),
-            'id': '#${item.body['related_event']}',
-          }),
           isMerged: isMerged,
           isHasMerged: isHasMerged,
           isQuote: isQuote,
@@ -122,9 +120,7 @@ class ChatEvent extends StatelessWidget {
       case 'messages.delete':
         return ChatEventMessageActionLog(
           icon: const Icon(Icons.cancel_schedule_send, size: 16),
-          text: 'messageDeleteDesc'.trParams({
+          text: 'messageDeleteDesc'.trParams({'id': '#${item.id}'}),
-            'id': '#${item.body['related_event']}',
-          }),
           isMerged: isMerged,
           isHasMerged: isHasMerged,
           isQuote: isQuote,

lib/widgets/chat/chat_message_input.dart

@@ -38,7 +38,7 @@ class _ChatMessageInputState extends State<ChatMessageInput> {
   final TextEditingController _textController = TextEditingController();
   final FocusNode _focusNode = FocusNode();
 
-  final List<int> _attachments = List.empty(growable: true);
+  List<int> _attachments = List.empty(growable: true);
 
   Event? _editTo;
   Event? _replyTo;
@@ -46,19 +46,11 @@ class _ChatMessageInputState extends State<ChatMessageInput> {
   void _editAttachments() {
     showModalBottomSheet(
       context: context,
+      isScrollControlled: true,
       builder: (context) => AttachmentEditorPopup(
         usage: 'm.attachment',
-        initialAttachments: _attachments,
+        current: _attachments,
-        onAdd: (value) {
+        onUpdate: (value) => _attachments = value,
-          setState(() {
-            _attachments.add(value);
-          });
-        },
-        onRemove: (value) {
-          setState(() {
-            _attachments.remove(value);
-          });
-        },
       ),
     );
   }