poppingmoon · poppingmoon · Jun 22, 2024 · Jun 22, 2024
diff --git a/lib/model/streaming/main_event.dart b/lib/model/streaming/main_event.dart
@@ -1,5 +1,9 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:misskey_dart/misskey_dart.dart';
 
+part 'main_event.freezed.dart';
+part 'main_event.g.dart';
+
 sealed class MainEvent {}
 
 class Notification implements MainEvent {
@@ -37,3 +41,14 @@ class AnnouncementCreated implements MainEvent {
 
   final AnnouncementsResponse announcement;
 }
+
+@freezed
+class UrlUploadFinished with _$UrlUploadFinished implements MainEvent {
+  const factory UrlUploadFinished({
+    String? marker,
+    required DriveFile file,
+  }) = _UrlUploadFinished;
+
+  factory UrlUploadFinished.fromJson(Map<String, Object?> json) =>
+      _$UrlUploadFinishedFromJson(json);
+}
diff --git a/lib/model/streaming/main_event.freezed.dart b/lib/model/streaming/main_event.freezed.dart
diff --git a/lib/model/streaming/main_event.g.dart b/lib/model/streaming/main_event.g.dart
diff --git a/lib/provider/api/drive_files_notifier_provider.dart b/lib/provider/api/drive_files_notifier_provider.dart
@@ -102,6 +102,22 @@ class DriveFilesNotifier extends _$DriveFilesNotifier {
     state = AsyncValue.data(value.copyWith(items: [response, ...value.items]));
   }
 
+  Future<void> uploadFromUrl(
+    String url, {
+    String? comment,
+    bool? isSensitive,
+  }) async {
+    await _misskey.drive.files.uploadFromUrl(
+      DriveFilesUploadFromUrlRequest(
+        url: url,
+        folderId: folderId,
+        comment: comment,
+        isSensitive: isSensitive,
+        force: true,
+      ),
+    );
+  }
+
   Future<void> delete(String fileId) async {
     await _misskey.drive.files.delete(DriveFilesDeleteRequest(fileId: fileId));
     final value = state.valueOrNull ?? const PaginationState();

diff --git a/lib/provider/api/drive_files_notifier_provider.g.dart b/lib/provider/api/drive_files_notifier_provider.g.dart
diff --git a/lib/provider/streaming/main_stream_notifier_provider.dart b/lib/provider/streaming/main_stream_notifier_provider.dart
@@ -57,6 +57,8 @@ class MainStreamNotifier extends _$MainStreamNotifier {
             body!['announcement'] as Map<String, dynamic>,
           );
           yield AnnouncementCreated(announcement);
+        case 'urlUploadFinished':
+          yield UrlUploadFinished.fromJson(body!);
       }
     }
   }

diff --git a/lib/provider/streaming/main_stream_notifier_provider.g.dart b/lib/provider/streaming/main_stream_notifier_provider.g.dart
diff --git a/lib/view/page/timelines_page.dart b/lib/view/page/timelines_page.dart
@@ -68,23 +68,22 @@ class TimelinesPage extends HookConsumerWidget {
     useEffect(
       () {
         void callback() {
+          if (tabs.isEmpty) return;
           final previousIndex = tabIndex.value;
           final nextIndex = controller.index;
-          if (previousIndex == nextIndex) {
-            return;
-          }
-          final previousAccount = tabSettings?.account;
+          if (previousIndex == nextIndex) return;
+          final previousAccount = tabs[previousIndex].account;
           final nextTab = tabs[nextIndex];
           final nextAccount = nextTab.account;
           if (previousAccount != nextAccount) {
-            if (previousAccount?.host != nextAccount.host) {
+            if (previousAccount.host != nextAccount.host) {
               ref
                   .read(
                     emojisNotifierProvider(nextAccount.host).notifier,
                   )
                   .reloadEmojis();
             }
-            if (previousAccount != null && !previousAccount.isGuest) {
+            if (!previousAccount.isGuest) {
               ref
                   .read(mainStreamNotifierProvider(previousAccount).notifier)
                   .disconnect();
@@ -112,6 +111,15 @@ class TimelinesPage extends HookConsumerWidget {
           tabIndex.value = nextIndex;
         }
 
+        if (tabSettings != null) {
+          final account = tabSettings.account;
+          ref
+              .read(emojisNotifierProvider(account.host).notifier)
+              .reloadEmojis();
+          if (!account.isGuest) {
+            ref.read(mainStreamNotifierProvider(account).notifier).connect();
+          }
+        }
         controller.addListener(callback);
         return () => controller.removeListener(callback);
       },

diff --git a/lib/view/widget/drive_create_sheet.dart b/lib/view/widget/drive_create_sheet.dart
@@ -16,6 +16,7 @@ import '../../provider/file_system_provider.dart';
 import '../../util/compress_image.dart';
 import '../../util/future_with_dialog.dart';
 import '../../util/randomize_filename.dart';
+import '../dialog/message_dialog.dart';
 import '../dialog/text_field_dialog.dart';
 
 class DriveCreateSheet extends HookConsumerWidget {
@@ -67,6 +68,29 @@ class DriveCreateSheet extends HookConsumerWidget {
     ref.context.pop();
   }
 
+  Future<void> _uploadFromUrl(WidgetRef ref) async {
+    final result = await showTextFieldDialog(
+      ref.context,
+      title: Text(t.misskey.uploadFromUrl),
+    );
+    if (!ref.context.mounted) return;
+    if (result == null) return;
+    final url = Uri.tryParse(result.trim());
+    if (url == null) {
+      await showMessageDialog(ref.context, t.misskey.invalidValue);
+      return;
+    }
+    await futureWithDialog(
+      ref.context,
+      ref
+          .read(driveFilesNotifierProvider(account, folder?.id).notifier)
+          .uploadFromUrl(url.toString()),
+      message: t.misskey.uploadFromUrlRequested,
+    );
+    if (!ref.context.mounted) return;
+    ref.context.pop();
+  }
+
   Future<void> _createFolder(WidgetRef ref) async {
     final name = await showTextFieldDialog(
       ref.context,
@@ -124,6 +148,11 @@ class DriveCreateSheet extends HookConsumerWidget {
             keepOriginalFilename.value,
           ),
         ),
+        ListTile(
+          leading: const Icon(Icons.link),
+          title: Text(t.misskey.fromUrl),
+          onTap: () => _uploadFromUrl(ref),
+        ),
         ListTile(
           leading: const Icon(Icons.folder),
           title: Text(t.misskey.createFolder),