fix: 別アカウントで開いたときに異なるアカウントで表示されてしまうのを修正の再修正

4ster1sk · Dec 12, 2024 · 991ee25 · 991ee25
1 parent 3605a7a
commit 991ee25
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 9 deletions.
diff --git a/lib/router/app_router.gr.dart b/lib/router/app_router.gr.dart
diff --git a/lib/state_notifier/common/misskey_notes/misskey_note_notifier.dart b/lib/state_notifier/common/misskey_notes/misskey_note_notifier.dart
@@ -191,7 +191,7 @@ class MisskeyNoteNotifier extends _$MisskeyNoteNotifier {
     await navigateToNoteDetailPage(note, account: selectedAccount);
   }
 
-  Future<void> openUserInOtherAccount(User user) async {
+  Future<void> openUserInOtherAccount(User user, String? host) async {
     final accountContext = ref.read(accountContextProvider);
     final selectedAccount = await ref.read(appRouterProvider).push<Account>(
           AccountSelectRoute(
@@ -206,16 +206,16 @@ class MisskeyNoteNotifier extends _$MisskeyNoteNotifier {
     if (user.host == null) {
       switch (user) {
         case UserLite():
-          user = user.copyWith(host: accountContext.getAccount.host);
+          user = user.copyWith(host: host ?? accountContext.getAccount.host);
 
         case UserDetailedNotMe():
-          user = user.copyWith(host: accountContext.getAccount.host);
+          user = user.copyWith(host: host ?? accountContext.getAccount.host);
 
         case UserDetailedNotMeWithRelations():
-          user = user.copyWith(host: accountContext.getAccount.host);
+          user = user.copyWith(host: host ?? accountContext.getAccount.host);
 
         case MeDetailed():
-          user = user.copyWith(host: accountContext.getAccount.host);
+          user = user.copyWith(host: host ?? accountContext.getAccount.host);
       }
     }
     await navigateToUserPage(user, account: selectedAccount);

diff --git a/lib/state_notifier/common/misskey_notes/misskey_note_notifier.g.dart b/lib/state_notifier/common/misskey_notes/misskey_note_notifier.g.dart
diff --git a/lib/view/note_modal_sheet/note_modal_sheet.dart b/lib/view/note_modal_sheet/note_modal_sheet.dart
@@ -240,6 +240,7 @@ class NoteModalSheet extends ConsumerWidget implements AutoRouteWrapper {
             UserControlRoute(
               account: accountContext.postAccount,
               response: value,
+              host: ref.read(misskeyGetContextProvider).host,
             ),
           );
         case null:

diff --git a/lib/view/note_modal_sheet/note_modal_sheet.g.dart b/lib/view/note_modal_sheet/note_modal_sheet.g.dart
diff --git a/lib/view/user_page/user_control_dialog.dart b/lib/view/user_page/user_control_dialog.dart
@@ -31,10 +31,12 @@ enum UserControl {
 class UserControlDialog extends HookConsumerWidget implements AutoRouteWrapper {
   final Account account;
   final UserDetailed response;
+  final String? host;
 
   const UserControlDialog({
     required this.account,
     required this.response,
+    this.host,
     super.key,
   });
 
@@ -105,7 +107,7 @@ class UserControlDialog extends HookConsumerWidget implements AutoRouteWrapper {
     final openUserInOtherAccount = useAsync(
       () async => ref
           .read(misskeyNoteNotifierProvider.notifier)
-          .openUserInOtherAccount(response),
+          .openUserInOtherAccount(response, host),
     );
 
     final isLoading = [

diff --git a/lib/view/user_page/user_detail.dart b/lib/view/user_page/user_detail.dart
@@ -142,6 +142,7 @@ class UserDetail extends ConsumerWidget {
                       UserControlRoute(
                         account: ref.read(accountContextProvider).postAccount,
                         response: response,
+                        host: ref.read(misskeyGetContextProvider).host,
                       ),
                     ),
                     icon: const Icon(Icons.more_vert),