diff --git a/lib/extensions/users_show_response_extension.dart b/lib/extensions/users_show_response_extension.dart
deleted file mode 100644
index 687db5449..000000000
--- a/lib/extensions/users_show_response_extension.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-import 'package:misskey_dart/misskey_dart.dart';
-
-extension UsersShowResponseExtension on UsersShowResponse {
-  String get acct {
-    return "@$username${host != null ? "@$host" : ""}";
-  }
-}
diff --git a/lib/model/account.dart b/lib/model/account.dart
index 69e3c004d..797b786de 100644
--- a/lib/model/account.dart
+++ b/lib/model/account.dart
@@ -13,7 +13,7 @@ class Account with _$Account {
     required String host,
     required String userId,
     String? token,
-    required IResponse i,
+    required MeDetailed i,
     MetaResponse? meta,
   }) = _Account;
 
@@ -43,7 +43,7 @@ class Account with _$Account {
       userId: "",
       token: null,
       meta: meta,
-      i: IResponse(
+      i: MeDetailed(
           id: "",
           username: "",
           createdAt: DateTime.now(),
@@ -58,7 +58,6 @@ class Account with _$Account {
           followersCount: 0,
           notesCount: 0,
           publicReactions: false,
-          ffVisibility: "",
           twoFactorEnabled: false,
           usePasswordLessLogin: false,
           securityKeys: false,
diff --git a/lib/model/account.freezed.dart b/lib/model/account.freezed.dart
index 081757924..c760e880d 100644
--- a/lib/model/account.freezed.dart
+++ b/lib/model/account.freezed.dart
@@ -23,7 +23,7 @@ mixin _$Account {
   String get host => throw _privateConstructorUsedError;
   String get userId => throw _privateConstructorUsedError;
   String? get token => throw _privateConstructorUsedError;
-  IResponse get i => throw _privateConstructorUsedError;
+  MeDetailed get i => throw _privateConstructorUsedError;
   MetaResponse? get meta => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
@@ -40,10 +40,10 @@ abstract class $AccountCopyWith<$Res> {
       {String host,
       String userId,
       String? token,
-      IResponse i,
+      MeDetailed i,
       MetaResponse? meta});
 
-  $IResponseCopyWith<$Res> get i;
+  $MeDetailedCopyWith<$Res> get i;
   $MetaResponseCopyWith<$Res>? get meta;
 }
 
@@ -82,7 +82,7 @@ class _$AccountCopyWithImpl<$Res, $Val extends Account>
       i: null == i
           ? _value.i
           : i // ignore: cast_nullable_to_non_nullable
-              as IResponse,
+              as MeDetailed,
       meta: freezed == meta
           ? _value.meta
           : meta // ignore: cast_nullable_to_non_nullable
@@ -92,8 +92,8 @@ class _$AccountCopyWithImpl<$Res, $Val extends Account>
 
   @override
   @pragma('vm:prefer-inline')
-  $IResponseCopyWith<$Res> get i {
-    return $IResponseCopyWith<$Res>(_value.i, (value) {
+  $MeDetailedCopyWith<$Res> get i {
+    return $MeDetailedCopyWith<$Res>(_value.i, (value) {
       return _then(_value.copyWith(i: value) as $Val);
     });
   }
@@ -122,11 +122,11 @@ abstract class _$$AccountImplCopyWith<$Res> implements $AccountCopyWith<$Res> {
       {String host,
       String userId,
       String? token,
-      IResponse i,
+      MeDetailed i,
       MetaResponse? meta});
 
   @override
-  $IResponseCopyWith<$Res> get i;
+  $MeDetailedCopyWith<$Res> get i;
   @override
   $MetaResponseCopyWith<$Res>? get meta;
 }
@@ -164,7 +164,7 @@ class __$$AccountImplCopyWithImpl<$Res>
       i: null == i
           ? _value.i
           : i // ignore: cast_nullable_to_non_nullable
-              as IResponse,
+              as MeDetailed,
       meta: freezed == meta
           ? _value.meta
           : meta // ignore: cast_nullable_to_non_nullable
@@ -194,7 +194,7 @@ class _$AccountImpl extends _Account {
   @override
   final String? token;
   @override
-  final IResponse i;
+  final MeDetailed i;
   @override
   final MetaResponse? meta;
 
@@ -222,7 +222,7 @@ abstract class _Account extends Account {
       {required final String host,
       required final String userId,
       final String? token,
-      required final IResponse i,
+      required final MeDetailed i,
       final MetaResponse? meta}) = _$AccountImpl;
   const _Account._() : super._();
 
@@ -235,7 +235,7 @@ abstract class _Account extends Account {
   @override
   String? get token;
   @override
-  IResponse get i;
+  MeDetailed get i;
   @override
   MetaResponse? get meta;
   @override
diff --git a/lib/model/account.g.dart b/lib/model/account.g.dart
index 0b4ff1737..754427110 100644
--- a/lib/model/account.g.dart
+++ b/lib/model/account.g.dart
@@ -11,7 +11,7 @@ _$AccountImpl _$$AccountImplFromJson(Map<String, dynamic> json) =>
       host: json['host'] as String,
       userId: json['userId'] as String,
       token: json['token'] as String?,
-      i: IResponse.fromJson(json['i'] as Map<String, dynamic>),
+      i: MeDetailed.fromJson(json['i'] as Map<String, dynamic>),
       meta: json['meta'] == null
           ? null
           : MetaResponse.fromJson(json['meta'] as Map<String, dynamic>),
diff --git a/lib/providers.dart b/lib/providers.dart
index fd347b370..9423ebca2 100644
--- a/lib/providers.dart
+++ b/lib/providers.dart
@@ -213,7 +213,7 @@ final accountRepositoryProvider =
 final accountsProvider =
     Provider<List<Account>>((ref) => ref.watch(accountRepositoryProvider));
 
-final iProvider = Provider.family<IResponse, Acct>((ref, acct) {
+final iProvider = Provider.family<MeDetailed, Acct>((ref, acct) {
   final accounts = ref.watch(accountsProvider);
   final account = accounts.firstWhere((account) => account.acct == acct);
   return account.i;
diff --git a/lib/router/app_router.gr.dart b/lib/router/app_router.gr.dart
index e52bd04c6..68023f2a6 100644
--- a/lib/router/app_router.gr.dart
+++ b/lib/router/app_router.gr.dart
@@ -15,13 +15,23 @@ abstract class _$AppRouter extends RootStackRouter {
 
   @override
   final Map<String, PageFactory> pagesMap = {
-    NotesAfterRenoteRoute.name: (routeData) {
-      final args = routeData.argsAs<NotesAfterRenoteRouteArgs>();
+    AnnouncementRoute.name: (routeData) {
+      final args = routeData.argsAs<AnnouncementRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: NotesAfterRenotePage(
+        child: AnnouncementPage(
           key: args.key,
-          note: args.note,
+          account: args.account,
+        ),
+      );
+    },
+    AntennaNotesRoute.name: (routeData) {
+      final args = routeData.argsAs<AntennaNotesRouteArgs>();
+      return AutoRoutePage<dynamic>(
+        routeData: routeData,
+        child: AntennaNotesPage(
+          key: args.key,
+          antenna: args.antenna,
           account: args.account,
         ),
       );
@@ -36,33 +46,27 @@ abstract class _$AppRouter extends RootStackRouter {
         ),
       );
     },
-    AntennaNotesRoute.name: (routeData) {
-      final args = routeData.argsAs<AntennaNotesRouteArgs>();
+    ChannelsRoute.name: (routeData) {
+      final args = routeData.argsAs<ChannelsRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: AntennaNotesPage(
+        child: ChannelsPage(
           key: args.key,
-          antenna: args.antenna,
           account: args.account,
         ),
       );
     },
-    NotificationRoute.name: (routeData) {
-      final args = routeData.argsAs<NotificationRouteArgs>();
+    ChannelDetailRoute.name: (routeData) {
+      final args = routeData.argsAs<ChannelDetailRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: NotificationPage(
+        child: ChannelDetailPage(
           key: args.key,
           account: args.account,
+          channelId: args.channelId,
         ),
       );
     },
-    LoginRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const LoginPage(),
-      );
-    },
     ClipDetailRoute.name: (routeData) {
       final args = routeData.argsAs<ClipDetailRouteArgs>();
       return AutoRoutePage<dynamic>(
@@ -84,239 +88,253 @@ abstract class _$AppRouter extends RootStackRouter {
         ),
       );
     },
-    NoteCreateRoute.name: (routeData) {
-      final args = routeData.argsAs<NoteCreateRouteArgs>();
+    ExploreRoute.name: (routeData) {
+      final args = routeData.argsAs<ExploreRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: NoteCreatePage(
+        child: ExplorePage(
           key: args.key,
-          initialAccount: args.initialAccount,
-          initialText: args.initialText,
-          initialMediaFiles: args.initialMediaFiles,
-          channel: args.channel,
-          reply: args.reply,
-          renote: args.renote,
-          note: args.note,
-          noteCreationMode: args.noteCreationMode,
+          account: args.account,
         ),
       );
     },
-    HashtagRoute.name: (routeData) {
-      final args = routeData.argsAs<HashtagRouteArgs>();
+    ExploreRoleUsersRoute.name: (routeData) {
+      final args = routeData.argsAs<ExploreRoleUsersRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: HashtagPage(
+        child: ExploreRoleUsersPage(
           key: args.key,
-          hashtag: args.hashtag,
+          item: args.item,
           account: args.account,
         ),
       );
     },
-    UserFolloweeRoute.name: (routeData) {
-      final args = routeData.argsAs<UserFolloweeRouteArgs>();
+    FavoritedNoteRoute.name: (routeData) {
+      final args = routeData.argsAs<FavoritedNoteRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: UserFolloweePage(
+        child: FavoritedNotePage(
           key: args.key,
-          userId: args.userId,
           account: args.account,
         ),
       );
     },
-    UserRoute.name: (routeData) {
-      final args = routeData.argsAs<UserRouteArgs>();
+    FederationRoute.name: (routeData) {
+      final args = routeData.argsAs<FederationRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: UserPage(
+        child: FederationPage(
           key: args.key,
-          userId: args.userId,
           account: args.account,
+          host: args.host,
         ),
       );
     },
-    UserFollowerRoute.name: (routeData) {
-      final args = routeData.argsAs<UserFollowerRouteArgs>();
+    HashtagRoute.name: (routeData) {
+      final args = routeData.argsAs<HashtagRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: UserFollowerPage(
+        child: HashtagPage(
           key: args.key,
-          userId: args.userId,
+          hashtag: args.hashtag,
           account: args.account,
         ),
       );
     },
-    PhotoEditRoute.name: (routeData) {
-      final args = routeData.argsAs<PhotoEditRouteArgs>();
-      return AutoRoutePage<Uint8List?>(
+    LoginRoute.name: (routeData) {
+      return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: PhotoEditPage(
-          account: args.account,
-          file: args.file,
-          onSubmit: args.onSubmit,
-          key: args.key,
-        ),
+        child: const LoginPage(),
       );
     },
-    AnnouncementRoute.name: (routeData) {
-      final args = routeData.argsAs<AnnouncementRouteArgs>();
+    MisskeyRouteRoute.name: (routeData) {
+      final args = routeData.argsAs<MisskeyRouteRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: AnnouncementPage(
+        child: MisskeyPagePage(
           key: args.key,
           account: args.account,
+          page: args.page,
         ),
       );
     },
-    SplashRoute.name: (routeData) {
+    NotesAfterRenoteRoute.name: (routeData) {
+      final args = routeData.argsAs<NotesAfterRenoteRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: const SplashPage(),
+        child: NotesAfterRenotePage(
+          key: args.key,
+          note: args.note,
+          account: args.account,
+        ),
       );
     },
-    SeveralAccountGeneralSettingsRoute.name: (routeData) {
-      final args = routeData.argsAs<SeveralAccountGeneralSettingsRouteArgs>();
+    NoteCreateRoute.name: (routeData) {
+      final args = routeData.argsAs<NoteCreateRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: SeveralAccountGeneralSettingsPage(
+        child: NoteCreatePage(
           key: args.key,
-          account: args.account,
+          initialAccount: args.initialAccount,
+          initialText: args.initialText,
+          initialMediaFiles: args.initialMediaFiles,
+          channel: args.channel,
+          reply: args.reply,
+          renote: args.renote,
+          note: args.note,
+          noteCreationMode: args.noteCreationMode,
         ),
       );
     },
-    SeveralAccountSettingsRoute.name: (routeData) {
-      final args = routeData.argsAs<SeveralAccountSettingsRouteArgs>();
+    NoteDetailRoute.name: (routeData) {
+      final args = routeData.argsAs<NoteDetailRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: SeveralAccountSettingsPage(
+        child: NoteDetailPage(
           key: args.key,
+          note: args.note,
           account: args.account,
         ),
       );
     },
-    InstanceMuteRoute.name: (routeData) {
-      final args = routeData.argsAs<InstanceMuteRouteArgs>();
+    NotificationRoute.name: (routeData) {
+      final args = routeData.argsAs<NotificationRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: InstanceMutePage(
+        child: NotificationPage(
           key: args.key,
           account: args.account,
         ),
       );
     },
-    WordMuteRoute.name: (routeData) {
-      final args = routeData.argsAs<WordMuteRouteArgs>();
-      return AutoRoutePage<dynamic>(
+    PhotoEditRoute.name: (routeData) {
+      final args = routeData.argsAs<PhotoEditRouteArgs>();
+      return AutoRoutePage<Uint8List?>(
         routeData: routeData,
-        child: WordMutePage(
-          key: args.key,
+        child: PhotoEditPage(
           account: args.account,
-          muteType: args.muteType,
+          file: args.file,
+          onSubmit: args.onSubmit,
+          key: args.key,
         ),
       );
     },
-    CacheManagementRoute.name: (routeData) {
-      final args = routeData.argsAs<CacheManagementRouteArgs>();
+    SearchRoute.name: (routeData) {
+      final args = routeData.argsAs<SearchRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: CacheManagementPage(
+        child: SearchPage(
           key: args.key,
+          initialSearchText: args.initialSearchText,
           account: args.account,
         ),
       );
     },
-    ReactionDeckRoute.name: (routeData) {
-      final args = routeData.argsAs<ReactionDeckRouteArgs>();
+    AccountListRoute.name: (routeData) {
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: ReactionDeckPage(
-          key: args.key,
-          account: args.account,
-        ),
+        child: const AccountListPage(),
       );
     },
-    UsersListTimelineRoute.name: (routeData) {
-      final args = routeData.argsAs<UsersListTimelineRouteArgs>();
+    AppInfoRoute.name: (routeData) {
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: UsersListTimelinePage(
-          args.account,
-          args.list,
-          key: args.key,
-        ),
+        child: const AppInfoPage(),
       );
     },
-    UsersListRoute.name: (routeData) {
-      final args = routeData.argsAs<UsersListRouteArgs>();
+    GeneralSettingsRoute.name: (routeData) {
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: UsersListPage(
-          args.account,
+        child: const GeneralSettingsPage(),
+      );
+    },
+    ImportExportRoute.name: (routeData) {
+      return AutoRoutePage<dynamic>(
+        routeData: routeData,
+        child: const ImportExportPage(),
+      );
+    },
+    SettingsRoute.name: (routeData) {
+      return AutoRoutePage<dynamic>(
+        routeData: routeData,
+        child: const SettingsPage(),
+      );
+    },
+    TabSettingsListRoute.name: (routeData) {
+      return AutoRoutePage<dynamic>(
+        routeData: routeData,
+        child: const TabSettingsListPage(),
+      );
+    },
+    TabSettingsRoute.name: (routeData) {
+      final args = routeData.argsAs<TabSettingsRouteArgs>(
+          orElse: () => const TabSettingsRouteArgs());
+      return AutoRoutePage<dynamic>(
+        routeData: routeData,
+        child: TabSettingsPage(
           key: args.key,
+          tabIndex: args.tabIndex,
         ),
       );
     },
-    UsersListDetailRoute.name: (routeData) {
-      final args = routeData.argsAs<UsersListDetailRouteArgs>();
+    CacheManagementRoute.name: (routeData) {
+      final args = routeData.argsAs<CacheManagementRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: UsersListDetailPage(
+        child: CacheManagementPage(
           key: args.key,
           account: args.account,
-          listId: args.listId,
         ),
       );
     },
-    ChannelDetailRoute.name: (routeData) {
-      final args = routeData.argsAs<ChannelDetailRouteArgs>();
+    InstanceMuteRoute.name: (routeData) {
+      final args = routeData.argsAs<InstanceMuteRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: ChannelDetailPage(
+        child: InstanceMutePage(
           key: args.key,
           account: args.account,
-          channelId: args.channelId,
         ),
       );
     },
-    ChannelsRoute.name: (routeData) {
-      final args = routeData.argsAs<ChannelsRouteArgs>();
+    ReactionDeckRoute.name: (routeData) {
+      final args = routeData.argsAs<ReactionDeckRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: ChannelsPage(
+        child: ReactionDeckPage(
           key: args.key,
           account: args.account,
         ),
       );
     },
-    FederationRoute.name: (routeData) {
-      final args = routeData.argsAs<FederationRouteArgs>();
+    SeveralAccountGeneralSettingsRoute.name: (routeData) {
+      final args = routeData.argsAs<SeveralAccountGeneralSettingsRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: FederationPage(
+        child: SeveralAccountGeneralSettingsPage(
           key: args.key,
           account: args.account,
-          host: args.host,
         ),
       );
     },
-    NoteDetailRoute.name: (routeData) {
-      final args = routeData.argsAs<NoteDetailRouteArgs>();
+    SeveralAccountSettingsRoute.name: (routeData) {
+      final args = routeData.argsAs<SeveralAccountSettingsRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: NoteDetailPage(
+        child: SeveralAccountSettingsPage(
           key: args.key,
-          note: args.note,
           account: args.account,
         ),
       );
     },
-    SearchRoute.name: (routeData) {
-      final args = routeData.argsAs<SearchRouteArgs>();
+    WordMuteRoute.name: (routeData) {
+      final args = routeData.argsAs<WordMuteRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: SearchPage(
+        child: WordMutePage(
           key: args.key,
-          initialSearchText: args.initialSearchText,
           account: args.account,
+          muteType: args.muteType,
         ),
       );
     },
@@ -332,101 +350,83 @@ abstract class _$AppRouter extends RootStackRouter {
         ),
       );
     },
-    MisskeyRouteRoute.name: (routeData) {
-      final args = routeData.argsAs<MisskeyRouteRouteArgs>();
+    SplashRoute.name: (routeData) {
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: MisskeyPagePage(
-          key: args.key,
-          account: args.account,
-          page: args.page,
-        ),
-      );
-    },
-    ImportExportRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const ImportExportPage(),
-      );
-    },
-    GeneralSettingsRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const GeneralSettingsPage(),
+        child: const SplashPage(),
       );
     },
-    TabSettingsRoute.name: (routeData) {
-      final args = routeData.argsAs<TabSettingsRouteArgs>(
-          orElse: () => const TabSettingsRouteArgs());
+    TimeLineRoute.name: (routeData) {
+      final args = routeData.argsAs<TimeLineRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: TabSettingsPage(
+        child: TimeLinePage(
           key: args.key,
-          tabIndex: args.tabIndex,
+          initialTabSetting: args.initialTabSetting,
         ),
       );
     },
-    TabSettingsListRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const TabSettingsListPage(),
-      );
-    },
-    AppInfoRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const AppInfoPage(),
-      );
-    },
-    SettingsRoute.name: (routeData) {
+    UsersListDetailRoute.name: (routeData) {
+      final args = routeData.argsAs<UsersListDetailRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: const SettingsPage(),
+        child: UsersListDetailPage(
+          key: args.key,
+          account: args.account,
+          listId: args.listId,
+        ),
       );
     },
-    AccountListRoute.name: (routeData) {
+    UsersListRoute.name: (routeData) {
+      final args = routeData.argsAs<UsersListRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: const AccountListPage(),
+        child: UsersListPage(
+          args.account,
+          key: args.key,
+        ),
       );
     },
-    ExploreRoleUsersRoute.name: (routeData) {
-      final args = routeData.argsAs<ExploreRoleUsersRouteArgs>();
+    UsersListTimelineRoute.name: (routeData) {
+      final args = routeData.argsAs<UsersListTimelineRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: ExploreRoleUsersPage(
+        child: UsersListTimelinePage(
+          args.account,
+          args.list,
           key: args.key,
-          item: args.item,
-          account: args.account,
         ),
       );
     },
-    ExploreRoute.name: (routeData) {
-      final args = routeData.argsAs<ExploreRouteArgs>();
+    UserFolloweeRoute.name: (routeData) {
+      final args = routeData.argsAs<UserFolloweeRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: ExplorePage(
+        child: UserFolloweePage(
           key: args.key,
+          userId: args.userId,
           account: args.account,
         ),
       );
     },
-    TimeLineRoute.name: (routeData) {
-      final args = routeData.argsAs<TimeLineRouteArgs>();
+    UserFollowerRoute.name: (routeData) {
+      final args = routeData.argsAs<UserFollowerRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: TimeLinePage(
+        child: UserFollowerPage(
           key: args.key,
-          initialTabSetting: args.initialTabSetting,
+          userId: args.userId,
+          account: args.account,
         ),
       );
     },
-    FavoritedNoteRoute.name: (routeData) {
-      final args = routeData.argsAs<FavoritedNoteRouteArgs>();
+    UserRoute.name: (routeData) {
+      final args = routeData.argsAs<UserRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: FavoritedNotePage(
+        child: UserPage(
           key: args.key,
+          userId: args.userId,
           account: args.account,
         ),
       );
@@ -435,45 +435,83 @@ abstract class _$AppRouter extends RootStackRouter {
 }
 
 /// generated route for
-/// [NotesAfterRenotePage]
-class NotesAfterRenoteRoute extends PageRouteInfo<NotesAfterRenoteRouteArgs> {
-  NotesAfterRenoteRoute({
+/// [AnnouncementPage]
+class AnnouncementRoute extends PageRouteInfo<AnnouncementRouteArgs> {
+  AnnouncementRoute({
     Key? key,
-    required Note note,
     required Account account,
     List<PageRouteInfo>? children,
   }) : super(
-          NotesAfterRenoteRoute.name,
-          args: NotesAfterRenoteRouteArgs(
+          AnnouncementRoute.name,
+          args: AnnouncementRouteArgs(
             key: key,
-            note: note,
             account: account,
           ),
           initialChildren: children,
         );
 
-  static const String name = 'NotesAfterRenoteRoute';
+  static const String name = 'AnnouncementRoute';
 
-  static const PageInfo<NotesAfterRenoteRouteArgs> page =
-      PageInfo<NotesAfterRenoteRouteArgs>(name);
+  static const PageInfo<AnnouncementRouteArgs> page =
+      PageInfo<AnnouncementRouteArgs>(name);
 }
 
-class NotesAfterRenoteRouteArgs {
-  const NotesAfterRenoteRouteArgs({
+class AnnouncementRouteArgs {
+  const AnnouncementRouteArgs({
     this.key,
-    required this.note,
     required this.account,
   });
 
   final Key? key;
 
-  final Note note;
+  final Account account;
+
+  @override
+  String toString() {
+    return 'AnnouncementRouteArgs{key: $key, account: $account}';
+  }
+}
+
+/// generated route for
+/// [AntennaNotesPage]
+class AntennaNotesRoute extends PageRouteInfo<AntennaNotesRouteArgs> {
+  AntennaNotesRoute({
+    Key? key,
+    required Antenna antenna,
+    required Account account,
+    List<PageRouteInfo>? children,
+  }) : super(
+          AntennaNotesRoute.name,
+          args: AntennaNotesRouteArgs(
+            key: key,
+            antenna: antenna,
+            account: account,
+          ),
+          initialChildren: children,
+        );
+
+  static const String name = 'AntennaNotesRoute';
+
+  static const PageInfo<AntennaNotesRouteArgs> page =
+      PageInfo<AntennaNotesRouteArgs>(name);
+}
+
+class AntennaNotesRouteArgs {
+  const AntennaNotesRouteArgs({
+    this.key,
+    required this.antenna,
+    required this.account,
+  });
+
+  final Key? key;
+
+  final Antenna antenna;
 
   final Account account;
 
   @override
   String toString() {
-    return 'NotesAfterRenoteRouteArgs{key: $key, note: $note, account: $account}';
+    return 'AntennaNotesRouteArgs{key: $key, antenna: $antenna, account: $account}';
   }
 }
 
@@ -516,100 +554,86 @@ class AntennaRouteArgs {
 }
 
 /// generated route for
-/// [AntennaNotesPage]
-class AntennaNotesRoute extends PageRouteInfo<AntennaNotesRouteArgs> {
-  AntennaNotesRoute({
+/// [ChannelsPage]
+class ChannelsRoute extends PageRouteInfo<ChannelsRouteArgs> {
+  ChannelsRoute({
     Key? key,
-    required Antenna antenna,
     required Account account,
     List<PageRouteInfo>? children,
   }) : super(
-          AntennaNotesRoute.name,
-          args: AntennaNotesRouteArgs(
+          ChannelsRoute.name,
+          args: ChannelsRouteArgs(
             key: key,
-            antenna: antenna,
             account: account,
           ),
           initialChildren: children,
         );
 
-  static const String name = 'AntennaNotesRoute';
+  static const String name = 'ChannelsRoute';
 
-  static const PageInfo<AntennaNotesRouteArgs> page =
-      PageInfo<AntennaNotesRouteArgs>(name);
+  static const PageInfo<ChannelsRouteArgs> page =
+      PageInfo<ChannelsRouteArgs>(name);
 }
 
-class AntennaNotesRouteArgs {
-  const AntennaNotesRouteArgs({
+class ChannelsRouteArgs {
+  const ChannelsRouteArgs({
     this.key,
-    required this.antenna,
     required this.account,
   });
 
   final Key? key;
 
-  final Antenna antenna;
-
   final Account account;
 
   @override
   String toString() {
-    return 'AntennaNotesRouteArgs{key: $key, antenna: $antenna, account: $account}';
+    return 'ChannelsRouteArgs{key: $key, account: $account}';
   }
 }
 
 /// generated route for
-/// [NotificationPage]
-class NotificationRoute extends PageRouteInfo<NotificationRouteArgs> {
-  NotificationRoute({
+/// [ChannelDetailPage]
+class ChannelDetailRoute extends PageRouteInfo<ChannelDetailRouteArgs> {
+  ChannelDetailRoute({
     Key? key,
     required Account account,
+    required String channelId,
     List<PageRouteInfo>? children,
   }) : super(
-          NotificationRoute.name,
-          args: NotificationRouteArgs(
+          ChannelDetailRoute.name,
+          args: ChannelDetailRouteArgs(
             key: key,
             account: account,
+            channelId: channelId,
           ),
           initialChildren: children,
         );
 
-  static const String name = 'NotificationRoute';
+  static const String name = 'ChannelDetailRoute';
 
-  static const PageInfo<NotificationRouteArgs> page =
-      PageInfo<NotificationRouteArgs>(name);
+  static const PageInfo<ChannelDetailRouteArgs> page =
+      PageInfo<ChannelDetailRouteArgs>(name);
 }
 
-class NotificationRouteArgs {
-  const NotificationRouteArgs({
+class ChannelDetailRouteArgs {
+  const ChannelDetailRouteArgs({
     this.key,
     required this.account,
+    required this.channelId,
   });
 
   final Key? key;
 
   final Account account;
 
+  final String channelId;
+
   @override
   String toString() {
-    return 'NotificationRouteArgs{key: $key, account: $account}';
+    return 'ChannelDetailRouteArgs{key: $key, account: $account, channelId: $channelId}';
   }
 }
 
-/// generated route for
-/// [LoginPage]
-class LoginRoute extends PageRouteInfo<void> {
-  const LoginRoute({List<PageRouteInfo>? children})
-      : super(
-          LoginRoute.name,
-          initialChildren: children,
-        );
-
-  static const String name = 'LoginRoute';
-
-  static const PageInfo<void> page = PageInfo<void>(name);
-}
-
 /// generated route for
 /// [ClipDetailPage]
 class ClipDetailRoute extends PageRouteInfo<ClipDetailRouteArgs> {
@@ -692,451 +716,450 @@ class ClipListRouteArgs {
 }
 
 /// generated route for
-/// [NoteCreatePage]
-class NoteCreateRoute extends PageRouteInfo<NoteCreateRouteArgs> {
-  NoteCreateRoute({
+/// [ExplorePage]
+class ExploreRoute extends PageRouteInfo<ExploreRouteArgs> {
+  ExploreRoute({
     Key? key,
-    required Account initialAccount,
-    String? initialText,
-    List<String>? initialMediaFiles,
-    CommunityChannel? channel,
-    Note? reply,
-    Note? renote,
-    Note? note,
-    NoteCreationMode? noteCreationMode,
+    required Account account,
     List<PageRouteInfo>? children,
   }) : super(
-          NoteCreateRoute.name,
-          args: NoteCreateRouteArgs(
+          ExploreRoute.name,
+          args: ExploreRouteArgs(
             key: key,
-            initialAccount: initialAccount,
-            initialText: initialText,
-            initialMediaFiles: initialMediaFiles,
-            channel: channel,
-            reply: reply,
-            renote: renote,
-            note: note,
-            noteCreationMode: noteCreationMode,
+            account: account,
           ),
           initialChildren: children,
         );
 
-  static const String name = 'NoteCreateRoute';
+  static const String name = 'ExploreRoute';
 
-  static const PageInfo<NoteCreateRouteArgs> page =
-      PageInfo<NoteCreateRouteArgs>(name);
+  static const PageInfo<ExploreRouteArgs> page =
+      PageInfo<ExploreRouteArgs>(name);
 }
 
-class NoteCreateRouteArgs {
-  const NoteCreateRouteArgs({
+class ExploreRouteArgs {
+  const ExploreRouteArgs({
     this.key,
-    required this.initialAccount,
-    this.initialText,
-    this.initialMediaFiles,
-    this.channel,
-    this.reply,
-    this.renote,
-    this.note,
-    this.noteCreationMode,
+    required this.account,
   });
 
   final Key? key;
 
-  final Account initialAccount;
-
-  final String? initialText;
-
-  final List<String>? initialMediaFiles;
-
-  final CommunityChannel? channel;
-
-  final Note? reply;
-
-  final Note? renote;
-
-  final Note? note;
-
-  final NoteCreationMode? noteCreationMode;
+  final Account account;
 
   @override
   String toString() {
-    return 'NoteCreateRouteArgs{key: $key, initialAccount: $initialAccount, initialText: $initialText, initialMediaFiles: $initialMediaFiles, channel: $channel, reply: $reply, renote: $renote, note: $note, noteCreationMode: $noteCreationMode}';
+    return 'ExploreRouteArgs{key: $key, account: $account}';
   }
 }
 
 /// generated route for
-/// [HashtagPage]
-class HashtagRoute extends PageRouteInfo<HashtagRouteArgs> {
-  HashtagRoute({
+/// [ExploreRoleUsersPage]
+class ExploreRoleUsersRoute extends PageRouteInfo<ExploreRoleUsersRouteArgs> {
+  ExploreRoleUsersRoute({
     Key? key,
-    required String hashtag,
+    required RolesListResponse item,
     required Account account,
     List<PageRouteInfo>? children,
   }) : super(
-          HashtagRoute.name,
-          args: HashtagRouteArgs(
+          ExploreRoleUsersRoute.name,
+          args: ExploreRoleUsersRouteArgs(
             key: key,
-            hashtag: hashtag,
+            item: item,
             account: account,
           ),
           initialChildren: children,
         );
 
-  static const String name = 'HashtagRoute';
+  static const String name = 'ExploreRoleUsersRoute';
 
-  static const PageInfo<HashtagRouteArgs> page =
-      PageInfo<HashtagRouteArgs>(name);
+  static const PageInfo<ExploreRoleUsersRouteArgs> page =
+      PageInfo<ExploreRoleUsersRouteArgs>(name);
 }
 
-class HashtagRouteArgs {
-  const HashtagRouteArgs({
+class ExploreRoleUsersRouteArgs {
+  const ExploreRoleUsersRouteArgs({
     this.key,
-    required this.hashtag,
+    required this.item,
     required this.account,
   });
 
   final Key? key;
 
-  final String hashtag;
+  final RolesListResponse item;
 
   final Account account;
 
   @override
   String toString() {
-    return 'HashtagRouteArgs{key: $key, hashtag: $hashtag, account: $account}';
+    return 'ExploreRoleUsersRouteArgs{key: $key, item: $item, account: $account}';
   }
 }
 
 /// generated route for
-/// [UserFolloweePage]
-class UserFolloweeRoute extends PageRouteInfo<UserFolloweeRouteArgs> {
-  UserFolloweeRoute({
+/// [FavoritedNotePage]
+class FavoritedNoteRoute extends PageRouteInfo<FavoritedNoteRouteArgs> {
+  FavoritedNoteRoute({
     Key? key,
-    required String userId,
     required Account account,
     List<PageRouteInfo>? children,
   }) : super(
-          UserFolloweeRoute.name,
-          args: UserFolloweeRouteArgs(
+          FavoritedNoteRoute.name,
+          args: FavoritedNoteRouteArgs(
             key: key,
-            userId: userId,
             account: account,
           ),
           initialChildren: children,
         );
 
-  static const String name = 'UserFolloweeRoute';
+  static const String name = 'FavoritedNoteRoute';
 
-  static const PageInfo<UserFolloweeRouteArgs> page =
-      PageInfo<UserFolloweeRouteArgs>(name);
+  static const PageInfo<FavoritedNoteRouteArgs> page =
+      PageInfo<FavoritedNoteRouteArgs>(name);
 }
 
-class UserFolloweeRouteArgs {
-  const UserFolloweeRouteArgs({
+class FavoritedNoteRouteArgs {
+  const FavoritedNoteRouteArgs({
     this.key,
-    required this.userId,
     required this.account,
   });
 
   final Key? key;
 
-  final String userId;
-
   final Account account;
 
   @override
   String toString() {
-    return 'UserFolloweeRouteArgs{key: $key, userId: $userId, account: $account}';
+    return 'FavoritedNoteRouteArgs{key: $key, account: $account}';
   }
 }
 
 /// generated route for
-/// [UserPage]
-class UserRoute extends PageRouteInfo<UserRouteArgs> {
-  UserRoute({
+/// [FederationPage]
+class FederationRoute extends PageRouteInfo<FederationRouteArgs> {
+  FederationRoute({
     Key? key,
-    required String userId,
     required Account account,
+    required String host,
     List<PageRouteInfo>? children,
   }) : super(
-          UserRoute.name,
-          args: UserRouteArgs(
+          FederationRoute.name,
+          args: FederationRouteArgs(
             key: key,
-            userId: userId,
             account: account,
+            host: host,
           ),
           initialChildren: children,
         );
 
-  static const String name = 'UserRoute';
+  static const String name = 'FederationRoute';
 
-  static const PageInfo<UserRouteArgs> page = PageInfo<UserRouteArgs>(name);
+  static const PageInfo<FederationRouteArgs> page =
+      PageInfo<FederationRouteArgs>(name);
 }
 
-class UserRouteArgs {
-  const UserRouteArgs({
+class FederationRouteArgs {
+  const FederationRouteArgs({
     this.key,
-    required this.userId,
     required this.account,
+    required this.host,
   });
 
   final Key? key;
 
-  final String userId;
-
   final Account account;
 
+  final String host;
+
   @override
   String toString() {
-    return 'UserRouteArgs{key: $key, userId: $userId, account: $account}';
+    return 'FederationRouteArgs{key: $key, account: $account, host: $host}';
   }
 }
 
 /// generated route for
-/// [UserFollowerPage]
-class UserFollowerRoute extends PageRouteInfo<UserFollowerRouteArgs> {
-  UserFollowerRoute({
+/// [HashtagPage]
+class HashtagRoute extends PageRouteInfo<HashtagRouteArgs> {
+  HashtagRoute({
     Key? key,
-    required String userId,
+    required String hashtag,
     required Account account,
     List<PageRouteInfo>? children,
   }) : super(
-          UserFollowerRoute.name,
-          args: UserFollowerRouteArgs(
+          HashtagRoute.name,
+          args: HashtagRouteArgs(
             key: key,
-            userId: userId,
+            hashtag: hashtag,
             account: account,
           ),
           initialChildren: children,
         );
 
-  static const String name = 'UserFollowerRoute';
+  static const String name = 'HashtagRoute';
 
-  static const PageInfo<UserFollowerRouteArgs> page =
-      PageInfo<UserFollowerRouteArgs>(name);
+  static const PageInfo<HashtagRouteArgs> page =
+      PageInfo<HashtagRouteArgs>(name);
 }
 
-class UserFollowerRouteArgs {
-  const UserFollowerRouteArgs({
+class HashtagRouteArgs {
+  const HashtagRouteArgs({
     this.key,
-    required this.userId,
+    required this.hashtag,
     required this.account,
   });
 
   final Key? key;
 
-  final String userId;
+  final String hashtag;
 
   final Account account;
 
   @override
   String toString() {
-    return 'UserFollowerRouteArgs{key: $key, userId: $userId, account: $account}';
+    return 'HashtagRouteArgs{key: $key, hashtag: $hashtag, account: $account}';
   }
 }
 
 /// generated route for
-/// [PhotoEditPage]
-class PhotoEditRoute extends PageRouteInfo<PhotoEditRouteArgs> {
-  PhotoEditRoute({
-    required Account account,
-    required MisskeyPostFile file,
-    required void Function(Uint8List) onSubmit,
+/// [LoginPage]
+class LoginRoute extends PageRouteInfo<void> {
+  const LoginRoute({List<PageRouteInfo>? children})
+      : super(
+          LoginRoute.name,
+          initialChildren: children,
+        );
+
+  static const String name = 'LoginRoute';
+
+  static const PageInfo<void> page = PageInfo<void>(name);
+}
+
+/// generated route for
+/// [MisskeyPagePage]
+class MisskeyRouteRoute extends PageRouteInfo<MisskeyRouteRouteArgs> {
+  MisskeyRouteRoute({
     Key? key,
+    required Account account,
+    required Page page,
     List<PageRouteInfo>? children,
   }) : super(
-          PhotoEditRoute.name,
-          args: PhotoEditRouteArgs(
-            account: account,
-            file: file,
-            onSubmit: onSubmit,
+          MisskeyRouteRoute.name,
+          args: MisskeyRouteRouteArgs(
             key: key,
+            account: account,
+            page: page,
           ),
           initialChildren: children,
         );
 
-  static const String name = 'PhotoEditRoute';
+  static const String name = 'MisskeyRouteRoute';
 
-  static const PageInfo<PhotoEditRouteArgs> page =
-      PageInfo<PhotoEditRouteArgs>(name);
+  static const PageInfo<MisskeyRouteRouteArgs> page =
+      PageInfo<MisskeyRouteRouteArgs>(name);
 }
 
-class PhotoEditRouteArgs {
-  const PhotoEditRouteArgs({
-    required this.account,
-    required this.file,
-    required this.onSubmit,
+class MisskeyRouteRouteArgs {
+  const MisskeyRouteRouteArgs({
     this.key,
+    required this.account,
+    required this.page,
   });
 
-  final Account account;
-
-  final MisskeyPostFile file;
+  final Key? key;
 
-  final void Function(Uint8List) onSubmit;
+  final Account account;
 
-  final Key? key;
+  final Page page;
 
   @override
   String toString() {
-    return 'PhotoEditRouteArgs{account: $account, file: $file, onSubmit: $onSubmit, key: $key}';
+    return 'MisskeyRouteRouteArgs{key: $key, account: $account, page: $page}';
   }
 }
 
 /// generated route for
-/// [AnnouncementPage]
-class AnnouncementRoute extends PageRouteInfo<AnnouncementRouteArgs> {
-  AnnouncementRoute({
+/// [NotesAfterRenotePage]
+class NotesAfterRenoteRoute extends PageRouteInfo<NotesAfterRenoteRouteArgs> {
+  NotesAfterRenoteRoute({
     Key? key,
+    required Note note,
     required Account account,
     List<PageRouteInfo>? children,
   }) : super(
-          AnnouncementRoute.name,
-          args: AnnouncementRouteArgs(
+          NotesAfterRenoteRoute.name,
+          args: NotesAfterRenoteRouteArgs(
             key: key,
+            note: note,
             account: account,
           ),
           initialChildren: children,
         );
 
-  static const String name = 'AnnouncementRoute';
+  static const String name = 'NotesAfterRenoteRoute';
 
-  static const PageInfo<AnnouncementRouteArgs> page =
-      PageInfo<AnnouncementRouteArgs>(name);
+  static const PageInfo<NotesAfterRenoteRouteArgs> page =
+      PageInfo<NotesAfterRenoteRouteArgs>(name);
 }
 
-class AnnouncementRouteArgs {
-  const AnnouncementRouteArgs({
+class NotesAfterRenoteRouteArgs {
+  const NotesAfterRenoteRouteArgs({
     this.key,
+    required this.note,
     required this.account,
   });
 
   final Key? key;
 
+  final Note note;
+
   final Account account;
 
   @override
   String toString() {
-    return 'AnnouncementRouteArgs{key: $key, account: $account}';
+    return 'NotesAfterRenoteRouteArgs{key: $key, note: $note, account: $account}';
   }
 }
 
 /// generated route for
-/// [SplashPage]
-class SplashRoute extends PageRouteInfo<void> {
-  const SplashRoute({List<PageRouteInfo>? children})
-      : super(
-          SplashRoute.name,
-          initialChildren: children,
-        );
-
-  static const String name = 'SplashRoute';
-
-  static const PageInfo<void> page = PageInfo<void>(name);
-}
-
-/// generated route for
-/// [SeveralAccountGeneralSettingsPage]
-class SeveralAccountGeneralSettingsRoute
-    extends PageRouteInfo<SeveralAccountGeneralSettingsRouteArgs> {
-  SeveralAccountGeneralSettingsRoute({
-    Key? key,
-    required Account account,
+/// [NoteCreatePage]
+class NoteCreateRoute extends PageRouteInfo<NoteCreateRouteArgs> {
+  NoteCreateRoute({
+    Key? key,
+    required Account initialAccount,
+    String? initialText,
+    List<String>? initialMediaFiles,
+    CommunityChannel? channel,
+    Note? reply,
+    Note? renote,
+    Note? note,
+    NoteCreationMode? noteCreationMode,
     List<PageRouteInfo>? children,
   }) : super(
-          SeveralAccountGeneralSettingsRoute.name,
-          args: SeveralAccountGeneralSettingsRouteArgs(
+          NoteCreateRoute.name,
+          args: NoteCreateRouteArgs(
             key: key,
-            account: account,
+            initialAccount: initialAccount,
+            initialText: initialText,
+            initialMediaFiles: initialMediaFiles,
+            channel: channel,
+            reply: reply,
+            renote: renote,
+            note: note,
+            noteCreationMode: noteCreationMode,
           ),
           initialChildren: children,
         );
 
-  static const String name = 'SeveralAccountGeneralSettingsRoute';
+  static const String name = 'NoteCreateRoute';
 
-  static const PageInfo<SeveralAccountGeneralSettingsRouteArgs> page =
-      PageInfo<SeveralAccountGeneralSettingsRouteArgs>(name);
+  static const PageInfo<NoteCreateRouteArgs> page =
+      PageInfo<NoteCreateRouteArgs>(name);
 }
 
-class SeveralAccountGeneralSettingsRouteArgs {
-  const SeveralAccountGeneralSettingsRouteArgs({
+class NoteCreateRouteArgs {
+  const NoteCreateRouteArgs({
     this.key,
-    required this.account,
+    required this.initialAccount,
+    this.initialText,
+    this.initialMediaFiles,
+    this.channel,
+    this.reply,
+    this.renote,
+    this.note,
+    this.noteCreationMode,
   });
 
   final Key? key;
 
-  final Account account;
+  final Account initialAccount;
+
+  final String? initialText;
+
+  final List<String>? initialMediaFiles;
+
+  final CommunityChannel? channel;
+
+  final Note? reply;
+
+  final Note? renote;
+
+  final Note? note;
+
+  final NoteCreationMode? noteCreationMode;
 
   @override
   String toString() {
-    return 'SeveralAccountGeneralSettingsRouteArgs{key: $key, account: $account}';
+    return 'NoteCreateRouteArgs{key: $key, initialAccount: $initialAccount, initialText: $initialText, initialMediaFiles: $initialMediaFiles, channel: $channel, reply: $reply, renote: $renote, note: $note, noteCreationMode: $noteCreationMode}';
   }
 }
 
 /// generated route for
-/// [SeveralAccountSettingsPage]
-class SeveralAccountSettingsRoute
-    extends PageRouteInfo<SeveralAccountSettingsRouteArgs> {
-  SeveralAccountSettingsRoute({
+/// [NoteDetailPage]
+class NoteDetailRoute extends PageRouteInfo<NoteDetailRouteArgs> {
+  NoteDetailRoute({
     Key? key,
+    required Note note,
     required Account account,
     List<PageRouteInfo>? children,
   }) : super(
-          SeveralAccountSettingsRoute.name,
-          args: SeveralAccountSettingsRouteArgs(
+          NoteDetailRoute.name,
+          args: NoteDetailRouteArgs(
             key: key,
+            note: note,
             account: account,
           ),
           initialChildren: children,
         );
 
-  static const String name = 'SeveralAccountSettingsRoute';
+  static const String name = 'NoteDetailRoute';
 
-  static const PageInfo<SeveralAccountSettingsRouteArgs> page =
-      PageInfo<SeveralAccountSettingsRouteArgs>(name);
+  static const PageInfo<NoteDetailRouteArgs> page =
+      PageInfo<NoteDetailRouteArgs>(name);
 }
 
-class SeveralAccountSettingsRouteArgs {
-  const SeveralAccountSettingsRouteArgs({
+class NoteDetailRouteArgs {
+  const NoteDetailRouteArgs({
     this.key,
+    required this.note,
     required this.account,
   });
 
   final Key? key;
 
+  final Note note;
+
   final Account account;
 
   @override
   String toString() {
-    return 'SeveralAccountSettingsRouteArgs{key: $key, account: $account}';
+    return 'NoteDetailRouteArgs{key: $key, note: $note, account: $account}';
   }
 }
 
 /// generated route for
-/// [InstanceMutePage]
-class InstanceMuteRoute extends PageRouteInfo<InstanceMuteRouteArgs> {
-  InstanceMuteRoute({
+/// [NotificationPage]
+class NotificationRoute extends PageRouteInfo<NotificationRouteArgs> {
+  NotificationRoute({
     Key? key,
     required Account account,
     List<PageRouteInfo>? children,
   }) : super(
-          InstanceMuteRoute.name,
-          args: InstanceMuteRouteArgs(
+          NotificationRoute.name,
+          args: NotificationRouteArgs(
             key: key,
             account: account,
           ),
           initialChildren: children,
         );
 
-  static const String name = 'InstanceMuteRoute';
+  static const String name = 'NotificationRoute';
 
-  static const PageInfo<InstanceMuteRouteArgs> page =
-      PageInfo<InstanceMuteRouteArgs>(name);
+  static const PageInfo<NotificationRouteArgs> page =
+      PageInfo<NotificationRouteArgs>(name);
 }
 
-class InstanceMuteRouteArgs {
-  const InstanceMuteRouteArgs({
+class NotificationRouteArgs {
+  const NotificationRouteArgs({
     this.key,
     required this.account,
   });
@@ -1147,320 +1170,322 @@ class InstanceMuteRouteArgs {
 
   @override
   String toString() {
-    return 'InstanceMuteRouteArgs{key: $key, account: $account}';
+    return 'NotificationRouteArgs{key: $key, account: $account}';
   }
 }
 
 /// generated route for
-/// [WordMutePage]
-class WordMuteRoute extends PageRouteInfo<WordMuteRouteArgs> {
-  WordMuteRoute({
-    Key? key,
+/// [PhotoEditPage]
+class PhotoEditRoute extends PageRouteInfo<PhotoEditRouteArgs> {
+  PhotoEditRoute({
     required Account account,
-    required MuteType muteType,
+    required MisskeyPostFile file,
+    required void Function(Uint8List) onSubmit,
+    Key? key,
     List<PageRouteInfo>? children,
   }) : super(
-          WordMuteRoute.name,
-          args: WordMuteRouteArgs(
-            key: key,
+          PhotoEditRoute.name,
+          args: PhotoEditRouteArgs(
             account: account,
-            muteType: muteType,
+            file: file,
+            onSubmit: onSubmit,
+            key: key,
           ),
           initialChildren: children,
         );
 
-  static const String name = 'WordMuteRoute';
+  static const String name = 'PhotoEditRoute';
 
-  static const PageInfo<WordMuteRouteArgs> page =
-      PageInfo<WordMuteRouteArgs>(name);
+  static const PageInfo<PhotoEditRouteArgs> page =
+      PageInfo<PhotoEditRouteArgs>(name);
 }
 
-class WordMuteRouteArgs {
-  const WordMuteRouteArgs({
-    this.key,
+class PhotoEditRouteArgs {
+  const PhotoEditRouteArgs({
     required this.account,
-    required this.muteType,
+    required this.file,
+    required this.onSubmit,
+    this.key,
   });
 
-  final Key? key;
-
   final Account account;
 
-  final MuteType muteType;
+  final MisskeyPostFile file;
+
+  final void Function(Uint8List) onSubmit;
+
+  final Key? key;
 
   @override
   String toString() {
-    return 'WordMuteRouteArgs{key: $key, account: $account, muteType: $muteType}';
+    return 'PhotoEditRouteArgs{account: $account, file: $file, onSubmit: $onSubmit, key: $key}';
   }
 }
 
 /// generated route for
-/// [CacheManagementPage]
-class CacheManagementRoute extends PageRouteInfo<CacheManagementRouteArgs> {
-  CacheManagementRoute({
+/// [SearchPage]
+class SearchRoute extends PageRouteInfo<SearchRouteArgs> {
+  SearchRoute({
     Key? key,
+    String? initialSearchText,
     required Account account,
     List<PageRouteInfo>? children,
   }) : super(
-          CacheManagementRoute.name,
-          args: CacheManagementRouteArgs(
+          SearchRoute.name,
+          args: SearchRouteArgs(
             key: key,
+            initialSearchText: initialSearchText,
             account: account,
           ),
           initialChildren: children,
         );
 
-  static const String name = 'CacheManagementRoute';
+  static const String name = 'SearchRoute';
 
-  static const PageInfo<CacheManagementRouteArgs> page =
-      PageInfo<CacheManagementRouteArgs>(name);
+  static const PageInfo<SearchRouteArgs> page = PageInfo<SearchRouteArgs>(name);
 }
 
-class CacheManagementRouteArgs {
-  const CacheManagementRouteArgs({
+class SearchRouteArgs {
+  const SearchRouteArgs({
     this.key,
+    this.initialSearchText,
     required this.account,
   });
 
   final Key? key;
 
+  final String? initialSearchText;
+
   final Account account;
 
   @override
   String toString() {
-    return 'CacheManagementRouteArgs{key: $key, account: $account}';
+    return 'SearchRouteArgs{key: $key, initialSearchText: $initialSearchText, account: $account}';
   }
 }
 
 /// generated route for
-/// [ReactionDeckPage]
-class ReactionDeckRoute extends PageRouteInfo<ReactionDeckRouteArgs> {
-  ReactionDeckRoute({
-    Key? key,
-    required Account account,
-    List<PageRouteInfo>? children,
-  }) : super(
-          ReactionDeckRoute.name,
-          args: ReactionDeckRouteArgs(
-            key: key,
-            account: account,
-          ),
+/// [AccountListPage]
+class AccountListRoute extends PageRouteInfo<void> {
+  const AccountListRoute({List<PageRouteInfo>? children})
+      : super(
+          AccountListRoute.name,
           initialChildren: children,
         );
 
-  static const String name = 'ReactionDeckRoute';
+  static const String name = 'AccountListRoute';
 
-  static const PageInfo<ReactionDeckRouteArgs> page =
-      PageInfo<ReactionDeckRouteArgs>(name);
+  static const PageInfo<void> page = PageInfo<void>(name);
 }
 
-class ReactionDeckRouteArgs {
-  const ReactionDeckRouteArgs({
-    this.key,
-    required this.account,
-  });
-
-  final Key? key;
+/// generated route for
+/// [AppInfoPage]
+class AppInfoRoute extends PageRouteInfo<void> {
+  const AppInfoRoute({List<PageRouteInfo>? children})
+      : super(
+          AppInfoRoute.name,
+          initialChildren: children,
+        );
 
-  final Account account;
+  static const String name = 'AppInfoRoute';
 
-  @override
-  String toString() {
-    return 'ReactionDeckRouteArgs{key: $key, account: $account}';
-  }
+  static const PageInfo<void> page = PageInfo<void>(name);
 }
 
 /// generated route for
-/// [UsersListTimelinePage]
-class UsersListTimelineRoute extends PageRouteInfo<UsersListTimelineRouteArgs> {
-  UsersListTimelineRoute({
-    required Account account,
-    required UsersList list,
-    Key? key,
-    List<PageRouteInfo>? children,
-  }) : super(
-          UsersListTimelineRoute.name,
-          args: UsersListTimelineRouteArgs(
-            account: account,
-            list: list,
-            key: key,
-          ),
+/// [GeneralSettingsPage]
+class GeneralSettingsRoute extends PageRouteInfo<void> {
+  const GeneralSettingsRoute({List<PageRouteInfo>? children})
+      : super(
+          GeneralSettingsRoute.name,
           initialChildren: children,
         );
 
-  static const String name = 'UsersListTimelineRoute';
+  static const String name = 'GeneralSettingsRoute';
 
-  static const PageInfo<UsersListTimelineRouteArgs> page =
-      PageInfo<UsersListTimelineRouteArgs>(name);
+  static const PageInfo<void> page = PageInfo<void>(name);
 }
 
-class UsersListTimelineRouteArgs {
-  const UsersListTimelineRouteArgs({
-    required this.account,
-    required this.list,
-    this.key,
-  });
+/// generated route for
+/// [ImportExportPage]
+class ImportExportRoute extends PageRouteInfo<void> {
+  const ImportExportRoute({List<PageRouteInfo>? children})
+      : super(
+          ImportExportRoute.name,
+          initialChildren: children,
+        );
 
-  final Account account;
+  static const String name = 'ImportExportRoute';
 
-  final UsersList list;
+  static const PageInfo<void> page = PageInfo<void>(name);
+}
 
-  final Key? key;
+/// generated route for
+/// [SettingsPage]
+class SettingsRoute extends PageRouteInfo<void> {
+  const SettingsRoute({List<PageRouteInfo>? children})
+      : super(
+          SettingsRoute.name,
+          initialChildren: children,
+        );
 
-  @override
-  String toString() {
-    return 'UsersListTimelineRouteArgs{account: $account, list: $list, key: $key}';
-  }
+  static const String name = 'SettingsRoute';
+
+  static const PageInfo<void> page = PageInfo<void>(name);
 }
 
 /// generated route for
-/// [UsersListPage]
-class UsersListRoute extends PageRouteInfo<UsersListRouteArgs> {
-  UsersListRoute({
-    required Account account,
+/// [TabSettingsListPage]
+class TabSettingsListRoute extends PageRouteInfo<void> {
+  const TabSettingsListRoute({List<PageRouteInfo>? children})
+      : super(
+          TabSettingsListRoute.name,
+          initialChildren: children,
+        );
+
+  static const String name = 'TabSettingsListRoute';
+
+  static const PageInfo<void> page = PageInfo<void>(name);
+}
+
+/// generated route for
+/// [TabSettingsPage]
+class TabSettingsRoute extends PageRouteInfo<TabSettingsRouteArgs> {
+  TabSettingsRoute({
     Key? key,
+    int? tabIndex,
     List<PageRouteInfo>? children,
   }) : super(
-          UsersListRoute.name,
-          args: UsersListRouteArgs(
-            account: account,
+          TabSettingsRoute.name,
+          args: TabSettingsRouteArgs(
             key: key,
+            tabIndex: tabIndex,
           ),
           initialChildren: children,
         );
 
-  static const String name = 'UsersListRoute';
+  static const String name = 'TabSettingsRoute';
 
-  static const PageInfo<UsersListRouteArgs> page =
-      PageInfo<UsersListRouteArgs>(name);
+  static const PageInfo<TabSettingsRouteArgs> page =
+      PageInfo<TabSettingsRouteArgs>(name);
 }
 
-class UsersListRouteArgs {
-  const UsersListRouteArgs({
-    required this.account,
+class TabSettingsRouteArgs {
+  const TabSettingsRouteArgs({
     this.key,
+    this.tabIndex,
   });
 
-  final Account account;
-
   final Key? key;
 
+  final int? tabIndex;
+
   @override
   String toString() {
-    return 'UsersListRouteArgs{account: $account, key: $key}';
+    return 'TabSettingsRouteArgs{key: $key, tabIndex: $tabIndex}';
   }
 }
 
 /// generated route for
-/// [UsersListDetailPage]
-class UsersListDetailRoute extends PageRouteInfo<UsersListDetailRouteArgs> {
-  UsersListDetailRoute({
+/// [CacheManagementPage]
+class CacheManagementRoute extends PageRouteInfo<CacheManagementRouteArgs> {
+  CacheManagementRoute({
     Key? key,
     required Account account,
-    required String listId,
     List<PageRouteInfo>? children,
   }) : super(
-          UsersListDetailRoute.name,
-          args: UsersListDetailRouteArgs(
+          CacheManagementRoute.name,
+          args: CacheManagementRouteArgs(
             key: key,
             account: account,
-            listId: listId,
           ),
           initialChildren: children,
         );
 
-  static const String name = 'UsersListDetailRoute';
+  static const String name = 'CacheManagementRoute';
 
-  static const PageInfo<UsersListDetailRouteArgs> page =
-      PageInfo<UsersListDetailRouteArgs>(name);
+  static const PageInfo<CacheManagementRouteArgs> page =
+      PageInfo<CacheManagementRouteArgs>(name);
 }
 
-class UsersListDetailRouteArgs {
-  const UsersListDetailRouteArgs({
+class CacheManagementRouteArgs {
+  const CacheManagementRouteArgs({
     this.key,
     required this.account,
-    required this.listId,
   });
 
   final Key? key;
 
   final Account account;
 
-  final String listId;
-
   @override
   String toString() {
-    return 'UsersListDetailRouteArgs{key: $key, account: $account, listId: $listId}';
+    return 'CacheManagementRouteArgs{key: $key, account: $account}';
   }
 }
 
 /// generated route for
-/// [ChannelDetailPage]
-class ChannelDetailRoute extends PageRouteInfo<ChannelDetailRouteArgs> {
-  ChannelDetailRoute({
+/// [InstanceMutePage]
+class InstanceMuteRoute extends PageRouteInfo<InstanceMuteRouteArgs> {
+  InstanceMuteRoute({
     Key? key,
     required Account account,
-    required String channelId,
     List<PageRouteInfo>? children,
   }) : super(
-          ChannelDetailRoute.name,
-          args: ChannelDetailRouteArgs(
+          InstanceMuteRoute.name,
+          args: InstanceMuteRouteArgs(
             key: key,
             account: account,
-            channelId: channelId,
           ),
           initialChildren: children,
         );
 
-  static const String name = 'ChannelDetailRoute';
+  static const String name = 'InstanceMuteRoute';
 
-  static const PageInfo<ChannelDetailRouteArgs> page =
-      PageInfo<ChannelDetailRouteArgs>(name);
+  static const PageInfo<InstanceMuteRouteArgs> page =
+      PageInfo<InstanceMuteRouteArgs>(name);
 }
 
-class ChannelDetailRouteArgs {
-  const ChannelDetailRouteArgs({
+class InstanceMuteRouteArgs {
+  const InstanceMuteRouteArgs({
     this.key,
     required this.account,
-    required this.channelId,
   });
 
   final Key? key;
 
   final Account account;
 
-  final String channelId;
-
   @override
   String toString() {
-    return 'ChannelDetailRouteArgs{key: $key, account: $account, channelId: $channelId}';
+    return 'InstanceMuteRouteArgs{key: $key, account: $account}';
   }
 }
 
 /// generated route for
-/// [ChannelsPage]
-class ChannelsRoute extends PageRouteInfo<ChannelsRouteArgs> {
-  ChannelsRoute({
+/// [ReactionDeckPage]
+class ReactionDeckRoute extends PageRouteInfo<ReactionDeckRouteArgs> {
+  ReactionDeckRoute({
     Key? key,
     required Account account,
     List<PageRouteInfo>? children,
   }) : super(
-          ChannelsRoute.name,
-          args: ChannelsRouteArgs(
+          ReactionDeckRoute.name,
+          args: ReactionDeckRouteArgs(
             key: key,
             account: account,
           ),
           initialChildren: children,
         );
 
-  static const String name = 'ChannelsRoute';
+  static const String name = 'ReactionDeckRoute';
 
-  static const PageInfo<ChannelsRouteArgs> page =
-      PageInfo<ChannelsRouteArgs>(name);
+  static const PageInfo<ReactionDeckRouteArgs> page =
+      PageInfo<ReactionDeckRouteArgs>(name);
 }
 
-class ChannelsRouteArgs {
-  const ChannelsRouteArgs({
+class ReactionDeckRouteArgs {
+  const ReactionDeckRouteArgs({
     this.key,
     required this.account,
   });
@@ -1471,135 +1496,128 @@ class ChannelsRouteArgs {
 
   @override
   String toString() {
-    return 'ChannelsRouteArgs{key: $key, account: $account}';
+    return 'ReactionDeckRouteArgs{key: $key, account: $account}';
   }
 }
 
 /// generated route for
-/// [FederationPage]
-class FederationRoute extends PageRouteInfo<FederationRouteArgs> {
-  FederationRoute({
+/// [SeveralAccountGeneralSettingsPage]
+class SeveralAccountGeneralSettingsRoute
+    extends PageRouteInfo<SeveralAccountGeneralSettingsRouteArgs> {
+  SeveralAccountGeneralSettingsRoute({
     Key? key,
     required Account account,
-    required String host,
     List<PageRouteInfo>? children,
   }) : super(
-          FederationRoute.name,
-          args: FederationRouteArgs(
+          SeveralAccountGeneralSettingsRoute.name,
+          args: SeveralAccountGeneralSettingsRouteArgs(
             key: key,
             account: account,
-            host: host,
           ),
           initialChildren: children,
         );
 
-  static const String name = 'FederationRoute';
+  static const String name = 'SeveralAccountGeneralSettingsRoute';
 
-  static const PageInfo<FederationRouteArgs> page =
-      PageInfo<FederationRouteArgs>(name);
+  static const PageInfo<SeveralAccountGeneralSettingsRouteArgs> page =
+      PageInfo<SeveralAccountGeneralSettingsRouteArgs>(name);
 }
 
-class FederationRouteArgs {
-  const FederationRouteArgs({
+class SeveralAccountGeneralSettingsRouteArgs {
+  const SeveralAccountGeneralSettingsRouteArgs({
     this.key,
     required this.account,
-    required this.host,
   });
 
   final Key? key;
 
   final Account account;
 
-  final String host;
-
   @override
   String toString() {
-    return 'FederationRouteArgs{key: $key, account: $account, host: $host}';
+    return 'SeveralAccountGeneralSettingsRouteArgs{key: $key, account: $account}';
   }
 }
 
 /// generated route for
-/// [NoteDetailPage]
-class NoteDetailRoute extends PageRouteInfo<NoteDetailRouteArgs> {
-  NoteDetailRoute({
+/// [SeveralAccountSettingsPage]
+class SeveralAccountSettingsRoute
+    extends PageRouteInfo<SeveralAccountSettingsRouteArgs> {
+  SeveralAccountSettingsRoute({
     Key? key,
-    required Note note,
     required Account account,
     List<PageRouteInfo>? children,
   }) : super(
-          NoteDetailRoute.name,
-          args: NoteDetailRouteArgs(
+          SeveralAccountSettingsRoute.name,
+          args: SeveralAccountSettingsRouteArgs(
             key: key,
-            note: note,
             account: account,
           ),
           initialChildren: children,
         );
 
-  static const String name = 'NoteDetailRoute';
+  static const String name = 'SeveralAccountSettingsRoute';
 
-  static const PageInfo<NoteDetailRouteArgs> page =
-      PageInfo<NoteDetailRouteArgs>(name);
+  static const PageInfo<SeveralAccountSettingsRouteArgs> page =
+      PageInfo<SeveralAccountSettingsRouteArgs>(name);
 }
 
-class NoteDetailRouteArgs {
-  const NoteDetailRouteArgs({
+class SeveralAccountSettingsRouteArgs {
+  const SeveralAccountSettingsRouteArgs({
     this.key,
-    required this.note,
     required this.account,
   });
 
   final Key? key;
 
-  final Note note;
-
   final Account account;
 
   @override
   String toString() {
-    return 'NoteDetailRouteArgs{key: $key, note: $note, account: $account}';
+    return 'SeveralAccountSettingsRouteArgs{key: $key, account: $account}';
   }
 }
 
 /// generated route for
-/// [SearchPage]
-class SearchRoute extends PageRouteInfo<SearchRouteArgs> {
-  SearchRoute({
+/// [WordMutePage]
+class WordMuteRoute extends PageRouteInfo<WordMuteRouteArgs> {
+  WordMuteRoute({
     Key? key,
-    String? initialSearchText,
     required Account account,
+    required MuteType muteType,
     List<PageRouteInfo>? children,
   }) : super(
-          SearchRoute.name,
-          args: SearchRouteArgs(
+          WordMuteRoute.name,
+          args: WordMuteRouteArgs(
             key: key,
-            initialSearchText: initialSearchText,
             account: account,
+            muteType: muteType,
           ),
           initialChildren: children,
         );
 
-  static const String name = 'SearchRoute';
+  static const String name = 'WordMuteRoute';
 
-  static const PageInfo<SearchRouteArgs> page = PageInfo<SearchRouteArgs>(name);
+  static const PageInfo<WordMuteRouteArgs> page =
+      PageInfo<WordMuteRouteArgs>(name);
 }
 
-class SearchRouteArgs {
-  const SearchRouteArgs({
+class WordMuteRouteArgs {
+  const WordMuteRouteArgs({
     this.key,
-    this.initialSearchText,
     required this.account,
+    required this.muteType,
   });
 
   final Key? key;
 
-  final String? initialSearchText;
-
   final Account account;
 
+  final MuteType muteType;
+
   @override
   String toString() {
-    return 'SearchRouteArgs{key: $key, initialSearchText: $initialSearchText, account: $account}';
+    return 'WordMuteRouteArgs{key: $key, account: $account, muteType: $muteType}';
   }
 }
 
@@ -1648,323 +1666,305 @@ class SharingAccountSelectRouteArgs {
 }
 
 /// generated route for
-/// [MisskeyPagePage]
-class MisskeyRouteRoute extends PageRouteInfo<MisskeyRouteRouteArgs> {
-  MisskeyRouteRoute({
-    Key? key,
-    required Account account,
-    required Page page,
-    List<PageRouteInfo>? children,
-  }) : super(
-          MisskeyRouteRoute.name,
-          args: MisskeyRouteRouteArgs(
-            key: key,
-            account: account,
-            page: page,
-          ),
-          initialChildren: children,
-        );
-
-  static const String name = 'MisskeyRouteRoute';
-
-  static const PageInfo<MisskeyRouteRouteArgs> page =
-      PageInfo<MisskeyRouteRouteArgs>(name);
-}
-
-class MisskeyRouteRouteArgs {
-  const MisskeyRouteRouteArgs({
-    this.key,
-    required this.account,
-    required this.page,
-  });
-
-  final Key? key;
-
-  final Account account;
-
-  final Page page;
-
-  @override
-  String toString() {
-    return 'MisskeyRouteRouteArgs{key: $key, account: $account, page: $page}';
-  }
-}
-
-/// generated route for
-/// [ImportExportPage]
-class ImportExportRoute extends PageRouteInfo<void> {
-  const ImportExportRoute({List<PageRouteInfo>? children})
-      : super(
-          ImportExportRoute.name,
-          initialChildren: children,
-        );
-
-  static const String name = 'ImportExportRoute';
-
-  static const PageInfo<void> page = PageInfo<void>(name);
-}
-
-/// generated route for
-/// [GeneralSettingsPage]
-class GeneralSettingsRoute extends PageRouteInfo<void> {
-  const GeneralSettingsRoute({List<PageRouteInfo>? children})
+/// [SplashPage]
+class SplashRoute extends PageRouteInfo<void> {
+  const SplashRoute({List<PageRouteInfo>? children})
       : super(
-          GeneralSettingsRoute.name,
+          SplashRoute.name,
           initialChildren: children,
         );
 
-  static const String name = 'GeneralSettingsRoute';
+  static const String name = 'SplashRoute';
 
   static const PageInfo<void> page = PageInfo<void>(name);
 }
 
 /// generated route for
-/// [TabSettingsPage]
-class TabSettingsRoute extends PageRouteInfo<TabSettingsRouteArgs> {
-  TabSettingsRoute({
+/// [TimeLinePage]
+class TimeLineRoute extends PageRouteInfo<TimeLineRouteArgs> {
+  TimeLineRoute({
     Key? key,
-    int? tabIndex,
+    required TabSetting initialTabSetting,
     List<PageRouteInfo>? children,
   }) : super(
-          TabSettingsRoute.name,
-          args: TabSettingsRouteArgs(
+          TimeLineRoute.name,
+          args: TimeLineRouteArgs(
             key: key,
-            tabIndex: tabIndex,
+            initialTabSetting: initialTabSetting,
           ),
           initialChildren: children,
         );
 
-  static const String name = 'TabSettingsRoute';
+  static const String name = 'TimeLineRoute';
 
-  static const PageInfo<TabSettingsRouteArgs> page =
-      PageInfo<TabSettingsRouteArgs>(name);
+  static const PageInfo<TimeLineRouteArgs> page =
+      PageInfo<TimeLineRouteArgs>(name);
 }
 
-class TabSettingsRouteArgs {
-  const TabSettingsRouteArgs({
+class TimeLineRouteArgs {
+  const TimeLineRouteArgs({
     this.key,
-    this.tabIndex,
+    required this.initialTabSetting,
   });
 
   final Key? key;
 
-  final int? tabIndex;
+  final TabSetting initialTabSetting;
 
   @override
   String toString() {
-    return 'TabSettingsRouteArgs{key: $key, tabIndex: $tabIndex}';
+    return 'TimeLineRouteArgs{key: $key, initialTabSetting: $initialTabSetting}';
   }
 }
 
 /// generated route for
-/// [TabSettingsListPage]
-class TabSettingsListRoute extends PageRouteInfo<void> {
-  const TabSettingsListRoute({List<PageRouteInfo>? children})
-      : super(
-          TabSettingsListRoute.name,
+/// [UsersListDetailPage]
+class UsersListDetailRoute extends PageRouteInfo<UsersListDetailRouteArgs> {
+  UsersListDetailRoute({
+    Key? key,
+    required Account account,
+    required String listId,
+    List<PageRouteInfo>? children,
+  }) : super(
+          UsersListDetailRoute.name,
+          args: UsersListDetailRouteArgs(
+            key: key,
+            account: account,
+            listId: listId,
+          ),
           initialChildren: children,
         );
 
-  static const String name = 'TabSettingsListRoute';
+  static const String name = 'UsersListDetailRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static const PageInfo<UsersListDetailRouteArgs> page =
+      PageInfo<UsersListDetailRouteArgs>(name);
 }
 
-/// generated route for
-/// [AppInfoPage]
-class AppInfoRoute extends PageRouteInfo<void> {
-  const AppInfoRoute({List<PageRouteInfo>? children})
-      : super(
-          AppInfoRoute.name,
-          initialChildren: children,
-        );
+class UsersListDetailRouteArgs {
+  const UsersListDetailRouteArgs({
+    this.key,
+    required this.account,
+    required this.listId,
+  });
 
-  static const String name = 'AppInfoRoute';
+  final Key? key;
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  final Account account;
+
+  final String listId;
+
+  @override
+  String toString() {
+    return 'UsersListDetailRouteArgs{key: $key, account: $account, listId: $listId}';
+  }
 }
 
 /// generated route for
-/// [SettingsPage]
-class SettingsRoute extends PageRouteInfo<void> {
-  const SettingsRoute({List<PageRouteInfo>? children})
-      : super(
-          SettingsRoute.name,
+/// [UsersListPage]
+class UsersListRoute extends PageRouteInfo<UsersListRouteArgs> {
+  UsersListRoute({
+    required Account account,
+    Key? key,
+    List<PageRouteInfo>? children,
+  }) : super(
+          UsersListRoute.name,
+          args: UsersListRouteArgs(
+            account: account,
+            key: key,
+          ),
           initialChildren: children,
         );
 
-  static const String name = 'SettingsRoute';
+  static const String name = 'UsersListRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static const PageInfo<UsersListRouteArgs> page =
+      PageInfo<UsersListRouteArgs>(name);
 }
 
-/// generated route for
-/// [AccountListPage]
-class AccountListRoute extends PageRouteInfo<void> {
-  const AccountListRoute({List<PageRouteInfo>? children})
-      : super(
-          AccountListRoute.name,
-          initialChildren: children,
-        );
+class UsersListRouteArgs {
+  const UsersListRouteArgs({
+    required this.account,
+    this.key,
+  });
 
-  static const String name = 'AccountListRoute';
+  final Account account;
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  final Key? key;
+
+  @override
+  String toString() {
+    return 'UsersListRouteArgs{account: $account, key: $key}';
+  }
 }
 
 /// generated route for
-/// [ExploreRoleUsersPage]
-class ExploreRoleUsersRoute extends PageRouteInfo<ExploreRoleUsersRouteArgs> {
-  ExploreRoleUsersRoute({
-    Key? key,
-    required RolesListResponse item,
+/// [UsersListTimelinePage]
+class UsersListTimelineRoute extends PageRouteInfo<UsersListTimelineRouteArgs> {
+  UsersListTimelineRoute({
     required Account account,
+    required UsersList list,
+    Key? key,
     List<PageRouteInfo>? children,
   }) : super(
-          ExploreRoleUsersRoute.name,
-          args: ExploreRoleUsersRouteArgs(
-            key: key,
-            item: item,
+          UsersListTimelineRoute.name,
+          args: UsersListTimelineRouteArgs(
             account: account,
+            list: list,
+            key: key,
           ),
           initialChildren: children,
         );
 
-  static const String name = 'ExploreRoleUsersRoute';
+  static const String name = 'UsersListTimelineRoute';
 
-  static const PageInfo<ExploreRoleUsersRouteArgs> page =
-      PageInfo<ExploreRoleUsersRouteArgs>(name);
+  static const PageInfo<UsersListTimelineRouteArgs> page =
+      PageInfo<UsersListTimelineRouteArgs>(name);
 }
 
-class ExploreRoleUsersRouteArgs {
-  const ExploreRoleUsersRouteArgs({
-    this.key,
-    required this.item,
+class UsersListTimelineRouteArgs {
+  const UsersListTimelineRouteArgs({
     required this.account,
+    required this.list,
+    this.key,
   });
 
-  final Key? key;
+  final Account account;
 
-  final RolesListResponse item;
+  final UsersList list;
 
-  final Account account;
+  final Key? key;
 
   @override
   String toString() {
-    return 'ExploreRoleUsersRouteArgs{key: $key, item: $item, account: $account}';
+    return 'UsersListTimelineRouteArgs{account: $account, list: $list, key: $key}';
   }
 }
 
 /// generated route for
-/// [ExplorePage]
-class ExploreRoute extends PageRouteInfo<ExploreRouteArgs> {
-  ExploreRoute({
+/// [UserFolloweePage]
+class UserFolloweeRoute extends PageRouteInfo<UserFolloweeRouteArgs> {
+  UserFolloweeRoute({
     Key? key,
+    required String userId,
     required Account account,
     List<PageRouteInfo>? children,
   }) : super(
-          ExploreRoute.name,
-          args: ExploreRouteArgs(
+          UserFolloweeRoute.name,
+          args: UserFolloweeRouteArgs(
             key: key,
+            userId: userId,
             account: account,
           ),
           initialChildren: children,
         );
 
-  static const String name = 'ExploreRoute';
+  static const String name = 'UserFolloweeRoute';
 
-  static const PageInfo<ExploreRouteArgs> page =
-      PageInfo<ExploreRouteArgs>(name);
+  static const PageInfo<UserFolloweeRouteArgs> page =
+      PageInfo<UserFolloweeRouteArgs>(name);
 }
 
-class ExploreRouteArgs {
-  const ExploreRouteArgs({
+class UserFolloweeRouteArgs {
+  const UserFolloweeRouteArgs({
     this.key,
+    required this.userId,
     required this.account,
   });
 
   final Key? key;
 
+  final String userId;
+
   final Account account;
 
   @override
   String toString() {
-    return 'ExploreRouteArgs{key: $key, account: $account}';
+    return 'UserFolloweeRouteArgs{key: $key, userId: $userId, account: $account}';
   }
 }
 
 /// generated route for
-/// [TimeLinePage]
-class TimeLineRoute extends PageRouteInfo<TimeLineRouteArgs> {
-  TimeLineRoute({
+/// [UserFollowerPage]
+class UserFollowerRoute extends PageRouteInfo<UserFollowerRouteArgs> {
+  UserFollowerRoute({
     Key? key,
-    required TabSetting initialTabSetting,
+    required String userId,
+    required Account account,
     List<PageRouteInfo>? children,
   }) : super(
-          TimeLineRoute.name,
-          args: TimeLineRouteArgs(
+          UserFollowerRoute.name,
+          args: UserFollowerRouteArgs(
             key: key,
-            initialTabSetting: initialTabSetting,
+            userId: userId,
+            account: account,
           ),
           initialChildren: children,
         );
 
-  static const String name = 'TimeLineRoute';
+  static const String name = 'UserFollowerRoute';
 
-  static const PageInfo<TimeLineRouteArgs> page =
-      PageInfo<TimeLineRouteArgs>(name);
+  static const PageInfo<UserFollowerRouteArgs> page =
+      PageInfo<UserFollowerRouteArgs>(name);
 }
 
-class TimeLineRouteArgs {
-  const TimeLineRouteArgs({
+class UserFollowerRouteArgs {
+  const UserFollowerRouteArgs({
     this.key,
-    required this.initialTabSetting,
+    required this.userId,
+    required this.account,
   });
 
   final Key? key;
 
-  final TabSetting initialTabSetting;
+  final String userId;
+
+  final Account account;
 
   @override
   String toString() {
-    return 'TimeLineRouteArgs{key: $key, initialTabSetting: $initialTabSetting}';
+    return 'UserFollowerRouteArgs{key: $key, userId: $userId, account: $account}';
   }
 }
 
 /// generated route for
-/// [FavoritedNotePage]
-class FavoritedNoteRoute extends PageRouteInfo<FavoritedNoteRouteArgs> {
-  FavoritedNoteRoute({
+/// [UserPage]
+class UserRoute extends PageRouteInfo<UserRouteArgs> {
+  UserRoute({
     Key? key,
+    required String userId,
     required Account account,
     List<PageRouteInfo>? children,
   }) : super(
-          FavoritedNoteRoute.name,
-          args: FavoritedNoteRouteArgs(
+          UserRoute.name,
+          args: UserRouteArgs(
             key: key,
+            userId: userId,
             account: account,
           ),
           initialChildren: children,
         );
 
-  static const String name = 'FavoritedNoteRoute';
+  static const String name = 'UserRoute';
 
-  static const PageInfo<FavoritedNoteRouteArgs> page =
-      PageInfo<FavoritedNoteRouteArgs>(name);
+  static const PageInfo<UserRouteArgs> page = PageInfo<UserRouteArgs>(name);
 }
 
-class FavoritedNoteRouteArgs {
-  const FavoritedNoteRouteArgs({
+class UserRouteArgs {
+  const UserRouteArgs({
     this.key,
+    required this.userId,
     required this.account,
   });
 
   final Key? key;
 
+  final String userId;
+
   final Account account;
 
   @override
   String toString() {
-    return 'FavoritedNoteRouteArgs{key: $key, account: $account}';
+    return 'UserRouteArgs{key: $key, userId: $userId, account: $account}';
   }
 }
diff --git a/lib/state_notifier/common/misskey_notes/misskey_note_notifier.dart b/lib/state_notifier/common/misskey_notes/misskey_note_notifier.dart
index ebe5c9005..9ad0c1aa8 100644
--- a/lib/state_notifier/common/misskey_notes/misskey_note_notifier.dart
+++ b/lib/state_notifier/common/misskey_notes/misskey_note_notifier.dart
@@ -77,14 +77,12 @@ class MisskeyNoteNotifier extends FamilyNotifier<void, Account> {
     final host = user.host ?? _account.host;
 
     try {
-      final response =
-          await ref.read(misskeyProvider(account)).users.showByName(
-                UsersShowByUserNameRequest(
-                  userName: user.username,
-                  host: host,
-                ),
-              );
-      return response.toUser();
+      return ref.read(misskeyProvider(account)).users.showByName(
+            UsersShowByUserNameRequest(
+              userName: user.username,
+              host: host,
+            ),
+          );
     } catch (e) {
       // 最終手段として、連合で照会する
       // `users/show` で自動的に照会されるから必要ない
@@ -97,7 +95,7 @@ class MisskeyNoteNotifier extends FamilyNotifier<void, Account> {
               ),
             ),
           );
-      return UsersShowResponse.fromJson(response.object).toUser();
+      return UserDetailed.fromJson(response.object);
     }
   }
 
diff --git a/lib/state_notifier/note_create_page/note_create_state_notifier.dart b/lib/state_notifier/note_create_page/note_create_state_notifier.dart
index f04731706..a5949efa9 100644
--- a/lib/state_notifier/note_create_page/note_create_state_notifier.dart
+++ b/lib/state_notifier/note_create_page/note_create_state_notifier.dart
@@ -181,6 +181,14 @@ class NoteCreateNotifier extends StateNotifier<NoteCreate> {
       }
       final deletedNoteChannel = note.channel;
 
+      final replyTo = <User>[];
+      if (note.mentions.isNotEmpty) {
+        replyTo.addAll(
+          await misskey.users
+              .showByIds(UsersShowByIdsRequest(userIds: note.mentions)),
+        );
+      }
+
       resultState = resultState.copyWith(
         noteVisibility: note.visibility,
         localOnly: note.localOnly,
@@ -193,11 +201,7 @@ class NoteCreateNotifier extends StateNotifier<NoteCreate> {
         isCw: note.cw?.isNotEmpty == true,
         text: note.text ?? "",
         reactionAcceptance: note.reactionAcceptance,
-        replyTo: [
-          for (final userId in note.mentions)
-            (await misskey.users.show(UsersShowRequest(userId: userId)))
-                .toUser()
-        ],
+        replyTo: replyTo.toList(),
         isVote: note.poll != null,
         isVoteMultiple: note.poll?.multiple ?? false,
         voteExpireType: note.poll?.expiresAt == null
@@ -223,6 +227,14 @@ class NoteCreateNotifier extends StateNotifier<NoteCreate> {
     }
 
     if (reply != null) {
+      final replyTo = <User>[];
+      if (reply.mentions.isNotEmpty) {
+        replyTo.addAll(
+          await misskey.users
+              .showByIds(UsersShowByIdsRequest(userIds: reply.mentions)),
+        );
+      }
+
       resultState = resultState.copyWith(
         reply: reply,
         noteVisibility:
@@ -231,9 +243,7 @@ class NoteCreateNotifier extends StateNotifier<NoteCreate> {
         isCw: reply.cw?.isNotEmpty == true,
         replyTo: [
           reply.user,
-          for (final userId in reply.mentions)
-            (await misskey.users.show(UsersShowRequest(userId: userId)))
-                .toUser()
+          ...replyTo,
         ]..removeWhere((element) => element.id == state.account.i.id),
       );
     }
diff --git a/lib/view/common/account_select_dialog.dart b/lib/view/common/account_select_dialog.dart
index ab9932032..589133831 100644
--- a/lib/view/common/account_select_dialog.dart
+++ b/lib/view/common/account_select_dialog.dart
@@ -26,7 +26,7 @@ class AccountSelectDialog extends ConsumerWidget {
                 (account) => AccountScope(
                   account: account,
                   child: ListTile(
-                    leading: AvatarIcon.fromIResponse(account.i),
+                    leading: AvatarIcon(user: account.i),
                     title: SimpleMfmText(
                       account.i.name ?? account.i.username,
                       style: Theme.of(context).textTheme.titleMedium,
diff --git a/lib/view/common/avatar_icon.dart b/lib/view/common/avatar_icon.dart
index c27b440de..78d7f50cb 100644
--- a/lib/view/common/avatar_icon.dart
+++ b/lib/view/common/avatar_icon.dart
@@ -19,39 +19,6 @@ class AvatarIcon extends StatefulWidget {
     this.onTap,
   });
 
-  factory AvatarIcon.fromIResponse(IResponse response, {double height = 48}) {
-    return AvatarIcon(
-      user: User(
-        id: response.id,
-        username: response.username,
-        avatarUrl: response.avatarUrl,
-        avatarBlurhash: response.avatarBlurhash,
-        avatarDecorations: response.avatarDecorations,
-        isCat: response.isCat,
-        isBot: response.isBot,
-      ),
-      height: height,
-    );
-  }
-
-  factory AvatarIcon.fromUserResponse(
-    UsersShowResponse response, {
-    double height = 48,
-  }) {
-    return AvatarIcon(
-      user: User(
-        id: response.id,
-        username: response.username,
-        avatarUrl: response.avatarUrl,
-        avatarBlurhash: response.avatarBlurhash,
-        avatarDecorations: response.avatarDecorations,
-        isCat: response.isCat,
-        isBot: response.isBot,
-      ),
-      height: height,
-    );
-  }
-
   @override
   State<StatefulWidget> createState() => AvatarIconState();
 }
diff --git a/lib/view/common/common_drawer.dart b/lib/view/common/common_drawer.dart
index eba70f9a1..8f244bd38 100644
--- a/lib/view/common/common_drawer.dart
+++ b/lib/view/common/common_drawer.dart
@@ -26,7 +26,7 @@ class CommonDrawer extends ConsumerWidget {
               AccountScope(
                 account: account,
                 child: ExpansionTile(
-                  leading: AvatarIcon.fromIResponse(account.i),
+                  leading: AvatarIcon(user: account.i),
                   initiallyExpanded: account.acct == initialOpenAcct,
                   title: SimpleMfmText(
                     account.i.name ?? account.i.username,
diff --git a/lib/view/common/misskey_notes/note_modal_sheet.dart b/lib/view/common/misskey_notes/note_modal_sheet.dart
index c475110f1..4cfc22125 100644
--- a/lib/view/common/misskey_notes/note_modal_sheet.dart
+++ b/lib/view/common/misskey_notes/note_modal_sheet.dart
@@ -86,8 +86,6 @@ class NoteModalSheet extends ConsumerWidget {
               builder: (context) => UserControlDialog(
                 account: account,
                 response: response,
-                isMe: targetNote.user.host == null &&
-                    targetNote.user.username == account.userId,
               ),
             );
           },
diff --git a/lib/view/note_create_page/note_create_setting_top.dart b/lib/view/note_create_page/note_create_setting_top.dart
index 518b78e5a..56595adf4 100644
--- a/lib/view/note_create_page/note_create_setting_top.dart
+++ b/lib/view/note_create_page/note_create_setting_top.dart
@@ -62,8 +62,8 @@ class NoteCreateSettingTop extends ConsumerWidget {
     return Row(
       children: [
         const Padding(padding: EdgeInsets.only(left: 5)),
-        AvatarIcon.fromIResponse(
-          AccountScope.of(context).i,
+        AvatarIcon(
+          user: AccountScope.of(context).i,
           height:
               Theme.of(context).iconButtonTheme.style?.iconSize?.resolve({}) ??
                   32,
diff --git a/lib/view/settings_page/account_settings_page/account_list.dart b/lib/view/settings_page/account_settings_page/account_list.dart
index 52effc461..6e1e3b0c4 100644
--- a/lib/view/settings_page/account_settings_page/account_list.dart
+++ b/lib/view/settings_page/account_settings_page/account_list.dart
@@ -82,7 +82,7 @@ class AccountListItem extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return ListTile(
-      leading: AvatarIcon.fromIResponse(account.i),
+      leading: AvatarIcon(user: account.i),
       title: Text(
         account.i.name ?? account.i.username,
         style: Theme.of(context).textTheme.titleMedium,
diff --git a/lib/view/several_account_settings_page/instance_mute_page/instance_mute_page.dart b/lib/view/several_account_settings_page/instance_mute_page/instance_mute_page.dart
index 31c89ed1c..f879fb02a 100644
--- a/lib/view/several_account_settings_page/instance_mute_page/instance_mute_page.dart
+++ b/lib/view/several_account_settings_page/instance_mute_page/instance_mute_page.dart
@@ -48,7 +48,7 @@ class InstanceMutePageState extends ConsumerState<InstanceMutePage> {
       body: SingleChildScrollView(
         child: Padding(
           padding: const EdgeInsets.all(10),
-          child: CommonFuture<IResponse>(
+          child: CommonFuture<MeDetailed>(
             future: ref.read(misskeyProvider(widget.account)).i.i(),
             futureFinished: (data) {
               controller.text = data.mutedInstances.join("\n");
diff --git a/lib/view/several_account_settings_page/word_mute_page/word_mute_page.dart b/lib/view/several_account_settings_page/word_mute_page/word_mute_page.dart
index 34455d088..8f14b88db 100644
--- a/lib/view/several_account_settings_page/word_mute_page/word_mute_page.dart
+++ b/lib/view/several_account_settings_page/word_mute_page/word_mute_page.dart
@@ -77,7 +77,7 @@ class WordMutePageState extends ConsumerState<WordMutePage> {
       body: SingleChildScrollView(
         child: Padding(
           padding: const EdgeInsets.all(10),
-          child: CommonFuture<IResponse>(
+          child: CommonFuture<MeDetailed>(
             future: ref.read(misskeyProvider(widget.account)).i.i(),
             futureFinished: (data) {
               controller.text = muteValueString(
diff --git a/lib/view/sharing_account_select_page/account_select_page.dart b/lib/view/sharing_account_select_page/account_select_page.dart
index 5fdabebf7..51e82ce3b 100644
--- a/lib/view/sharing_account_select_page/account_select_page.dart
+++ b/lib/view/sharing_account_select_page/account_select_page.dart
@@ -29,7 +29,7 @@ class SharingAccountSelectPage extends ConsumerWidget {
                 initialMediaFiles: filePath,
               ));
             },
-            leading: AvatarIcon.fromIResponse(account.i),
+            leading: AvatarIcon(user: account.i),
             title: Text(account.i.name ?? account.i.username,
                 style: Theme.of(context).textTheme.titleMedium),
             subtitle: Text(
diff --git a/lib/view/user_page/user_control_dialog.dart b/lib/view/user_page/user_control_dialog.dart
index 6af367449..345d6f253 100644
--- a/lib/view/user_page/user_control_dialog.dart
+++ b/lib/view/user_page/user_control_dialog.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:miria/extensions/users_show_response_extension.dart';
+import 'package:miria/extensions/user_extension.dart';
 import 'package:miria/model/account.dart';
 import 'package:miria/providers.dart';
 import 'package:miria/view/common/error_dialog_handler.dart';
@@ -22,14 +22,12 @@ enum UserControl {
 
 class UserControlDialog extends ConsumerStatefulWidget {
   final Account account;
-  final UsersShowResponse response;
-  final bool isMe;
+  final UserDetailed response;
 
   const UserControlDialog({
     super.key,
     required this.account,
     required this.response,
-    required this.isMe,
   });
 
   @override
@@ -43,7 +41,7 @@ class UserControlDialogState extends ConsumerState<UserControlDialog> {
       context: context,
       builder: (context) => UsersListModalSheet(
         account: widget.account,
-        user: widget.response.toUser(),
+        user: widget.response,
       ),
     );
   }
@@ -53,7 +51,7 @@ class UserControlDialogState extends ConsumerState<UserControlDialog> {
       context: context,
       builder: (context) => AntennaModalSheet(
         account: widget.account,
-        user: widget.response.toUser(),
+        user: widget.response,
       ),
     );
   }
@@ -131,6 +129,7 @@ class UserControlDialogState extends ConsumerState<UserControlDialog> {
 
   @override
   Widget build(BuildContext context) {
+    final user = widget.response;
     return ListView(
       children: [
         ListTile(
@@ -209,7 +208,7 @@ class UserControlDialogState extends ConsumerState<UserControlDialog> {
           title: const Text("別のアカウントで開く"),
           onTap: () => ref
               .read(misskeyNoteNotifierProvider(widget.account).notifier)
-              .openUserInOtherAccount(context, widget.response.toUser())
+              .openUserInOtherAccount(context, user)
               .expectFailure(context),
         ),
         ListTile(
@@ -222,8 +221,8 @@ class UserControlDialogState extends ConsumerState<UserControlDialog> {
           title: const Text("アンテナに追加"),
           onTap: addToAntenna,
         ),
-        if (!widget.isMe) ...[
-          if (widget.response.isRenoteMuted ?? false)
+        if (user is UserDetailedNotMeWithRelations) ...[
+          if (user.isRenoteMuted)
             ListTile(
               leading: const Icon(Icons.repeat_rounded),
               title: const Text("Renoteのミュート解除する"),
@@ -235,7 +234,7 @@ class UserControlDialogState extends ConsumerState<UserControlDialog> {
               title: const Text("Renoteをミュートする"),
               onTap: renoteMuteCreate.expectFailure(context),
             ),
-          if (widget.response.isMuted ?? false)
+          if (user.isMuted)
             ListTile(
               leading: const Icon(Icons.visibility),
               title: const Text("ミュート解除する"),
@@ -247,7 +246,7 @@ class UserControlDialogState extends ConsumerState<UserControlDialog> {
               title: const Text("ミュートする"),
               onTap: muteCreate.expectFailure(context),
             ),
-          if (widget.response.isBlocking ?? false)
+          if (user.isBlocking)
             ListTile(
               leading: const Icon(Icons.block),
               title: const Text("ブロックを解除する"),
diff --git a/lib/view/user_page/user_detail.dart b/lib/view/user_page/user_detail.dart
index 858602e51..79adeda74 100644
--- a/lib/view/user_page/user_detail.dart
+++ b/lib/view/user_page/user_detail.dart
@@ -3,6 +3,7 @@ import 'package:confetti/confetti.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:miria/extensions/date_time_extension.dart';
+import 'package:miria/extensions/user_extension.dart';
 import 'package:miria/model/account.dart';
 import 'package:miria/providers.dart';
 import 'package:miria/router/app_router.dart';
@@ -21,7 +22,7 @@ import 'package:misskey_dart/misskey_dart.dart';
 class UserDetail extends ConsumerStatefulWidget {
   final Account account;
   final Account? controlAccount;
-  final UsersShowResponse response;
+  final UserDetailed response;
 
   const UserDetail({
     super.key,
@@ -35,12 +36,18 @@ class UserDetail extends ConsumerStatefulWidget {
 }
 
 class UserDetailState extends ConsumerState<UserDetail> {
-  late UsersShowResponse response;
+  late UserDetailed response;
   bool isFollowEditing = false;
   String memo = "";
 
   Future<void> followCreate() async {
     if (isFollowEditing) return;
+
+    final user = response;
+    if (user is! UserDetailedNotMeWithRelations) {
+      return;
+    }
+
     setState(() {
       isFollowEditing = true;
     });
@@ -48,13 +55,14 @@ class UserDetailState extends ConsumerState<UserDetail> {
       await ref
           .read(misskeyProvider(AccountScope.of(context)))
           .following
-          .create(FollowingCreateRequest(userId: response.id));
+          .create(FollowingCreateRequest(userId: user.id));
       if (!mounted) return;
+      final requiresFollowRequest = user.isLocked && !user.isFollowed;
       setState(() {
         isFollowEditing = false;
-        response = response.copyWith(
-          isFollowing: !response.requiresFollowRequest,
-          hasPendingFollowRequestFromYou: response.requiresFollowRequest,
+        response = user.copyWith(
+          isFollowing: !requiresFollowRequest,
+          hasPendingFollowRequestFromYou: requiresFollowRequest,
         );
       });
     } catch (e) {
@@ -68,6 +76,12 @@ class UserDetailState extends ConsumerState<UserDetail> {
 
   Future<void> followDelete() async {
     if (isFollowEditing) return;
+
+    final user = response;
+    if (user is! UserDetailedNotMeWithRelations) {
+      return;
+    }
+
     final account = AccountScope.of(context);
     if (await SimpleConfirmDialog.show(
             context: context,
@@ -84,11 +98,11 @@ class UserDetailState extends ConsumerState<UserDetail> {
       await ref
           .read(misskeyProvider(account))
           .following
-          .delete(FollowingDeleteRequest(userId: response.id));
+          .delete(FollowingDeleteRequest(userId: user.id));
       if (!mounted) return;
       setState(() {
         isFollowEditing = false;
-        response = response.copyWith(isFollowing: false);
+        response = user.copyWith(isFollowing: false);
       });
     } catch (e) {
       if (!mounted) return;
@@ -101,6 +115,12 @@ class UserDetailState extends ConsumerState<UserDetail> {
 
   Future<void> followRequestCancel() async {
     if (isFollowEditing) return;
+
+    final user = response;
+    if (user is! UserDetailedNotMeWithRelations) {
+      return;
+    }
+
     setState(() {
       isFollowEditing = true;
     });
@@ -109,11 +129,11 @@ class UserDetailState extends ConsumerState<UserDetail> {
           .read(misskeyProvider(AccountScope.of(context)))
           .following
           .requests
-          .cancel(FollowingRequestsCancelRequest(userId: response.id));
+          .cancel(FollowingRequestsCancelRequest(userId: user.id));
       if (!mounted) return;
       setState(() {
         isFollowEditing = false;
-        response = response.copyWith(hasPendingFollowRequestFromYou: false);
+        response = user.copyWith(hasPendingFollowRequestFromYou: false);
       });
     } catch (e) {
       if (!mounted) return;
@@ -124,45 +144,50 @@ class UserDetailState extends ConsumerState<UserDetail> {
     }
   }
 
-  Future<void> userControl(bool isMe) async {
+  Future<void> userControl() async {
     final result = await showModalBottomSheet<UserControl?>(
-        context: context,
-        builder: (context) => UserControlDialog(
-              account: widget.account,
-              response: response,
-              isMe: isMe,
-            ));
+      context: context,
+      builder: (context) => UserControlDialog(
+        account: widget.account,
+        response: response,
+      ),
+    );
     if (result == null) return;
 
+    final user = response;
+    if (user is! UserDetailedNotMeWithRelations) {
+      return;
+    }
+
     switch (result) {
       case UserControl.createMute:
         setState(() {
-          response = response.copyWith(isMuted: true);
+          response = user.copyWith(isMuted: true);
         });
         break;
       case UserControl.deleteMute:
         setState(() {
-          response = response.copyWith(isMuted: false);
+          response = user.copyWith(isMuted: false);
         });
         break;
       case UserControl.createRenoteMute:
         setState(() {
-          response = response.copyWith(isRenoteMuted: true);
+          response = user.copyWith(isRenoteMuted: true);
         });
         break;
       case UserControl.deleteRenoteMute:
         setState(() {
-          response = response.copyWith(isRenoteMuted: false);
+          response = user.copyWith(isRenoteMuted: false);
         });
         break;
       case UserControl.createBlock:
         setState(() {
-          response = response.copyWith(isBlocking: true);
+          response = user.copyWith(isBlocking: true);
         });
         break;
       case UserControl.deleteBlock:
         setState(() {
-          response = response.copyWith(isBlocking: false);
+          response = user.copyWith(isBlocking: false);
         });
         break;
     }
@@ -176,10 +201,7 @@ class UserDetailState extends ConsumerState<UserDetail> {
   }
 
   Widget buildContent() {
-    final userName =
-        "${response.username}${response.host != null ? "@${response.host ?? ""}" : ""}";
-    final isMe = (widget.response.host == null &&
-        widget.response.username == AccountScope.of(context).userId);
+    final user = response;
 
     return Column(children: [
       if (widget.controlAccount == null)
@@ -189,9 +211,7 @@ class UserDetailState extends ConsumerState<UserDetail> {
               mainAxisSize: MainAxisSize.max,
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                if (isMe)
-                  const Spacer()
-                else
+                if (user is UserDetailedNotMeWithRelations)
                   Expanded(
                     child: Align(
                       alignment: Alignment.centerRight,
@@ -200,86 +220,92 @@ class UserDetailState extends ConsumerState<UserDetail> {
                         child: Wrap(
                           crossAxisAlignment: WrapCrossAlignment.center,
                           children: [
-                            if (response.isRenoteMuted ?? false)
+                            if (user.isRenoteMuted)
                               const Card(
-                                  child: Padding(
-                                padding: EdgeInsets.all(10),
-                                child: Text("Renoteのミュート中"),
-                              )),
-                            if (response.isMuted ?? false)
+                                child: Padding(
+                                  padding: EdgeInsets.all(10),
+                                  child: Text("Renoteのミュート中"),
+                                ),
+                              ),
+                            if (user.isMuted)
                               const Card(
-                                  child: Padding(
-                                padding: EdgeInsets.all(10),
-                                child: Text("ミュート中"),
-                              )),
-                            if (response.isBlocking ?? false)
+                                child: Padding(
+                                  padding: EdgeInsets.all(10),
+                                  child: Text("ミュート中"),
+                                ),
+                              ),
+                            if (user.isBlocking)
                               const Card(
-                                  child: Padding(
-                                padding: EdgeInsets.all(10),
-                                child: Text("ブロック中"),
-                              )),
-                            if ((response.isFollowed ?? false))
+                                child: Padding(
+                                  padding: EdgeInsets.all(10),
+                                  child: Text("ブロック中"),
+                                ),
+                              ),
+                            if (user.isFollowed)
                               const Padding(
                                 padding: EdgeInsets.only(right: 8.0),
                                 child: Card(
-                                    child: Padding(
-                                  padding: EdgeInsets.all(10),
-                                  child: Text("フォローされています"),
-                                )),
+                                  child: Padding(
+                                    padding: EdgeInsets.all(10),
+                                    child: Text("フォローされています"),
+                                  ),
+                                ),
                               ),
                             if (!isFollowEditing)
-                              (response.isFollowing ?? false)
-                                  ? ElevatedButton(
-                                      onPressed:
-                                          followDelete.expectFailure(context),
-                                      child: const Text("フォロー解除"),
-                                    )
-                                  : (response.hasPendingFollowRequestFromYou ??
-                                          false)
-                                      ? ElevatedButton(
-                                          onPressed: followRequestCancel
-                                              .expectFailure(context),
-                                          child: const Text("フォロー許可待ち"),
-                                        )
-                                      : OutlinedButton(
-                                          onPressed: followCreate
-                                              .expectFailure(context),
-                                          child: Text(
-                                            (response.requiresFollowRequest)
-                                                ? "フォロー申請"
-                                                : "フォローする",
-                                          ),
-                                        )
+                              if (user.isFollowing)
+                                ElevatedButton(
+                                  onPressed:
+                                      followDelete.expectFailure(context),
+                                  child: const Text("フォロー解除"),
+                                )
+                              else if (user.hasPendingFollowRequestFromYou)
+                                ElevatedButton(
+                                  onPressed: followRequestCancel
+                                      .expectFailure(context),
+                                  child: const Text("フォロー許可待ち"),
+                                )
+                              else
+                                OutlinedButton(
+                                  onPressed:
+                                      followCreate.expectFailure(context),
+                                  child: Text(
+                                    user.isLocked ? "フォロー申請" : "フォローする",
+                                  ),
+                                )
                             else
                               Align(
                                 alignment: Alignment.centerRight,
                                 child: TextButton.icon(
-                                    onPressed: () {},
-                                    icon: SizedBox(
-                                        width: Theme.of(context)
-                                                .textTheme
-                                                .bodyMedium
-                                                ?.fontSize ??
-                                            22,
-                                        height: Theme.of(context)
-                                                .textTheme
-                                                .bodyMedium
-                                                ?.fontSize ??
-                                            22,
-                                        child:
-                                            const CircularProgressIndicator()),
-                                    label: const Text("更新中")),
+                                  onPressed: () {},
+                                  icon: SizedBox(
+                                    width: Theme.of(context)
+                                            .textTheme
+                                            .bodyMedium
+                                            ?.fontSize ??
+                                        22,
+                                    height: Theme.of(context)
+                                            .textTheme
+                                            .bodyMedium
+                                            ?.fontSize ??
+                                        22,
+                                    child: const CircularProgressIndicator(),
+                                  ),
+                                  label: const Text("更新中"),
+                                ),
                               ),
                           ],
                         ),
                       ),
                     ),
-                  ),
+                  )
+                else
+                  const Spacer(),
                 Align(
                   alignment: Alignment.center,
                   child: IconButton(
-                      onPressed: () => userControl(isMe),
-                      icon: const Icon(Icons.more_vert)),
+                    onPressed: userControl,
+                    icon: const Icon(Icons.more_vert),
+                  ),
                 )
               ],
             )),
@@ -289,8 +315,8 @@ class UserDetailState extends ConsumerState<UserDetail> {
         child: Column(children: [
           Row(
             children: [
-              AvatarIcon.fromUserResponse(
-                response,
+              AvatarIcon(
+                user: response,
                 height: 80,
               ),
               Expanded(
@@ -304,16 +330,16 @@ class UserDetailState extends ConsumerState<UserDetail> {
                       MfmText(
                         mfmText: response.name ?? response.username,
                         style: Theme.of(context).textTheme.headlineSmall,
-                        emoji: response.emojis ?? {},
+                        emoji: response.emojis,
                       ),
                       Text(
-                        "@$userName",
+                        response.acct,
                         style: Theme.of(context).textTheme.bodyLarge,
-                      )
+                      ),
                     ],
                   ),
                 ),
-              )
+              ),
             ],
           ),
           const Padding(padding: EdgeInsets.only(top: 5)),
@@ -399,7 +425,7 @@ class UserDetailState extends ConsumerState<UserDetail> {
             alignment: Alignment.center,
             child: MfmText(
               mfmText: response.description ?? "",
-              emoji: response.emojis ?? {},
+              emoji: response.emojis,
             ),
           ),
           const Padding(padding: EdgeInsets.only(top: 20)),
@@ -450,13 +476,13 @@ class UserDetailState extends ConsumerState<UserDetail> {
                     TableCell(
                       child: MfmText(
                         mfmText: field.name,
-                        emoji: response.emojis ?? {},
+                        emoji: response.emojis,
                       ),
                     ),
                     TableCell(
                         child: MfmText(
                       mfmText: field.value,
-                      emoji: response.emojis ?? {},
+                      emoji: response.emojis,
                     )),
                   ])
               ],
@@ -545,7 +571,7 @@ class UserDetailState extends ConsumerState<UserDetail> {
 }
 
 class BirthdayConfetti extends StatefulWidget {
-  final UsersShowResponse response;
+  final UserDetailed response;
   final Widget child;
 
   const BirthdayConfetti({
@@ -589,10 +615,3 @@ class BirthdayConfettiState extends State<BirthdayConfetti> {
     return widget.child;
   }
 }
-
-extension on UsersShowResponse {
-  bool get requiresFollowRequest {
-    return isLocked &&
-        !((isFollowed ?? false) && (autoAcceptFollowed ?? false));
-  }
-}
diff --git a/lib/view/user_page/user_page.dart b/lib/view/user_page/user_page.dart
index 56acda8bb..e1c32f694 100644
--- a/lib/view/user_page/user_page.dart
+++ b/lib/view/user_page/user_page.dart
@@ -16,9 +16,9 @@ import 'package:misskey_dart/misskey_dart.dart';
 
 class UserInfo {
   final String userId;
-  final UsersShowResponse? response;
+  final UserDetailed? response;
   final String? remoteUserId;
-  final UsersShowResponse? remoteResponse;
+  final UserDetailed? remoteResponse;
   final MetaResponse? metaResponse;
 
   const UserInfo({
@@ -190,8 +190,8 @@ class UserDetailTab extends ConsumerStatefulWidget {
 }
 
 class UserDetailTabState extends ConsumerState<UserDetailTab> {
-  UsersShowResponse? response;
-  UsersShowResponse? remoteResponse;
+  UserDetailed? response;
+  UserDetailed? remoteResponse;
   (Object?, StackTrace)? error;
 
   @override
diff --git a/lib/view/users_list_page/users_list_detail_page.dart b/lib/view/users_list_page/users_list_detail_page.dart
index c0034225f..152ad6895 100644
--- a/lib/view/users_list_page/users_list_detail_page.dart
+++ b/lib/view/users_list_page/users_list_detail_page.dart
@@ -66,7 +66,7 @@ class _UsersListUsers
         userIds: list.userIds,
       ),
     );
-    return response.map((e) => e.toUser()).toList();
+    return response.toList();
   }
 
   Misskey get _misskey => arg.$1;
diff --git a/test/test_util/mock.mocks.dart b/test/test_util/mock.mocks.dart
index 92430e055..9f5815f80 100644
--- a/test/test_util/mock.mocks.dart
+++ b/test/test_util/mock.mocks.dart
@@ -3,45 +3,46 @@
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i17;
-import 'dart:collection' as _i30;
+import 'dart:async' as _i18;
+import 'dart:collection' as _i31;
 import 'dart:io' as _i12;
-import 'dart:typed_data' as _i27;
-import 'dart:ui' as _i18;
+import 'dart:typed_data' as _i28;
+import 'dart:ui' as _i19;
 
 import 'package:dio/dio.dart' as _i11;
-import 'package:file/file.dart' as _i13;
-import 'package:file_picker/file_picker.dart' as _i35;
-import 'package:flutter_cache_manager/flutter_cache_manager.dart' as _i14;
+import 'package:file/file.dart' as _i14;
+import 'package:file_picker/file_picker.dart' as _i36;
+import 'package:flutter_cache_manager/flutter_cache_manager.dart' as _i15;
 import 'package:flutter_riverpod/flutter_riverpod.dart' as _i4;
 import 'package:miria/model/account.dart' as _i6;
 import 'package:miria/model/account_settings.dart' as _i2;
-import 'package:miria/model/acct.dart' as _i20;
+import 'package:miria/model/acct.dart' as _i21;
 import 'package:miria/model/general_settings.dart' as _i3;
-import 'package:miria/model/misskey_emoji_data.dart' as _i22;
-import 'package:miria/model/tab_setting.dart' as _i16;
-import 'package:miria/repository/account_repository.dart' as _i24;
-import 'package:miria/repository/account_settings_repository.dart' as _i19;
-import 'package:miria/repository/emoji_repository.dart' as _i21;
-import 'package:miria/repository/general_settings_repository.dart' as _i23;
-import 'package:miria/repository/note_repository.dart' as _i25;
-import 'package:miria/repository/tab_settings_repository.dart' as _i15;
+import 'package:miria/model/misskey_emoji_data.dart' as _i23;
+import 'package:miria/model/tab_setting.dart' as _i17;
+import 'package:miria/repository/account_repository.dart' as _i25;
+import 'package:miria/repository/account_settings_repository.dart' as _i20;
+import 'package:miria/repository/emoji_repository.dart' as _i22;
+import 'package:miria/repository/general_settings_repository.dart' as _i24;
+import 'package:miria/repository/note_repository.dart' as _i26;
+import 'package:miria/repository/tab_settings_repository.dart' as _i16;
 import 'package:misskey_dart/misskey_dart.dart' as _i5;
 import 'package:misskey_dart/src/data/ping_response.dart' as _i10;
 import 'package:misskey_dart/src/data/stats_response.dart' as _i9;
-import 'package:misskey_dart/src/data/streaming/streaming_request.dart' as _i29;
-import 'package:misskey_dart/src/enums/broadcast_event_type.dart' as _i33;
-import 'package:misskey_dart/src/enums/channel.dart' as _i28;
-import 'package:misskey_dart/src/enums/channel_event_type.dart' as _i31;
-import 'package:misskey_dart/src/enums/note_updated_event_type.dart' as _i32;
+import 'package:misskey_dart/src/data/streaming/streaming_request.dart' as _i30;
+import 'package:misskey_dart/src/enums/broadcast_event_type.dart' as _i34;
+import 'package:misskey_dart/src/enums/channel.dart' as _i29;
+import 'package:misskey_dart/src/enums/channel_event_type.dart' as _i32;
+import 'package:misskey_dart/src/enums/note_updated_event_type.dart' as _i33;
 import 'package:misskey_dart/src/misskey_flash.dart' as _i8;
 import 'package:misskey_dart/src/services/api_service.dart' as _i7;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:mockito/src/dummies.dart' as _i26;
+import 'package:mockito/src/dummies.dart' as _i27;
 import 'package:url_launcher_platform_interface/url_launcher_platform_interface.dart'
-    as _i36;
+    as _i37;
+import 'package:web_socket_channel/web_socket_channel.dart' as _i13;
 
-import 'mock.dart' as _i34;
+import 'mock.dart' as _i35;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -497,8 +498,8 @@ class _FakeMisskeyFollowingRequests_41 extends _i1.SmartFake
         );
 }
 
-class _FakeUser_42 extends _i1.SmartFake implements _i5.User {
-  _FakeUser_42(
+class _FakeUserLite_42 extends _i1.SmartFake implements _i5.UserLite {
+  _FakeUserLite_42(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -517,8 +518,8 @@ class _FakeHashtag_43 extends _i1.SmartFake implements _i5.Hashtag {
         );
 }
 
-class _FakeIResponse_44 extends _i1.SmartFake implements _i5.IResponse {
-  _FakeIResponse_44(
+class _FakeMeDetailed_44 extends _i1.SmartFake implements _i5.MeDetailed {
+  _FakeMeDetailed_44(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -614,9 +615,8 @@ class _FakeMisskeyUsersLists_52 extends _i1.SmartFake
         );
 }
 
-class _FakeUsersShowResponse_53 extends _i1.SmartFake
-    implements _i5.UsersShowResponse {
-  _FakeUsersShowResponse_53(
+class _FakeUserDetailed_53 extends _i1.SmartFake implements _i5.UserDetailed {
+  _FakeUserDetailed_53(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -697,8 +697,9 @@ class _FakeHttpClientRequest_60 extends _i1.SmartFake
         );
 }
 
-class _FakeFile_61 extends _i1.SmartFake implements _i13.File {
-  _FakeFile_61(
+class _FakeWebSocketChannel_61 extends _i1.SmartFake
+    implements _i13.WebSocketChannel {
+  _FakeWebSocketChannel_61(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -707,8 +708,18 @@ class _FakeFile_61 extends _i1.SmartFake implements _i13.File {
         );
 }
 
-class _FakeFileInfo_62 extends _i1.SmartFake implements _i14.FileInfo {
-  _FakeFileInfo_62(
+class _FakeFile_62 extends _i1.SmartFake implements _i14.File {
+  _FakeFile_62(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeFileInfo_63 extends _i1.SmartFake implements _i15.FileInfo {
+  _FakeFileInfo_63(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -721,13 +732,13 @@ class _FakeFileInfo_62 extends _i1.SmartFake implements _i14.FileInfo {
 ///
 /// See the documentation for Mockito's code generation for more information.
 class MockTabSettingsRepository extends _i1.Mock
-    implements _i15.TabSettingsRepository {
+    implements _i16.TabSettingsRepository {
   @override
-  Iterable<_i16.TabSetting> get tabSettings => (super.noSuchMethod(
+  Iterable<_i17.TabSetting> get tabSettings => (super.noSuchMethod(
         Invocation.getter(#tabSettings),
-        returnValue: <_i16.TabSetting>[],
-        returnValueForMissingStub: <_i16.TabSetting>[],
-      ) as Iterable<_i16.TabSetting>);
+        returnValue: <_i17.TabSetting>[],
+        returnValueForMissingStub: <_i17.TabSetting>[],
+      ) as Iterable<_i17.TabSetting>);
 
   @override
   bool get hasListeners => (super.noSuchMethod(
@@ -737,49 +748,49 @@ class MockTabSettingsRepository extends _i1.Mock
       ) as bool);
 
   @override
-  _i17.Future<void> load() => (super.noSuchMethod(
+  _i18.Future<void> load() => (super.noSuchMethod(
         Invocation.method(
           #load,
           [],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> save(List<_i16.TabSetting>? tabSettings) =>
+  _i18.Future<void> save(List<_i17.TabSetting>? tabSettings) =>
       (super.noSuchMethod(
         Invocation.method(
           #save,
           [tabSettings],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> removeAccount(_i6.Account? account) => (super.noSuchMethod(
+  _i18.Future<void> removeAccount(_i6.Account? account) => (super.noSuchMethod(
         Invocation.method(
           #removeAccount,
           [account],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> initializeTabSettings(_i6.Account? account) =>
+  _i18.Future<void> initializeTabSettings(_i6.Account? account) =>
       (super.noSuchMethod(
         Invocation.method(
           #initializeTabSettings,
           [account],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  void addListener(_i18.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(_i19.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -788,7 +799,7 @@ class MockTabSettingsRepository extends _i1.Mock
       );
 
   @override
-  void removeListener(_i18.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(_i19.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -819,7 +830,7 @@ class MockTabSettingsRepository extends _i1.Mock
 ///
 /// See the documentation for Mockito's code generation for more information.
 class MockAccountSettingsRepository extends _i1.Mock
-    implements _i19.AccountSettingsRepository {
+    implements _i20.AccountSettingsRepository {
   @override
   Iterable<_i2.AccountSettings> get accountSettings => (super.noSuchMethod(
         Invocation.getter(#accountSettings),
@@ -835,37 +846,37 @@ class MockAccountSettingsRepository extends _i1.Mock
       ) as bool);
 
   @override
-  _i17.Future<void> load() => (super.noSuchMethod(
+  _i18.Future<void> load() => (super.noSuchMethod(
         Invocation.method(
           #load,
           [],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> save(_i2.AccountSettings? settings) => (super.noSuchMethod(
+  _i18.Future<void> save(_i2.AccountSettings? settings) => (super.noSuchMethod(
         Invocation.method(
           #save,
           [settings],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> removeAccount(_i6.Account? account) => (super.noSuchMethod(
+  _i18.Future<void> removeAccount(_i6.Account? account) => (super.noSuchMethod(
         Invocation.method(
           #removeAccount,
           [account],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i2.AccountSettings fromAcct(_i20.Acct? acct) => (super.noSuchMethod(
+  _i2.AccountSettings fromAcct(_i21.Acct? acct) => (super.noSuchMethod(
         Invocation.method(
           #fromAcct,
           [acct],
@@ -909,7 +920,7 @@ class MockAccountSettingsRepository extends _i1.Mock
       ) as _i2.AccountSettings);
 
   @override
-  void addListener(_i18.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(_i19.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -918,7 +929,7 @@ class MockAccountSettingsRepository extends _i1.Mock
       );
 
   @override
-  void removeListener(_i18.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(_i19.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -948,9 +959,9 @@ class MockAccountSettingsRepository extends _i1.Mock
 /// A class which mocks [EmojiRepository].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockEmojiRepository extends _i1.Mock implements _i21.EmojiRepository {
+class MockEmojiRepository extends _i1.Mock implements _i22.EmojiRepository {
   @override
-  set emoji(List<_i21.EmojiRepositoryData>? _emoji) => super.noSuchMethod(
+  set emoji(List<_i22.EmojiRepositoryData>? _emoji) => super.noSuchMethod(
         Invocation.setter(
           #emoji,
           _emoji,
@@ -959,37 +970,37 @@ class MockEmojiRepository extends _i1.Mock implements _i21.EmojiRepository {
       );
 
   @override
-  _i17.Future<void> loadFromSourceIfNeed() => (super.noSuchMethod(
+  _i18.Future<void> loadFromSourceIfNeed() => (super.noSuchMethod(
         Invocation.method(
           #loadFromSourceIfNeed,
           [],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> loadFromSource() => (super.noSuchMethod(
+  _i18.Future<void> loadFromSource() => (super.noSuchMethod(
         Invocation.method(
           #loadFromSource,
           [],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> loadFromLocalCache() => (super.noSuchMethod(
+  _i18.Future<void> loadFromLocalCache() => (super.noSuchMethod(
         Invocation.method(
           #loadFromLocalCache,
           [],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<List<_i22.MisskeyEmojiData>> searchEmojis(
+  _i18.Future<List<_i23.MisskeyEmojiData>> searchEmojis(
     String? name, {
     int? limit = 30,
   }) =>
@@ -999,31 +1010,31 @@ class MockEmojiRepository extends _i1.Mock implements _i21.EmojiRepository {
           [name],
           {#limit: limit},
         ),
-        returnValue: _i17.Future<List<_i22.MisskeyEmojiData>>.value(
-            <_i22.MisskeyEmojiData>[]),
+        returnValue: _i18.Future<List<_i23.MisskeyEmojiData>>.value(
+            <_i23.MisskeyEmojiData>[]),
         returnValueForMissingStub:
-            _i17.Future<List<_i22.MisskeyEmojiData>>.value(
-                <_i22.MisskeyEmojiData>[]),
-      ) as _i17.Future<List<_i22.MisskeyEmojiData>>);
+            _i18.Future<List<_i23.MisskeyEmojiData>>.value(
+                <_i23.MisskeyEmojiData>[]),
+      ) as _i18.Future<List<_i23.MisskeyEmojiData>>);
 
   @override
-  List<_i22.MisskeyEmojiData> defaultEmojis({int? limit}) =>
+  List<_i23.MisskeyEmojiData> defaultEmojis({int? limit}) =>
       (super.noSuchMethod(
         Invocation.method(
           #defaultEmojis,
           [],
           {#limit: limit},
         ),
-        returnValue: <_i22.MisskeyEmojiData>[],
-        returnValueForMissingStub: <_i22.MisskeyEmojiData>[],
-      ) as List<_i22.MisskeyEmojiData>);
+        returnValue: <_i23.MisskeyEmojiData>[],
+        returnValueForMissingStub: <_i23.MisskeyEmojiData>[],
+      ) as List<_i23.MisskeyEmojiData>);
 }
 
 /// A class which mocks [GeneralSettingsRepository].
 ///
 /// See the documentation for Mockito's code generation for more information.
 class MockGeneralSettingsRepository extends _i1.Mock
-    implements _i23.GeneralSettingsRepository {
+    implements _i24.GeneralSettingsRepository {
   @override
   _i3.GeneralSettings get settings => (super.noSuchMethod(
         Invocation.getter(#settings),
@@ -1045,28 +1056,28 @@ class MockGeneralSettingsRepository extends _i1.Mock
       ) as bool);
 
   @override
-  _i17.Future<void> load() => (super.noSuchMethod(
+  _i18.Future<void> load() => (super.noSuchMethod(
         Invocation.method(
           #load,
           [],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> update(_i3.GeneralSettings? settings) =>
+  _i18.Future<void> update(_i3.GeneralSettings? settings) =>
       (super.noSuchMethod(
         Invocation.method(
           #update,
           [settings],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  void addListener(_i18.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(_i19.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -1075,7 +1086,7 @@ class MockGeneralSettingsRepository extends _i1.Mock
       );
 
   @override
-  void removeListener(_i18.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(_i19.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -1105,7 +1116,7 @@ class MockGeneralSettingsRepository extends _i1.Mock
 /// A class which mocks [AccountRepository].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockAccountRepository extends _i1.Mock implements _i24.AccountRepository {
+class MockAccountRepository extends _i1.Mock implements _i25.AccountRepository {
   @override
   _i4.NotifierProviderRef<List<_i6.Account>> get ref => (super.noSuchMethod(
         Invocation.getter(#ref),
@@ -1147,48 +1158,48 @@ class MockAccountRepository extends _i1.Mock implements _i24.AccountRepository {
       ) as List<_i6.Account>);
 
   @override
-  _i17.Future<void> load() => (super.noSuchMethod(
+  _i18.Future<void> load() => (super.noSuchMethod(
         Invocation.method(
           #load,
           [],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> updateI(_i6.Account? account) => (super.noSuchMethod(
+  _i18.Future<void> updateI(_i6.Account? account) => (super.noSuchMethod(
         Invocation.method(
           #updateI,
           [account],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> updateMeta(_i6.Account? account) => (super.noSuchMethod(
+  _i18.Future<void> updateMeta(_i6.Account? account) => (super.noSuchMethod(
         Invocation.method(
           #updateMeta,
           [account],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> loadFromSourceIfNeed(_i20.Acct? acct) =>
+  _i18.Future<void> loadFromSourceIfNeed(_i21.Acct? acct) =>
       (super.noSuchMethod(
         Invocation.method(
           #loadFromSourceIfNeed,
           [acct],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> createUnreadAnnouncement(
+  _i18.Future<void> createUnreadAnnouncement(
     _i6.Account? account,
     _i5.AnnouncementsResponse? announcement,
   ) =>
@@ -1200,55 +1211,55 @@ class MockAccountRepository extends _i1.Mock implements _i24.AccountRepository {
             announcement,
           ],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> removeUnreadAnnouncement(_i6.Account? account) =>
+  _i18.Future<void> removeUnreadAnnouncement(_i6.Account? account) =>
       (super.noSuchMethod(
         Invocation.method(
           #removeUnreadAnnouncement,
           [account],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> addUnreadNotification(_i6.Account? account) =>
+  _i18.Future<void> addUnreadNotification(_i6.Account? account) =>
       (super.noSuchMethod(
         Invocation.method(
           #addUnreadNotification,
           [account],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> readAllNotification(_i6.Account? account) =>
+  _i18.Future<void> readAllNotification(_i6.Account? account) =>
       (super.noSuchMethod(
         Invocation.method(
           #readAllNotification,
           [account],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> remove(_i6.Account? account) => (super.noSuchMethod(
+  _i18.Future<void> remove(_i6.Account? account) => (super.noSuchMethod(
         Invocation.method(
           #remove,
           [account],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> loginAsPassword(
+  _i18.Future<void> loginAsPassword(
     String? server,
     String? userId,
     String? password,
@@ -1262,12 +1273,12 @@ class MockAccountRepository extends _i1.Mock implements _i24.AccountRepository {
             password,
           ],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> loginAsToken(
+  _i18.Future<void> loginAsToken(
     String? server,
     String? token,
   ) =>
@@ -1279,32 +1290,32 @@ class MockAccountRepository extends _i1.Mock implements _i24.AccountRepository {
             token,
           ],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> openMiAuth(String? server) => (super.noSuchMethod(
+  _i18.Future<void> openMiAuth(String? server) => (super.noSuchMethod(
         Invocation.method(
           #openMiAuth,
           [server],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> validateMiAuth(String? server) => (super.noSuchMethod(
+  _i18.Future<void> validateMiAuth(String? server) => (super.noSuchMethod(
         Invocation.method(
           #validateMiAuth,
           [server],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> reorder(
+  _i18.Future<void> reorder(
     int? oldIndex,
     int? newIndex,
   ) =>
@@ -1316,9 +1327,9 @@ class MockAccountRepository extends _i1.Mock implements _i24.AccountRepository {
             newIndex,
           ],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
   bool updateShouldNotify(
@@ -1341,7 +1352,7 @@ class MockAccountRepository extends _i1.Mock implements _i24.AccountRepository {
 /// A class which mocks [NoteRepository].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockNoteRepository extends _i1.Mock implements _i25.NoteRepository {
+class MockNoteRepository extends _i1.Mock implements _i26.NoteRepository {
   @override
   _i5.Misskey get misskey => (super.noSuchMethod(
         Invocation.getter(#misskey),
@@ -1404,11 +1415,11 @@ class MockNoteRepository extends _i1.Mock implements _i25.NoteRepository {
       ) as Map<String, _i5.Note>);
 
   @override
-  Map<String, _i25.NoteStatus> get noteStatuses => (super.noSuchMethod(
+  Map<String, _i26.NoteStatus> get noteStatuses => (super.noSuchMethod(
         Invocation.getter(#noteStatuses),
-        returnValue: <String, _i25.NoteStatus>{},
-        returnValueForMissingStub: <String, _i25.NoteStatus>{},
-      ) as Map<String, _i25.NoteStatus>);
+        returnValue: <String, _i26.NoteStatus>{},
+        returnValueForMissingStub: <String, _i26.NoteStatus>{},
+      ) as Map<String, _i26.NoteStatus>);
 
   @override
   bool get hasListeners => (super.noSuchMethod(
@@ -1436,7 +1447,7 @@ class MockNoteRepository extends _i1.Mock implements _i25.NoteRepository {
   @override
   void updateNoteStatus(
     String? id,
-    _i25.NoteStatus Function(_i25.NoteStatus)? statusPredicate, {
+    _i26.NoteStatus Function(_i26.NoteStatus)? statusPredicate, {
     bool? isNotify = true,
   }) =>
       super.noSuchMethod(
@@ -1470,14 +1481,14 @@ class MockNoteRepository extends _i1.Mock implements _i25.NoteRepository {
       );
 
   @override
-  _i17.Future<void> refresh(String? noteId) => (super.noSuchMethod(
+  _i18.Future<void> refresh(String? noteId) => (super.noSuchMethod(
         Invocation.method(
           #refresh,
           [noteId],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
   void delete(String? noteId) => super.noSuchMethod(
@@ -1489,7 +1500,7 @@ class MockNoteRepository extends _i1.Mock implements _i25.NoteRepository {
       );
 
   @override
-  void addListener(_i18.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(_i19.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -1498,7 +1509,7 @@ class MockNoteRepository extends _i1.Mock implements _i25.NoteRepository {
       );
 
   @override
-  void removeListener(_i18.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(_i19.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -1532,11 +1543,11 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey {
   @override
   String get host => (super.noSuchMethod(
         Invocation.getter(#host),
-        returnValue: _i26.dummyValue<String>(
+        returnValue: _i27.dummyValue<String>(
           this,
           Invocation.getter(#host),
         ),
-        returnValueForMissingStub: _i26.dummyValue<String>(
+        returnValueForMissingStub: _i27.dummyValue<String>(
           this,
           Invocation.getter(#host),
         ),
@@ -1962,38 +1973,38 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey {
       );
 
   @override
-  _i17.Future<Iterable<_i5.AnnouncementsResponse>> announcements(
+  _i18.Future<Iterable<_i5.AnnouncementsResponse>> announcements(
           _i5.AnnouncementsRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #announcements,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.AnnouncementsResponse>>.value(
+        returnValue: _i18.Future<Iterable<_i5.AnnouncementsResponse>>.value(
             <_i5.AnnouncementsResponse>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.AnnouncementsResponse>>.value(
+            _i18.Future<Iterable<_i5.AnnouncementsResponse>>.value(
                 <_i5.AnnouncementsResponse>[]),
-      ) as _i17.Future<Iterable<_i5.AnnouncementsResponse>>);
+      ) as _i18.Future<Iterable<_i5.AnnouncementsResponse>>);
 
   @override
-  _i17.Future<List<String>> endpoints() => (super.noSuchMethod(
+  _i18.Future<List<String>> endpoints() => (super.noSuchMethod(
         Invocation.method(
           #endpoints,
           [],
         ),
-        returnValue: _i17.Future<List<String>>.value(<String>[]),
-        returnValueForMissingStub: _i17.Future<List<String>>.value(<String>[]),
-      ) as _i17.Future<List<String>>);
+        returnValue: _i18.Future<List<String>>.value(<String>[]),
+        returnValueForMissingStub: _i18.Future<List<String>>.value(<String>[]),
+      ) as _i18.Future<List<String>>);
 
   @override
-  _i17.Future<_i5.EmojisResponse> emojis() => (super.noSuchMethod(
+  _i18.Future<_i5.EmojisResponse> emojis() => (super.noSuchMethod(
         Invocation.method(
           #emojis,
           [],
         ),
         returnValue:
-            _i17.Future<_i5.EmojisResponse>.value(_FakeEmojisResponse_24(
+            _i18.Future<_i5.EmojisResponse>.value(_FakeEmojisResponse_24(
           this,
           Invocation.method(
             #emojis,
@@ -2001,23 +2012,23 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i5.EmojisResponse>.value(_FakeEmojisResponse_24(
+            _i18.Future<_i5.EmojisResponse>.value(_FakeEmojisResponse_24(
           this,
           Invocation.method(
             #emojis,
             [],
           ),
         )),
-      ) as _i17.Future<_i5.EmojisResponse>);
+      ) as _i18.Future<_i5.EmojisResponse>);
 
   @override
-  _i17.Future<_i5.EmojiResponse> emoji(_i5.EmojiRequest? request) =>
+  _i18.Future<_i5.EmojiResponse> emoji(_i5.EmojiRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #emoji,
           [request],
         ),
-        returnValue: _i17.Future<_i5.EmojiResponse>.value(_FakeEmojiResponse_25(
+        returnValue: _i18.Future<_i5.EmojiResponse>.value(_FakeEmojiResponse_25(
           this,
           Invocation.method(
             #emoji,
@@ -2025,22 +2036,22 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i5.EmojiResponse>.value(_FakeEmojiResponse_25(
+            _i18.Future<_i5.EmojiResponse>.value(_FakeEmojiResponse_25(
           this,
           Invocation.method(
             #emoji,
             [request],
           ),
         )),
-      ) as _i17.Future<_i5.EmojiResponse>);
+      ) as _i18.Future<_i5.EmojiResponse>);
 
   @override
-  _i17.Future<_i5.MetaResponse> meta() => (super.noSuchMethod(
+  _i18.Future<_i5.MetaResponse> meta() => (super.noSuchMethod(
         Invocation.method(
           #meta,
           [],
         ),
-        returnValue: _i17.Future<_i5.MetaResponse>.value(_FakeMetaResponse_26(
+        returnValue: _i18.Future<_i5.MetaResponse>.value(_FakeMetaResponse_26(
           this,
           Invocation.method(
             #meta,
@@ -2048,22 +2059,22 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i5.MetaResponse>.value(_FakeMetaResponse_26(
+            _i18.Future<_i5.MetaResponse>.value(_FakeMetaResponse_26(
           this,
           Invocation.method(
             #meta,
             [],
           ),
         )),
-      ) as _i17.Future<_i5.MetaResponse>);
+      ) as _i18.Future<_i5.MetaResponse>);
 
   @override
-  _i17.Future<_i9.StatsResponse> stats() => (super.noSuchMethod(
+  _i18.Future<_i9.StatsResponse> stats() => (super.noSuchMethod(
         Invocation.method(
           #stats,
           [],
         ),
-        returnValue: _i17.Future<_i9.StatsResponse>.value(_FakeStatsResponse_27(
+        returnValue: _i18.Future<_i9.StatsResponse>.value(_FakeStatsResponse_27(
           this,
           Invocation.method(
             #stats,
@@ -2071,22 +2082,22 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i9.StatsResponse>.value(_FakeStatsResponse_27(
+            _i18.Future<_i9.StatsResponse>.value(_FakeStatsResponse_27(
           this,
           Invocation.method(
             #stats,
             [],
           ),
         )),
-      ) as _i17.Future<_i9.StatsResponse>);
+      ) as _i18.Future<_i9.StatsResponse>);
 
   @override
-  _i17.Future<_i10.PingResponse> ping() => (super.noSuchMethod(
+  _i18.Future<_i10.PingResponse> ping() => (super.noSuchMethod(
         Invocation.method(
           #ping,
           [],
         ),
-        returnValue: _i17.Future<_i10.PingResponse>.value(_FakePingResponse_28(
+        returnValue: _i18.Future<_i10.PingResponse>.value(_FakePingResponse_28(
           this,
           Invocation.method(
             #ping,
@@ -2094,22 +2105,22 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i10.PingResponse>.value(_FakePingResponse_28(
+            _i18.Future<_i10.PingResponse>.value(_FakePingResponse_28(
           this,
           Invocation.method(
             #ping,
             [],
           ),
         )),
-      ) as _i17.Future<_i10.PingResponse>);
+      ) as _i18.Future<_i10.PingResponse>);
 
   @override
-  _i17.Future<_i5.ServerInfoResponse> serverInfo() => (super.noSuchMethod(
+  _i18.Future<_i5.ServerInfoResponse> serverInfo() => (super.noSuchMethod(
         Invocation.method(
           #serverInfo,
           [],
         ),
-        returnValue: _i17.Future<_i5.ServerInfoResponse>.value(
+        returnValue: _i18.Future<_i5.ServerInfoResponse>.value(
             _FakeServerInfoResponse_29(
           this,
           Invocation.method(
@@ -2117,7 +2128,7 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey {
             [],
           ),
         )),
-        returnValueForMissingStub: _i17.Future<_i5.ServerInfoResponse>.value(
+        returnValueForMissingStub: _i18.Future<_i5.ServerInfoResponse>.value(
             _FakeServerInfoResponse_29(
           this,
           Invocation.method(
@@ -2125,16 +2136,16 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey {
             [],
           ),
         )),
-      ) as _i17.Future<_i5.ServerInfoResponse>);
+      ) as _i18.Future<_i5.ServerInfoResponse>);
 
   @override
-  _i17.Future<_i5.GetOnlineUsersCountResponse> getOnlineUsersCount() =>
+  _i18.Future<_i5.GetOnlineUsersCountResponse> getOnlineUsersCount() =>
       (super.noSuchMethod(
         Invocation.method(
           #getOnlineUsersCount,
           [],
         ),
-        returnValue: _i17.Future<_i5.GetOnlineUsersCountResponse>.value(
+        returnValue: _i18.Future<_i5.GetOnlineUsersCountResponse>.value(
             _FakeGetOnlineUsersCountResponse_30(
           this,
           Invocation.method(
@@ -2143,7 +2154,7 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i5.GetOnlineUsersCountResponse>.value(
+            _i18.Future<_i5.GetOnlineUsersCountResponse>.value(
                 _FakeGetOnlineUsersCountResponse_30(
           this,
           Invocation.method(
@@ -2151,55 +2162,56 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey {
             [],
           ),
         )),
-      ) as _i17.Future<_i5.GetOnlineUsersCountResponse>);
+      ) as _i18.Future<_i5.GetOnlineUsersCountResponse>);
 
   @override
-  _i17.Future<Iterable<_i5.GetAvatarDecorationsResponse>>
+  _i18.Future<Iterable<_i5.GetAvatarDecorationsResponse>>
       getAvatarDecorations() => (super.noSuchMethod(
             Invocation.method(
               #getAvatarDecorations,
               [],
             ),
             returnValue:
-                _i17.Future<Iterable<_i5.GetAvatarDecorationsResponse>>.value(
+                _i18.Future<Iterable<_i5.GetAvatarDecorationsResponse>>.value(
                     <_i5.GetAvatarDecorationsResponse>[]),
             returnValueForMissingStub:
-                _i17.Future<Iterable<_i5.GetAvatarDecorationsResponse>>.value(
+                _i18.Future<Iterable<_i5.GetAvatarDecorationsResponse>>.value(
                     <_i5.GetAvatarDecorationsResponse>[]),
-          ) as _i17.Future<Iterable<_i5.GetAvatarDecorationsResponse>>);
+          ) as _i18.Future<Iterable<_i5.GetAvatarDecorationsResponse>>);
 
   @override
-  _i17.Future<Iterable<_i5.User>> pinnedUsers() => (super.noSuchMethod(
+  _i18.Future<Iterable<_i5.UserDetailed>> pinnedUsers() => (super.noSuchMethod(
         Invocation.method(
           #pinnedUsers,
           [],
         ),
-        returnValue: _i17.Future<Iterable<_i5.User>>.value(<_i5.User>[]),
+        returnValue:
+            _i18.Future<Iterable<_i5.UserDetailed>>.value(<_i5.UserDetailed>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.User>>.value(<_i5.User>[]),
-      ) as _i17.Future<Iterable<_i5.User>>);
+            _i18.Future<Iterable<_i5.UserDetailed>>.value(<_i5.UserDetailed>[]),
+      ) as _i18.Future<Iterable<_i5.UserDetailed>>);
 
   @override
   _i5.SocketController homeTimelineStream({
     required _i5.HomeTimelineParameter? parameter,
-    _i17.FutureOr<void> Function(_i5.Note)? onNoteReceived,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(_i5.Note)? onNoteReceived,
+    _i18.FutureOr<void> Function(
       String,
       _i5.TimelineReacted,
     )? onReacted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       _i5.TimelineReacted,
     )? onUnreacted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       DateTime,
     )? onDeleted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       _i5.TimelineVoted,
     )? onVoted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       _i5.NoteEdited,
     )? onUpdated,
@@ -2255,24 +2267,24 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey {
   @override
   _i5.SocketController localTimelineStream({
     required _i5.LocalTimelineParameter? parameter,
-    _i17.FutureOr<void> Function(_i5.Note)? onNoteReceived,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(_i5.Note)? onNoteReceived,
+    _i18.FutureOr<void> Function(
       String,
       _i5.TimelineReacted,
     )? onReacted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       _i5.TimelineReacted,
     )? onUnreacted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       DateTime,
     )? onDeleted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       _i5.TimelineVoted,
     )? onVoted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       _i5.NoteEdited,
     )? onUpdated,
@@ -2328,24 +2340,24 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey {
   @override
   _i5.SocketController globalTimelineStream({
     required _i5.GlobalTimelineParameter? parameter,
-    _i17.FutureOr<void> Function(_i5.Note)? onNoteReceived,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(_i5.Note)? onNoteReceived,
+    _i18.FutureOr<void> Function(
       String,
       _i5.TimelineReacted,
     )? onReacted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       _i5.TimelineReacted,
     )? onUnreacted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       DateTime,
     )? onDeleted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       _i5.TimelineVoted,
     )? onVoted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       _i5.NoteEdited,
     )? onUpdated,
@@ -2401,24 +2413,24 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey {
   @override
   _i5.SocketController hybridTimelineStream({
     required _i5.HybridTimelineParameter? parameter,
-    _i17.FutureOr<void> Function(_i5.Note)? onNoteReceived,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(_i5.Note)? onNoteReceived,
+    _i18.FutureOr<void> Function(
       String,
       _i5.TimelineReacted,
     )? onReacted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       _i5.TimelineReacted,
     )? onUnreacted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       DateTime,
     )? onDeleted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       _i5.TimelineVoted,
     )? onVoted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       _i5.NoteEdited,
     )? onUpdated,
@@ -2474,24 +2486,24 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey {
   @override
   _i5.SocketController roleTimelineStream({
     required String? roleId,
-    _i17.FutureOr<void> Function(_i5.Note)? onNoteReceived,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(_i5.Note)? onNoteReceived,
+    _i18.FutureOr<void> Function(
       String,
       _i5.TimelineReacted,
     )? onReacted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       _i5.TimelineReacted,
     )? onUnreacted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       DateTime,
     )? onDeleted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       _i5.TimelineVoted,
     )? onVoted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       _i5.NoteEdited,
     )? onUpdated,
@@ -2547,24 +2559,24 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey {
   @override
   _i5.SocketController channelStream({
     required String? channelId,
-    _i17.FutureOr<void> Function(_i5.Note)? onNoteReceived,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(_i5.Note)? onNoteReceived,
+    _i18.FutureOr<void> Function(
       String,
       _i5.TimelineReacted,
     )? onReacted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       _i5.TimelineReacted,
     )? onUnreacted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       DateTime,
     )? onDeleted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       _i5.TimelineVoted,
     )? onVoted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       _i5.NoteEdited,
     )? onUpdated,
@@ -2620,23 +2632,23 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey {
   @override
   _i5.SocketController userListStream({
     required String? listId,
-    _i17.FutureOr<void> Function(_i5.Note)? onNoteReceived,
-    _i17.FutureOr<void> Function(_i5.User)? onUserAdded,
-    _i17.FutureOr<void> Function(_i5.User)? onUserRemoved,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(_i5.Note)? onNoteReceived,
+    _i18.FutureOr<void> Function(_i5.UserLite)? onUserAdded,
+    _i18.FutureOr<void> Function(_i5.UserLite)? onUserRemoved,
+    _i18.FutureOr<void> Function(
       String,
       _i5.TimelineReacted,
     )? onReacted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       _i5.TimelineReacted,
     )? onUnreacted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       _i5.NoteEdited,
     )? onUpdated,
-    _i17.FutureOr<void> Function(DateTime)? onDeleted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(DateTime)? onDeleted,
+    _i18.FutureOr<void> Function(
       String,
       _i5.TimelineVoted,
     )? onVoted,
@@ -2698,24 +2710,24 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey {
   @override
   _i5.SocketController antennaStream({
     required String? antennaId,
-    _i17.FutureOr<void> Function(_i5.Note)? onNoteReceived,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(_i5.Note)? onNoteReceived,
+    _i18.FutureOr<void> Function(
       String,
       _i5.TimelineReacted,
     )? onReacted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       _i5.TimelineReacted,
     )? onUnreacted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       DateTime,
     )? onDeleted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       _i5.TimelineVoted,
     )? onVoted,
-    _i17.FutureOr<void> Function(
+    _i18.FutureOr<void> Function(
       String,
       _i5.NoteEdited,
     )? onUpdated,
@@ -2770,8 +2782,8 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey {
 
   @override
   _i5.SocketController serverStatsLogStream(
-    _i17.FutureOr<void> Function(List<_i5.StatsLogResponse>)? onLogReceived,
-    _i17.FutureOr<void> Function(_i5.StatsLogResponse)? onEventReceived,
+    _i18.FutureOr<void> Function(List<_i5.StatsLogResponse>)? onLogReceived,
+    _i18.FutureOr<void> Function(_i5.StatsLogResponse)? onEventReceived,
   ) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -2805,9 +2817,9 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey {
 
   @override
   _i5.SocketController queueStatsLogStream(
-    _i17.FutureOr<void> Function(List<_i5.QueueStatsLogResponse>)?
+    _i18.FutureOr<void> Function(List<_i5.QueueStatsLogResponse>)?
         onLogReceived,
-    _i17.FutureOr<void> Function(_i5.QueueStatsLogResponse)? onEventReceived,
+    _i18.FutureOr<void> Function(_i5.QueueStatsLogResponse)? onEventReceived,
   ) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -2841,28 +2853,28 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey {
 
   @override
   _i5.SocketController mainStream({
-    _i17.FutureOr<void> Function(_i5.Emoji)? onEmojiAdded,
-    _i17.FutureOr<void> Function(Iterable<_i5.Emoji>)? onEmojiUpdated,
-    _i17.FutureOr<void> Function(Iterable<_i5.Emoji>)? onEmojiDeleted,
-    _i17.FutureOr<void> Function(_i5.AnnouncementsResponse)?
+    _i18.FutureOr<void> Function(_i5.Emoji)? onEmojiAdded,
+    _i18.FutureOr<void> Function(Iterable<_i5.Emoji>)? onEmojiUpdated,
+    _i18.FutureOr<void> Function(Iterable<_i5.Emoji>)? onEmojiDeleted,
+    _i18.FutureOr<void> Function(_i5.AnnouncementsResponse)?
         onAnnouncementCreated,
-    _i17.FutureOr<void> Function(_i5.INotificationsResponse)? onNotification,
-    _i17.FutureOr<void> Function(_i5.Note)? onMention,
-    _i17.FutureOr<void> Function(_i5.Note)? onReply,
-    _i17.FutureOr<void> Function(_i5.Note)? onRenote,
-    _i17.FutureOr<void> Function(_i5.User)? onFollow,
-    _i17.FutureOr<void> Function(_i5.User)? onFollowed,
-    _i17.FutureOr<void> Function(_i5.User)? onUnfollow,
-    _i17.FutureOr<void> Function(_i5.User)? onMeUpdated,
-    _i17.FutureOr<void> Function()? onReadAllNotifications,
-    _i17.FutureOr<void> Function(_i5.INotificationsResponse)?
+    _i18.FutureOr<void> Function(_i5.INotificationsResponse)? onNotification,
+    _i18.FutureOr<void> Function(_i5.Note)? onMention,
+    _i18.FutureOr<void> Function(_i5.Note)? onReply,
+    _i18.FutureOr<void> Function(_i5.Note)? onRenote,
+    _i18.FutureOr<void> Function(_i5.UserDetailedNotMe)? onFollow,
+    _i18.FutureOr<void> Function(_i5.UserLite)? onFollowed,
+    _i18.FutureOr<void> Function(_i5.UserDetailedNotMe)? onUnfollow,
+    _i18.FutureOr<void> Function(_i5.MeDetailed)? onMeUpdated,
+    _i18.FutureOr<void> Function()? onReadAllNotifications,
+    _i18.FutureOr<void> Function(_i5.INotificationsResponse)?
         onUnreadNotification,
-    _i17.FutureOr<void> Function(String)? onUnreadMention,
-    _i17.FutureOr<void> Function()? onReadAllUnreadMentions,
-    _i17.FutureOr<void> Function(String)? onUnreadSpecifiedNote,
-    _i17.FutureOr<void> Function()? onReadAllUnreadSpecifiedNotes,
-    _i17.FutureOr<void> Function(_i5.User)? onReceiveFollowRequest,
-    _i17.FutureOr<void> Function()? onReadAllAnnouncements,
+    _i18.FutureOr<void> Function(String)? onUnreadMention,
+    _i18.FutureOr<void> Function()? onReadAllUnreadMentions,
+    _i18.FutureOr<void> Function(String)? onUnreadSpecifiedNote,
+    _i18.FutureOr<void> Function()? onReadAllUnreadSpecifiedNotes,
+    _i18.FutureOr<void> Function(_i5.UserLite)? onReceiveFollowRequest,
+    _i18.FutureOr<void> Function()? onReadAllAnnouncements,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -2952,14 +2964,14 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey {
       ) as _i5.SocketController);
 
   @override
-  _i17.Future<void> startStreaming() => (super.noSuchMethod(
+  _i18.Future<void> startStreaming() => (super.noSuchMethod(
         Invocation.method(
           #startStreaming,
           [],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 }
 
 /// A class which mocks [MisskeyAntenna].
@@ -2967,13 +2979,13 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey {
 /// See the documentation for Mockito's code generation for more information.
 class MockMisskeyAntenna extends _i1.Mock implements _i5.MisskeyAntenna {
   @override
-  _i17.Future<_i5.Antenna> create(_i5.AntennasCreateRequest? request) =>
+  _i18.Future<_i5.Antenna> create(_i5.AntennasCreateRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #create,
           [request],
         ),
-        returnValue: _i17.Future<_i5.Antenna>.value(_FakeAntenna_32(
+        returnValue: _i18.Future<_i5.Antenna>.value(_FakeAntenna_32(
           this,
           Invocation.method(
             #create,
@@ -2981,57 +2993,57 @@ class MockMisskeyAntenna extends _i1.Mock implements _i5.MisskeyAntenna {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i5.Antenna>.value(_FakeAntenna_32(
+            _i18.Future<_i5.Antenna>.value(_FakeAntenna_32(
           this,
           Invocation.method(
             #create,
             [request],
           ),
         )),
-      ) as _i17.Future<_i5.Antenna>);
+      ) as _i18.Future<_i5.Antenna>);
 
   @override
-  _i17.Future<void> delete(_i5.AntennasDeleteRequest? request) =>
+  _i18.Future<void> delete(_i5.AntennasDeleteRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #delete,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<Iterable<_i5.Antenna>> list() => (super.noSuchMethod(
+  _i18.Future<Iterable<_i5.Antenna>> list() => (super.noSuchMethod(
         Invocation.method(
           #list,
           [],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Antenna>>.value(<_i5.Antenna>[]),
+        returnValue: _i18.Future<Iterable<_i5.Antenna>>.value(<_i5.Antenna>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Antenna>>.value(<_i5.Antenna>[]),
-      ) as _i17.Future<Iterable<_i5.Antenna>>);
+            _i18.Future<Iterable<_i5.Antenna>>.value(<_i5.Antenna>[]),
+      ) as _i18.Future<Iterable<_i5.Antenna>>);
 
   @override
-  _i17.Future<Iterable<_i5.Note>> notes(_i5.AntennasNotesRequest? request) =>
+  _i18.Future<Iterable<_i5.Note>> notes(_i5.AntennasNotesRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #notes,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+        returnValue: _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
-      ) as _i17.Future<Iterable<_i5.Note>>);
+            _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+      ) as _i18.Future<Iterable<_i5.Note>>);
 
   @override
-  _i17.Future<_i5.Antenna> show(_i5.AntennasShowRequest? request) =>
+  _i18.Future<_i5.Antenna> show(_i5.AntennasShowRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #show,
           [request],
         ),
-        returnValue: _i17.Future<_i5.Antenna>.value(_FakeAntenna_32(
+        returnValue: _i18.Future<_i5.Antenna>.value(_FakeAntenna_32(
           this,
           Invocation.method(
             #show,
@@ -3039,25 +3051,25 @@ class MockMisskeyAntenna extends _i1.Mock implements _i5.MisskeyAntenna {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i5.Antenna>.value(_FakeAntenna_32(
+            _i18.Future<_i5.Antenna>.value(_FakeAntenna_32(
           this,
           Invocation.method(
             #show,
             [request],
           ),
         )),
-      ) as _i17.Future<_i5.Antenna>);
+      ) as _i18.Future<_i5.Antenna>);
 
   @override
-  _i17.Future<void> update(_i5.AntennasUpdateRequest? request) =>
+  _i18.Future<void> update(_i5.AntennasUpdateRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #update,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 }
 
 /// A class which mocks [MisskeyAp].
@@ -3065,14 +3077,14 @@ class MockMisskeyAntenna extends _i1.Mock implements _i5.MisskeyAntenna {
 /// See the documentation for Mockito's code generation for more information.
 class MockMisskeyAp extends _i1.Mock implements _i5.MisskeyAp {
   @override
-  _i17.Future<_i5.ApShowResponse> show(_i5.ApShowRequest? request) =>
+  _i18.Future<_i5.ApShowResponse> show(_i5.ApShowRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #show,
           [request],
         ),
         returnValue:
-            _i17.Future<_i5.ApShowResponse>.value(_FakeApShowResponse_33(
+            _i18.Future<_i5.ApShowResponse>.value(_FakeApShowResponse_33(
           this,
           Invocation.method(
             #show,
@@ -3080,14 +3092,14 @@ class MockMisskeyAp extends _i1.Mock implements _i5.MisskeyAp {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i5.ApShowResponse>.value(_FakeApShowResponse_33(
+            _i18.Future<_i5.ApShowResponse>.value(_FakeApShowResponse_33(
           this,
           Invocation.method(
             #show,
             [request],
           ),
         )),
-      ) as _i17.Future<_i5.ApShowResponse>);
+      ) as _i18.Future<_i5.ApShowResponse>);
 }
 
 /// A class which mocks [MisskeyBlocking].
@@ -3095,26 +3107,26 @@ class MockMisskeyAp extends _i1.Mock implements _i5.MisskeyAp {
 /// See the documentation for Mockito's code generation for more information.
 class MockMisskeyBlocking extends _i1.Mock implements _i5.MisskeyBlocking {
   @override
-  _i17.Future<void> create(_i5.BlockCreateRequest? request) =>
+  _i18.Future<void> create(_i5.BlockCreateRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #create,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> delete(_i5.BlockDeleteRequest? request) =>
+  _i18.Future<void> delete(_i5.BlockDeleteRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #delete,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 }
 
 /// A class which mocks [MisskeyChannels].
@@ -3122,27 +3134,27 @@ class MockMisskeyBlocking extends _i1.Mock implements _i5.MisskeyBlocking {
 /// See the documentation for Mockito's code generation for more information.
 class MockMisskeyChannels extends _i1.Mock implements _i5.MisskeyChannels {
   @override
-  _i17.Future<Iterable<_i5.Note>> timeline(
+  _i18.Future<Iterable<_i5.Note>> timeline(
           _i5.ChannelsTimelineRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #timeline,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+        returnValue: _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
-      ) as _i17.Future<Iterable<_i5.Note>>);
+            _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+      ) as _i18.Future<Iterable<_i5.Note>>);
 
   @override
-  _i17.Future<_i5.CommunityChannel> show(_i5.ChannelsShowRequest? request) =>
+  _i18.Future<_i5.CommunityChannel> show(_i5.ChannelsShowRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #show,
           [request],
         ),
         returnValue:
-            _i17.Future<_i5.CommunityChannel>.value(_FakeCommunityChannel_34(
+            _i18.Future<_i5.CommunityChannel>.value(_FakeCommunityChannel_34(
           this,
           Invocation.method(
             #show,
@@ -3150,90 +3162,90 @@ class MockMisskeyChannels extends _i1.Mock implements _i5.MisskeyChannels {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i5.CommunityChannel>.value(_FakeCommunityChannel_34(
+            _i18.Future<_i5.CommunityChannel>.value(_FakeCommunityChannel_34(
           this,
           Invocation.method(
             #show,
             [request],
           ),
         )),
-      ) as _i17.Future<_i5.CommunityChannel>);
+      ) as _i18.Future<_i5.CommunityChannel>);
 
   @override
-  _i17.Future<Iterable<_i5.CommunityChannel>> followed(
+  _i18.Future<Iterable<_i5.CommunityChannel>> followed(
           _i5.ChannelsFollowedRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #followed,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.CommunityChannel>>.value(
+        returnValue: _i18.Future<Iterable<_i5.CommunityChannel>>.value(
             <_i5.CommunityChannel>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.CommunityChannel>>.value(
+            _i18.Future<Iterable<_i5.CommunityChannel>>.value(
                 <_i5.CommunityChannel>[]),
-      ) as _i17.Future<Iterable<_i5.CommunityChannel>>);
+      ) as _i18.Future<Iterable<_i5.CommunityChannel>>);
 
   @override
-  _i17.Future<Iterable<_i5.CommunityChannel>> myFavorite(
+  _i18.Future<Iterable<_i5.CommunityChannel>> myFavorite(
           _i5.ChannelsMyFavoriteRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #myFavorite,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.CommunityChannel>>.value(
+        returnValue: _i18.Future<Iterable<_i5.CommunityChannel>>.value(
             <_i5.CommunityChannel>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.CommunityChannel>>.value(
+            _i18.Future<Iterable<_i5.CommunityChannel>>.value(
                 <_i5.CommunityChannel>[]),
-      ) as _i17.Future<Iterable<_i5.CommunityChannel>>);
+      ) as _i18.Future<Iterable<_i5.CommunityChannel>>);
 
   @override
-  _i17.Future<Iterable<_i5.CommunityChannel>> featured() => (super.noSuchMethod(
+  _i18.Future<Iterable<_i5.CommunityChannel>> featured() => (super.noSuchMethod(
         Invocation.method(
           #featured,
           [],
         ),
-        returnValue: _i17.Future<Iterable<_i5.CommunityChannel>>.value(
+        returnValue: _i18.Future<Iterable<_i5.CommunityChannel>>.value(
             <_i5.CommunityChannel>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.CommunityChannel>>.value(
+            _i18.Future<Iterable<_i5.CommunityChannel>>.value(
                 <_i5.CommunityChannel>[]),
-      ) as _i17.Future<Iterable<_i5.CommunityChannel>>);
+      ) as _i18.Future<Iterable<_i5.CommunityChannel>>);
 
   @override
-  _i17.Future<Iterable<_i5.CommunityChannel>> owned(
+  _i18.Future<Iterable<_i5.CommunityChannel>> owned(
           _i5.ChannelsOwnedRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #owned,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.CommunityChannel>>.value(
+        returnValue: _i18.Future<Iterable<_i5.CommunityChannel>>.value(
             <_i5.CommunityChannel>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.CommunityChannel>>.value(
+            _i18.Future<Iterable<_i5.CommunityChannel>>.value(
                 <_i5.CommunityChannel>[]),
-      ) as _i17.Future<Iterable<_i5.CommunityChannel>>);
+      ) as _i18.Future<Iterable<_i5.CommunityChannel>>);
 
   @override
-  _i17.Future<Iterable<_i5.CommunityChannel>> search(
+  _i18.Future<Iterable<_i5.CommunityChannel>> search(
           _i5.ChannelsSearchRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #search,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.CommunityChannel>>.value(
+        returnValue: _i18.Future<Iterable<_i5.CommunityChannel>>.value(
             <_i5.CommunityChannel>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.CommunityChannel>>.value(
+            _i18.Future<Iterable<_i5.CommunityChannel>>.value(
                 <_i5.CommunityChannel>[]),
-      ) as _i17.Future<Iterable<_i5.CommunityChannel>>);
+      ) as _i18.Future<Iterable<_i5.CommunityChannel>>);
 
   @override
-  _i17.Future<_i5.CommunityChannel> create(
+  _i18.Future<_i5.CommunityChannel> create(
           _i5.ChannelsCreateRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -3241,7 +3253,7 @@ class MockMisskeyChannels extends _i1.Mock implements _i5.MisskeyChannels {
           [request],
         ),
         returnValue:
-            _i17.Future<_i5.CommunityChannel>.value(_FakeCommunityChannel_34(
+            _i18.Future<_i5.CommunityChannel>.value(_FakeCommunityChannel_34(
           this,
           Invocation.method(
             #create,
@@ -3249,69 +3261,69 @@ class MockMisskeyChannels extends _i1.Mock implements _i5.MisskeyChannels {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i5.CommunityChannel>.value(_FakeCommunityChannel_34(
+            _i18.Future<_i5.CommunityChannel>.value(_FakeCommunityChannel_34(
           this,
           Invocation.method(
             #create,
             [request],
           ),
         )),
-      ) as _i17.Future<_i5.CommunityChannel>);
+      ) as _i18.Future<_i5.CommunityChannel>);
 
   @override
-  _i17.Future<void> update(_i5.ChannelsUpdateRequest? request) =>
+  _i18.Future<void> update(_i5.ChannelsUpdateRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #update,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> favorite(_i5.ChannelsFavoriteRequest? request) =>
+  _i18.Future<void> favorite(_i5.ChannelsFavoriteRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #favorite,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> unfavorite(_i5.ChannelsUnfavoriteRequest? request) =>
+  _i18.Future<void> unfavorite(_i5.ChannelsUnfavoriteRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #unfavorite,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> follow(_i5.ChannelsFollowRequest? request) =>
+  _i18.Future<void> follow(_i5.ChannelsFollowRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #follow,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> unfollow(_i5.ChannelsUnfollowRequest? request) =>
+  _i18.Future<void> unfollow(_i5.ChannelsUnfollowRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #unfollow,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 }
 
 /// A class which mocks [MisskeyClips].
@@ -3319,162 +3331,162 @@ class MockMisskeyChannels extends _i1.Mock implements _i5.MisskeyChannels {
 /// See the documentation for Mockito's code generation for more information.
 class MockMisskeyClips extends _i1.Mock implements _i5.MisskeyClips {
   @override
-  _i17.Future<Iterable<_i5.Clip>> list() => (super.noSuchMethod(
+  _i18.Future<Iterable<_i5.Clip>> list() => (super.noSuchMethod(
         Invocation.method(
           #list,
           [],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Clip>>.value(<_i5.Clip>[]),
+        returnValue: _i18.Future<Iterable<_i5.Clip>>.value(<_i5.Clip>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Clip>>.value(<_i5.Clip>[]),
-      ) as _i17.Future<Iterable<_i5.Clip>>);
+            _i18.Future<Iterable<_i5.Clip>>.value(<_i5.Clip>[]),
+      ) as _i18.Future<Iterable<_i5.Clip>>);
 
   @override
-  _i17.Future<Iterable<_i5.Clip>> myFavorites() => (super.noSuchMethod(
+  _i18.Future<Iterable<_i5.Clip>> myFavorites() => (super.noSuchMethod(
         Invocation.method(
           #myFavorites,
           [],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Clip>>.value(<_i5.Clip>[]),
+        returnValue: _i18.Future<Iterable<_i5.Clip>>.value(<_i5.Clip>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Clip>>.value(<_i5.Clip>[]),
-      ) as _i17.Future<Iterable<_i5.Clip>>);
+            _i18.Future<Iterable<_i5.Clip>>.value(<_i5.Clip>[]),
+      ) as _i18.Future<Iterable<_i5.Clip>>);
 
   @override
-  _i17.Future<Iterable<_i5.Note>> notes(_i5.ClipsNotesRequest? request) =>
+  _i18.Future<Iterable<_i5.Note>> notes(_i5.ClipsNotesRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #notes,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+        returnValue: _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
-      ) as _i17.Future<Iterable<_i5.Note>>);
+            _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+      ) as _i18.Future<Iterable<_i5.Note>>);
 
   @override
-  _i17.Future<void> addNote(_i5.ClipsAddNoteRequest? request) =>
+  _i18.Future<void> addNote(_i5.ClipsAddNoteRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #addNote,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> removeNote(_i5.ClipsRemoveNoteRequest? request) =>
+  _i18.Future<void> removeNote(_i5.ClipsRemoveNoteRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #removeNote,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<_i5.Clip> create(_i5.ClipsCreateRequest? request) =>
+  _i18.Future<_i5.Clip> create(_i5.ClipsCreateRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #create,
           [request],
         ),
-        returnValue: _i17.Future<_i5.Clip>.value(_FakeClip_35(
+        returnValue: _i18.Future<_i5.Clip>.value(_FakeClip_35(
           this,
           Invocation.method(
             #create,
             [request],
           ),
         )),
-        returnValueForMissingStub: _i17.Future<_i5.Clip>.value(_FakeClip_35(
+        returnValueForMissingStub: _i18.Future<_i5.Clip>.value(_FakeClip_35(
           this,
           Invocation.method(
             #create,
             [request],
           ),
         )),
-      ) as _i17.Future<_i5.Clip>);
+      ) as _i18.Future<_i5.Clip>);
 
   @override
-  _i17.Future<void> delete(_i5.ClipsDeleteRequest? request) =>
+  _i18.Future<void> delete(_i5.ClipsDeleteRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #delete,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<_i5.Clip> update(_i5.ClipsUpdateRequest? request) =>
+  _i18.Future<_i5.Clip> update(_i5.ClipsUpdateRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #update,
           [request],
         ),
-        returnValue: _i17.Future<_i5.Clip>.value(_FakeClip_35(
+        returnValue: _i18.Future<_i5.Clip>.value(_FakeClip_35(
           this,
           Invocation.method(
             #update,
             [request],
           ),
         )),
-        returnValueForMissingStub: _i17.Future<_i5.Clip>.value(_FakeClip_35(
+        returnValueForMissingStub: _i18.Future<_i5.Clip>.value(_FakeClip_35(
           this,
           Invocation.method(
             #update,
             [request],
           ),
         )),
-      ) as _i17.Future<_i5.Clip>);
+      ) as _i18.Future<_i5.Clip>);
 
   @override
-  _i17.Future<_i5.Clip> show(_i5.ClipsShowRequest? request) =>
+  _i18.Future<_i5.Clip> show(_i5.ClipsShowRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #show,
           [request],
         ),
-        returnValue: _i17.Future<_i5.Clip>.value(_FakeClip_35(
+        returnValue: _i18.Future<_i5.Clip>.value(_FakeClip_35(
           this,
           Invocation.method(
             #show,
             [request],
           ),
         )),
-        returnValueForMissingStub: _i17.Future<_i5.Clip>.value(_FakeClip_35(
+        returnValueForMissingStub: _i18.Future<_i5.Clip>.value(_FakeClip_35(
           this,
           Invocation.method(
             #show,
             [request],
           ),
         )),
-      ) as _i17.Future<_i5.Clip>);
+      ) as _i18.Future<_i5.Clip>);
 
   @override
-  _i17.Future<void> favorite(_i5.ClipsFavoriteRequest? request) =>
+  _i18.Future<void> favorite(_i5.ClipsFavoriteRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #favorite,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> unfavorite(_i5.ClipsUnfavoriteRequest? request) =>
+  _i18.Future<void> unfavorite(_i5.ClipsUnfavoriteRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #unfavorite,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 }
 
 /// A class which mocks [MisskeyDrive].
@@ -3508,7 +3520,7 @@ class MockMisskeyDrive extends _i1.Mock implements _i5.MisskeyDrive {
       ) as _i5.MisskeyDriveFolders);
 
   @override
-  _i17.Future<Iterable<_i5.DriveFile>> stream(
+  _i18.Future<Iterable<_i5.DriveFile>> stream(
           _i5.DriveStreamRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -3516,10 +3528,10 @@ class MockMisskeyDrive extends _i1.Mock implements _i5.MisskeyDrive {
           [request],
         ),
         returnValue:
-            _i17.Future<Iterable<_i5.DriveFile>>.value(<_i5.DriveFile>[]),
+            _i18.Future<Iterable<_i5.DriveFile>>.value(<_i5.DriveFile>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.DriveFile>>.value(<_i5.DriveFile>[]),
-      ) as _i17.Future<Iterable<_i5.DriveFile>>);
+            _i18.Future<Iterable<_i5.DriveFile>>.value(<_i5.DriveFile>[]),
+      ) as _i18.Future<Iterable<_i5.DriveFile>>);
 }
 
 /// A class which mocks [MisskeyDriveFolders].
@@ -3528,7 +3540,7 @@ class MockMisskeyDrive extends _i1.Mock implements _i5.MisskeyDrive {
 class MockMisskeyDriveFolders extends _i1.Mock
     implements _i5.MisskeyDriveFolders {
   @override
-  _i17.Future<Iterable<_i5.DriveFolder>> folders(
+  _i18.Future<Iterable<_i5.DriveFolder>> folders(
           _i5.DriveFoldersRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -3536,19 +3548,19 @@ class MockMisskeyDriveFolders extends _i1.Mock
           [request],
         ),
         returnValue:
-            _i17.Future<Iterable<_i5.DriveFolder>>.value(<_i5.DriveFolder>[]),
+            _i18.Future<Iterable<_i5.DriveFolder>>.value(<_i5.DriveFolder>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.DriveFolder>>.value(<_i5.DriveFolder>[]),
-      ) as _i17.Future<Iterable<_i5.DriveFolder>>);
+            _i18.Future<Iterable<_i5.DriveFolder>>.value(<_i5.DriveFolder>[]),
+      ) as _i18.Future<Iterable<_i5.DriveFolder>>);
 
   @override
-  _i17.Future<_i5.DriveFolder> create(_i5.DriveFoldersCreateRequest? request) =>
+  _i18.Future<_i5.DriveFolder> create(_i5.DriveFoldersCreateRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #create,
           [request],
         ),
-        returnValue: _i17.Future<_i5.DriveFolder>.value(_FakeDriveFolder_38(
+        returnValue: _i18.Future<_i5.DriveFolder>.value(_FakeDriveFolder_38(
           this,
           Invocation.method(
             #create,
@@ -3556,28 +3568,28 @@ class MockMisskeyDriveFolders extends _i1.Mock
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i5.DriveFolder>.value(_FakeDriveFolder_38(
+            _i18.Future<_i5.DriveFolder>.value(_FakeDriveFolder_38(
           this,
           Invocation.method(
             #create,
             [request],
           ),
         )),
-      ) as _i17.Future<_i5.DriveFolder>);
+      ) as _i18.Future<_i5.DriveFolder>);
 
   @override
-  _i17.Future<void> delete(_i5.DriveFoldersDeleteRequest? request) =>
+  _i18.Future<void> delete(_i5.DriveFoldersDeleteRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #delete,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<Iterable<_i5.DriveFolder>> find(
+  _i18.Future<Iterable<_i5.DriveFolder>> find(
           _i5.DriveFoldersFindRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -3585,19 +3597,19 @@ class MockMisskeyDriveFolders extends _i1.Mock
           [request],
         ),
         returnValue:
-            _i17.Future<Iterable<_i5.DriveFolder>>.value(<_i5.DriveFolder>[]),
+            _i18.Future<Iterable<_i5.DriveFolder>>.value(<_i5.DriveFolder>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.DriveFolder>>.value(<_i5.DriveFolder>[]),
-      ) as _i17.Future<Iterable<_i5.DriveFolder>>);
+            _i18.Future<Iterable<_i5.DriveFolder>>.value(<_i5.DriveFolder>[]),
+      ) as _i18.Future<Iterable<_i5.DriveFolder>>);
 
   @override
-  _i17.Future<_i5.DriveFolder> show(_i5.DriveFoldersShowRequest? request) =>
+  _i18.Future<_i5.DriveFolder> show(_i5.DriveFoldersShowRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #show,
           [request],
         ),
-        returnValue: _i17.Future<_i5.DriveFolder>.value(_FakeDriveFolder_38(
+        returnValue: _i18.Future<_i5.DriveFolder>.value(_FakeDriveFolder_38(
           this,
           Invocation.method(
             #show,
@@ -3605,23 +3617,23 @@ class MockMisskeyDriveFolders extends _i1.Mock
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i5.DriveFolder>.value(_FakeDriveFolder_38(
+            _i18.Future<_i5.DriveFolder>.value(_FakeDriveFolder_38(
           this,
           Invocation.method(
             #show,
             [request],
           ),
         )),
-      ) as _i17.Future<_i5.DriveFolder>);
+      ) as _i18.Future<_i5.DriveFolder>);
 
   @override
-  _i17.Future<_i5.DriveFolder> update(_i5.DriveFoldersUpdateRequest? request) =>
+  _i18.Future<_i5.DriveFolder> update(_i5.DriveFoldersUpdateRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #update,
           [request],
         ),
-        returnValue: _i17.Future<_i5.DriveFolder>.value(_FakeDriveFolder_38(
+        returnValue: _i18.Future<_i5.DriveFolder>.value(_FakeDriveFolder_38(
           this,
           Invocation.method(
             #update,
@@ -3629,14 +3641,14 @@ class MockMisskeyDriveFolders extends _i1.Mock
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i5.DriveFolder>.value(_FakeDriveFolder_38(
+            _i18.Future<_i5.DriveFolder>.value(_FakeDriveFolder_38(
           this,
           Invocation.method(
             #update,
             [request],
           ),
         )),
-      ) as _i17.Future<_i5.DriveFolder>);
+      ) as _i18.Future<_i5.DriveFolder>);
 }
 
 /// A class which mocks [MisskeyDriveFiles].
@@ -3644,7 +3656,7 @@ class MockMisskeyDriveFolders extends _i1.Mock
 /// See the documentation for Mockito's code generation for more information.
 class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles {
   @override
-  _i17.Future<_i5.DriveFile> create(
+  _i18.Future<_i5.DriveFile> create(
     _i5.DriveFilesCreateRequest? request,
     _i12.File? fileContent,
   ) =>
@@ -3656,7 +3668,7 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles {
             fileContent,
           ],
         ),
-        returnValue: _i17.Future<_i5.DriveFile>.value(_FakeDriveFile_39(
+        returnValue: _i18.Future<_i5.DriveFile>.value(_FakeDriveFile_39(
           this,
           Invocation.method(
             #create,
@@ -3667,7 +3679,7 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i5.DriveFile>.value(_FakeDriveFile_39(
+            _i18.Future<_i5.DriveFile>.value(_FakeDriveFile_39(
           this,
           Invocation.method(
             #create,
@@ -3677,12 +3689,12 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles {
             ],
           ),
         )),
-      ) as _i17.Future<_i5.DriveFile>);
+      ) as _i18.Future<_i5.DriveFile>);
 
   @override
-  _i17.Future<_i5.DriveFile> createAsBinary(
+  _i18.Future<_i5.DriveFile> createAsBinary(
     _i5.DriveFilesCreateRequest? request,
-    _i27.Uint8List? fileContent,
+    _i28.Uint8List? fileContent,
   ) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -3692,7 +3704,7 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles {
             fileContent,
           ],
         ),
-        returnValue: _i17.Future<_i5.DriveFile>.value(_FakeDriveFile_39(
+        returnValue: _i18.Future<_i5.DriveFile>.value(_FakeDriveFile_39(
           this,
           Invocation.method(
             #createAsBinary,
@@ -3703,7 +3715,7 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i5.DriveFile>.value(_FakeDriveFile_39(
+            _i18.Future<_i5.DriveFile>.value(_FakeDriveFile_39(
           this,
           Invocation.method(
             #createAsBinary,
@@ -3713,16 +3725,16 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles {
             ],
           ),
         )),
-      ) as _i17.Future<_i5.DriveFile>);
+      ) as _i18.Future<_i5.DriveFile>);
 
   @override
-  _i17.Future<_i5.DriveFile> update(_i5.DriveFilesUpdateRequest? request) =>
+  _i18.Future<_i5.DriveFile> update(_i5.DriveFilesUpdateRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #update,
           [request],
         ),
-        returnValue: _i17.Future<_i5.DriveFile>.value(_FakeDriveFile_39(
+        returnValue: _i18.Future<_i5.DriveFile>.value(_FakeDriveFile_39(
           this,
           Invocation.method(
             #update,
@@ -3730,41 +3742,41 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i5.DriveFile>.value(_FakeDriveFile_39(
+            _i18.Future<_i5.DriveFile>.value(_FakeDriveFile_39(
           this,
           Invocation.method(
             #update,
             [request],
           ),
         )),
-      ) as _i17.Future<_i5.DriveFile>);
+      ) as _i18.Future<_i5.DriveFile>);
 
   @override
-  _i17.Future<void> delete(_i5.DriveFilesDeleteRequest? request) =>
+  _i18.Future<void> delete(_i5.DriveFilesDeleteRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #delete,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<Iterable<_i5.DriveFile>> files(_i5.DriveFilesRequest? request) =>
+  _i18.Future<Iterable<_i5.DriveFile>> files(_i5.DriveFilesRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #files,
           [request],
         ),
         returnValue:
-            _i17.Future<Iterable<_i5.DriveFile>>.value(<_i5.DriveFile>[]),
+            _i18.Future<Iterable<_i5.DriveFile>>.value(<_i5.DriveFile>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.DriveFile>>.value(<_i5.DriveFile>[]),
-      ) as _i17.Future<Iterable<_i5.DriveFile>>);
+            _i18.Future<Iterable<_i5.DriveFile>>.value(<_i5.DriveFile>[]),
+      ) as _i18.Future<Iterable<_i5.DriveFile>>);
 
   @override
-  _i17.Future<Iterable<_i5.DriveFile>> find(
+  _i18.Future<Iterable<_i5.DriveFile>> find(
           _i5.DriveFilesFindRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -3772,38 +3784,38 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles {
           [request],
         ),
         returnValue:
-            _i17.Future<Iterable<_i5.DriveFile>>.value(<_i5.DriveFile>[]),
+            _i18.Future<Iterable<_i5.DriveFile>>.value(<_i5.DriveFile>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.DriveFile>>.value(<_i5.DriveFile>[]),
-      ) as _i17.Future<Iterable<_i5.DriveFile>>);
+            _i18.Future<Iterable<_i5.DriveFile>>.value(<_i5.DriveFile>[]),
+      ) as _i18.Future<Iterable<_i5.DriveFile>>);
 
   @override
-  _i17.Future<Iterable<_i5.Note>> attachedNotes(
+  _i18.Future<Iterable<_i5.Note>> attachedNotes(
           _i5.DriveFilesAttachedNotesRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #attachedNotes,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+        returnValue: _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
-      ) as _i17.Future<Iterable<_i5.Note>>);
+            _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+      ) as _i18.Future<Iterable<_i5.Note>>);
 
   @override
-  _i17.Future<bool> checkExistence(
+  _i18.Future<bool> checkExistence(
           _i5.DriveFilesCheckExistenceRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #checkExistence,
           [request],
         ),
-        returnValue: _i17.Future<bool>.value(false),
-        returnValueForMissingStub: _i17.Future<bool>.value(false),
-      ) as _i17.Future<bool>);
+        returnValue: _i18.Future<bool>.value(false),
+        returnValueForMissingStub: _i18.Future<bool>.value(false),
+      ) as _i18.Future<bool>);
 
   @override
-  _i17.Future<Iterable<_i5.DriveFile>> findByHash(
+  _i18.Future<Iterable<_i5.DriveFile>> findByHash(
           _i5.DriveFilesFindByHashRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -3811,19 +3823,19 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles {
           [request],
         ),
         returnValue:
-            _i17.Future<Iterable<_i5.DriveFile>>.value(<_i5.DriveFile>[]),
+            _i18.Future<Iterable<_i5.DriveFile>>.value(<_i5.DriveFile>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.DriveFile>>.value(<_i5.DriveFile>[]),
-      ) as _i17.Future<Iterable<_i5.DriveFile>>);
+            _i18.Future<Iterable<_i5.DriveFile>>.value(<_i5.DriveFile>[]),
+      ) as _i18.Future<Iterable<_i5.DriveFile>>);
 
   @override
-  _i17.Future<_i5.DriveFile> show(_i5.DriveFilesShowRequest? request) =>
+  _i18.Future<_i5.DriveFile> show(_i5.DriveFilesShowRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #show,
           [request],
         ),
-        returnValue: _i17.Future<_i5.DriveFile>.value(_FakeDriveFile_39(
+        returnValue: _i18.Future<_i5.DriveFile>.value(_FakeDriveFile_39(
           this,
           Invocation.method(
             #show,
@@ -3831,26 +3843,26 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i5.DriveFile>.value(_FakeDriveFile_39(
+            _i18.Future<_i5.DriveFile>.value(_FakeDriveFile_39(
           this,
           Invocation.method(
             #show,
             [request],
           ),
         )),
-      ) as _i17.Future<_i5.DriveFile>);
+      ) as _i18.Future<_i5.DriveFile>);
 
   @override
-  _i17.Future<void> uploadFromUrl(
+  _i18.Future<void> uploadFromUrl(
           _i5.DriveFilesUploadFromUrlRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #uploadFromUrl,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 }
 
 /// A class which mocks [MisskeyFederation].
@@ -3858,14 +3870,14 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles {
 /// See the documentation for Mockito's code generation for more information.
 class MockMisskeyFederation extends _i1.Mock implements _i5.MisskeyFederation {
   @override
-  _i17.Future<_i5.FederationShowInstanceResponse> showInstance(
+  _i18.Future<_i5.FederationShowInstanceResponse> showInstance(
           _i5.FederationShowInstanceRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #showInstance,
           [request],
         ),
-        returnValue: _i17.Future<_i5.FederationShowInstanceResponse>.value(
+        returnValue: _i18.Future<_i5.FederationShowInstanceResponse>.value(
             _FakeFederationShowInstanceResponse_40(
           this,
           Invocation.method(
@@ -3874,7 +3886,7 @@ class MockMisskeyFederation extends _i1.Mock implements _i5.MisskeyFederation {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i5.FederationShowInstanceResponse>.value(
+            _i18.Future<_i5.FederationShowInstanceResponse>.value(
                 _FakeFederationShowInstanceResponse_40(
           this,
           Invocation.method(
@@ -3882,19 +3894,21 @@ class MockMisskeyFederation extends _i1.Mock implements _i5.MisskeyFederation {
             [request],
           ),
         )),
-      ) as _i17.Future<_i5.FederationShowInstanceResponse>);
+      ) as _i18.Future<_i5.FederationShowInstanceResponse>);
 
   @override
-  _i17.Future<Iterable<_i5.User>> users(_i5.FederationUsersRequest? request) =>
+  _i18.Future<Iterable<_i5.UserDetailed>> users(
+          _i5.FederationUsersRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #users,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.User>>.value(<_i5.User>[]),
+        returnValue:
+            _i18.Future<Iterable<_i5.UserDetailed>>.value(<_i5.UserDetailed>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.User>>.value(<_i5.User>[]),
-      ) as _i17.Future<Iterable<_i5.User>>);
+            _i18.Future<Iterable<_i5.UserDetailed>>.value(<_i5.UserDetailed>[]),
+      ) as _i18.Future<Iterable<_i5.UserDetailed>>);
 }
 
 /// A class which mocks [MisskeyFollowing].
@@ -3915,84 +3929,88 @@ class MockMisskeyFollowing extends _i1.Mock implements _i5.MisskeyFollowing {
       ) as _i5.MisskeyFollowingRequests);
 
   @override
-  _i17.Future<_i5.User> create(_i5.FollowingCreateRequest? request) =>
+  _i18.Future<_i5.UserLite> create(_i5.FollowingCreateRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #create,
           [request],
         ),
-        returnValue: _i17.Future<_i5.User>.value(_FakeUser_42(
+        returnValue: _i18.Future<_i5.UserLite>.value(_FakeUserLite_42(
           this,
           Invocation.method(
             #create,
             [request],
           ),
         )),
-        returnValueForMissingStub: _i17.Future<_i5.User>.value(_FakeUser_42(
+        returnValueForMissingStub:
+            _i18.Future<_i5.UserLite>.value(_FakeUserLite_42(
           this,
           Invocation.method(
             #create,
             [request],
           ),
         )),
-      ) as _i17.Future<_i5.User>);
+      ) as _i18.Future<_i5.UserLite>);
 
   @override
-  _i17.Future<_i5.User> delete(_i5.FollowingDeleteRequest? request) =>
+  _i18.Future<_i5.UserLite> delete(_i5.FollowingDeleteRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #delete,
           [request],
         ),
-        returnValue: _i17.Future<_i5.User>.value(_FakeUser_42(
+        returnValue: _i18.Future<_i5.UserLite>.value(_FakeUserLite_42(
           this,
           Invocation.method(
             #delete,
             [request],
           ),
         )),
-        returnValueForMissingStub: _i17.Future<_i5.User>.value(_FakeUser_42(
+        returnValueForMissingStub:
+            _i18.Future<_i5.UserLite>.value(_FakeUserLite_42(
           this,
           Invocation.method(
             #delete,
             [request],
           ),
         )),
-      ) as _i17.Future<_i5.User>);
+      ) as _i18.Future<_i5.UserLite>);
 
   @override
-  _i17.Future<_i5.User> invalidate(_i5.FollowingInvalidateRequest? request) =>
+  _i18.Future<_i5.UserLite> invalidate(
+          _i5.FollowingInvalidateRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #invalidate,
           [request],
         ),
-        returnValue: _i17.Future<_i5.User>.value(_FakeUser_42(
+        returnValue: _i18.Future<_i5.UserLite>.value(_FakeUserLite_42(
           this,
           Invocation.method(
             #invalidate,
             [request],
           ),
         )),
-        returnValueForMissingStub: _i17.Future<_i5.User>.value(_FakeUser_42(
+        returnValueForMissingStub:
+            _i18.Future<_i5.UserLite>.value(_FakeUserLite_42(
           this,
           Invocation.method(
             #invalidate,
             [request],
           ),
         )),
-      ) as _i17.Future<_i5.User>);
+      ) as _i18.Future<_i5.UserLite>);
 
   @override
-  _i17.Future<void> updateAll(_i5.FollowingUpdateAllRequest? request) =>
+  _i18.Future<void> updateAll(_i5.FollowingUpdateAllRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #updateAll,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 }
 
 /// A class which mocks [MisskeyHashtags].
@@ -4000,37 +4018,37 @@ class MockMisskeyFollowing extends _i1.Mock implements _i5.MisskeyFollowing {
 /// See the documentation for Mockito's code generation for more information.
 class MockMisskeyHashtags extends _i1.Mock implements _i5.MisskeyHashtags {
   @override
-  _i17.Future<Iterable<_i5.Hashtag>> list(_i5.HashtagsListRequest? request) =>
+  _i18.Future<Iterable<_i5.Hashtag>> list(_i5.HashtagsListRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #list,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Hashtag>>.value(<_i5.Hashtag>[]),
+        returnValue: _i18.Future<Iterable<_i5.Hashtag>>.value(<_i5.Hashtag>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Hashtag>>.value(<_i5.Hashtag>[]),
-      ) as _i17.Future<Iterable<_i5.Hashtag>>);
+            _i18.Future<Iterable<_i5.Hashtag>>.value(<_i5.Hashtag>[]),
+      ) as _i18.Future<Iterable<_i5.Hashtag>>);
 
   @override
-  _i17.Future<Iterable<String>> search(_i5.HashtagsSearchRequest? request) =>
+  _i18.Future<Iterable<String>> search(_i5.HashtagsSearchRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #search,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<String>>.value(<String>[]),
+        returnValue: _i18.Future<Iterable<String>>.value(<String>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<String>>.value(<String>[]),
-      ) as _i17.Future<Iterable<String>>);
+            _i18.Future<Iterable<String>>.value(<String>[]),
+      ) as _i18.Future<Iterable<String>>);
 
   @override
-  _i17.Future<_i5.Hashtag> show(_i5.HashtagsShowRequest? request) =>
+  _i18.Future<_i5.Hashtag> show(_i5.HashtagsShowRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #show,
           [request],
         ),
-        returnValue: _i17.Future<_i5.Hashtag>.value(_FakeHashtag_43(
+        returnValue: _i18.Future<_i5.Hashtag>.value(_FakeHashtag_43(
           this,
           Invocation.method(
             #show,
@@ -4038,40 +4056,42 @@ class MockMisskeyHashtags extends _i1.Mock implements _i5.MisskeyHashtags {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i5.Hashtag>.value(_FakeHashtag_43(
+            _i18.Future<_i5.Hashtag>.value(_FakeHashtag_43(
           this,
           Invocation.method(
             #show,
             [request],
           ),
         )),
-      ) as _i17.Future<_i5.Hashtag>);
+      ) as _i18.Future<_i5.Hashtag>);
 
   @override
-  _i17.Future<Iterable<_i5.HashtagsTrendResponse>> trend() =>
+  _i18.Future<Iterable<_i5.HashtagsTrendResponse>> trend() =>
       (super.noSuchMethod(
         Invocation.method(
           #trend,
           [],
         ),
-        returnValue: _i17.Future<Iterable<_i5.HashtagsTrendResponse>>.value(
+        returnValue: _i18.Future<Iterable<_i5.HashtagsTrendResponse>>.value(
             <_i5.HashtagsTrendResponse>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.HashtagsTrendResponse>>.value(
+            _i18.Future<Iterable<_i5.HashtagsTrendResponse>>.value(
                 <_i5.HashtagsTrendResponse>[]),
-      ) as _i17.Future<Iterable<_i5.HashtagsTrendResponse>>);
+      ) as _i18.Future<Iterable<_i5.HashtagsTrendResponse>>);
 
   @override
-  _i17.Future<Iterable<_i5.User>> users(_i5.HashtagsUsersRequest? request) =>
+  _i18.Future<Iterable<_i5.UserDetailed>> users(
+          _i5.HashtagsUsersRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #users,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.User>>.value(<_i5.User>[]),
+        returnValue:
+            _i18.Future<Iterable<_i5.UserDetailed>>.value(<_i5.UserDetailed>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.User>>.value(<_i5.User>[]),
-      ) as _i17.Future<Iterable<_i5.User>>);
+            _i18.Future<Iterable<_i5.UserDetailed>>.value(<_i5.UserDetailed>[]),
+      ) as _i18.Future<Iterable<_i5.UserDetailed>>);
 }
 
 /// A class which mocks [MisskeyI].
@@ -4079,12 +4099,12 @@ class MockMisskeyHashtags extends _i1.Mock implements _i5.MisskeyHashtags {
 /// See the documentation for Mockito's code generation for more information.
 class MockMisskeyI extends _i1.Mock implements _i5.MisskeyI {
   @override
-  _i17.Future<_i5.IResponse> i() => (super.noSuchMethod(
+  _i18.Future<_i5.MeDetailed> i() => (super.noSuchMethod(
         Invocation.method(
           #i,
           [],
         ),
-        returnValue: _i17.Future<_i5.IResponse>.value(_FakeIResponse_44(
+        returnValue: _i18.Future<_i5.MeDetailed>.value(_FakeMeDetailed_44(
           this,
           Invocation.method(
             #i,
@@ -4092,64 +4112,64 @@ class MockMisskeyI extends _i1.Mock implements _i5.MisskeyI {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i5.IResponse>.value(_FakeIResponse_44(
+            _i18.Future<_i5.MeDetailed>.value(_FakeMeDetailed_44(
           this,
           Invocation.method(
             #i,
             [],
           ),
         )),
-      ) as _i17.Future<_i5.IResponse>);
+      ) as _i18.Future<_i5.MeDetailed>);
 
   @override
-  _i17.Future<Iterable<_i5.INotificationsResponse>> notifications(
+  _i18.Future<Iterable<_i5.INotificationsResponse>> notifications(
           _i5.INotificationsRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #notifications,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.INotificationsResponse>>.value(
+        returnValue: _i18.Future<Iterable<_i5.INotificationsResponse>>.value(
             <_i5.INotificationsResponse>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.INotificationsResponse>>.value(
+            _i18.Future<Iterable<_i5.INotificationsResponse>>.value(
                 <_i5.INotificationsResponse>[]),
-      ) as _i17.Future<Iterable<_i5.INotificationsResponse>>);
+      ) as _i18.Future<Iterable<_i5.INotificationsResponse>>);
 
   @override
-  _i17.Future<void> readAnnouncement(_i5.IReadAnnouncementRequest? request) =>
+  _i18.Future<void> readAnnouncement(_i5.IReadAnnouncementRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #readAnnouncement,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<Iterable<_i5.IFavoritesResponse>> favorites(
+  _i18.Future<Iterable<_i5.IFavoritesResponse>> favorites(
           _i5.IFavoritesRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #favorites,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.IFavoritesResponse>>.value(
+        returnValue: _i18.Future<Iterable<_i5.IFavoritesResponse>>.value(
             <_i5.IFavoritesResponse>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.IFavoritesResponse>>.value(
+            _i18.Future<Iterable<_i5.IFavoritesResponse>>.value(
                 <_i5.IFavoritesResponse>[]),
-      ) as _i17.Future<Iterable<_i5.IFavoritesResponse>>);
+      ) as _i18.Future<Iterable<_i5.IFavoritesResponse>>);
 
   @override
-  _i17.Future<_i5.IResponse> update(_i5.IUpdateRequest? request) =>
+  _i18.Future<_i5.MeDetailed> update(_i5.IUpdateRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #update,
           [request],
         ),
-        returnValue: _i17.Future<_i5.IResponse>.value(_FakeIResponse_44(
+        returnValue: _i18.Future<_i5.MeDetailed>.value(_FakeMeDetailed_44(
           this,
           Invocation.method(
             #update,
@@ -4157,14 +4177,14 @@ class MockMisskeyI extends _i1.Mock implements _i5.MisskeyI {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i5.IResponse>.value(_FakeIResponse_44(
+            _i18.Future<_i5.MeDetailed>.value(_FakeMeDetailed_44(
           this,
           Invocation.method(
             #update,
             [request],
           ),
         )),
-      ) as _i17.Future<_i5.IResponse>);
+      ) as _i18.Future<_i5.MeDetailed>);
 }
 
 /// A class which mocks [MisskeyNotes].
@@ -4224,146 +4244,146 @@ class MockMisskeyNotes extends _i1.Mock implements _i5.MisskeyNotes {
       ) as _i5.MisskeyNotesThreadMuting);
 
   @override
-  _i17.Future<void> create(_i5.NotesCreateRequest? request) =>
+  _i18.Future<void> create(_i5.NotesCreateRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #create,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> update(_i5.NotesUpdateRequest? request) =>
+  _i18.Future<void> update(_i5.NotesUpdateRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #update,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> delete(_i5.NotesDeleteRequest? request) =>
+  _i18.Future<void> delete(_i5.NotesDeleteRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #delete,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<Iterable<_i5.Note>> notes(_i5.NotesRequest? request) =>
+  _i18.Future<Iterable<_i5.Note>> notes(_i5.NotesRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #notes,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+        returnValue: _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
-      ) as _i17.Future<Iterable<_i5.Note>>);
+            _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+      ) as _i18.Future<Iterable<_i5.Note>>);
 
   @override
-  _i17.Future<_i5.Note> show(_i5.NotesShowRequest? request) =>
+  _i18.Future<_i5.Note> show(_i5.NotesShowRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #show,
           [request],
         ),
-        returnValue: _i17.Future<_i5.Note>.value(_FakeNote_49(
+        returnValue: _i18.Future<_i5.Note>.value(_FakeNote_49(
           this,
           Invocation.method(
             #show,
             [request],
           ),
         )),
-        returnValueForMissingStub: _i17.Future<_i5.Note>.value(_FakeNote_49(
+        returnValueForMissingStub: _i18.Future<_i5.Note>.value(_FakeNote_49(
           this,
           Invocation.method(
             #show,
             [request],
           ),
         )),
-      ) as _i17.Future<_i5.Note>);
+      ) as _i18.Future<_i5.Note>);
 
   @override
-  _i17.Future<Iterable<_i5.Note>> homeTimeline(
+  _i18.Future<Iterable<_i5.Note>> homeTimeline(
           _i5.NotesTimelineRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #homeTimeline,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+        returnValue: _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
-      ) as _i17.Future<Iterable<_i5.Note>>);
+            _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+      ) as _i18.Future<Iterable<_i5.Note>>);
 
   @override
-  _i17.Future<Iterable<_i5.Note>> localTimeline(
+  _i18.Future<Iterable<_i5.Note>> localTimeline(
           _i5.NotesLocalTimelineRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #localTimeline,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+        returnValue: _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
-      ) as _i17.Future<Iterable<_i5.Note>>);
+            _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+      ) as _i18.Future<Iterable<_i5.Note>>);
 
   @override
-  _i17.Future<Iterable<_i5.Note>> hybridTimeline(
+  _i18.Future<Iterable<_i5.Note>> hybridTimeline(
           _i5.NotesHybridTimelineRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #hybridTimeline,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+        returnValue: _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
-      ) as _i17.Future<Iterable<_i5.Note>>);
+            _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+      ) as _i18.Future<Iterable<_i5.Note>>);
 
   @override
-  _i17.Future<Iterable<_i5.Note>> globalTimeline(
+  _i18.Future<Iterable<_i5.Note>> globalTimeline(
           _i5.NotesGlobalTimelineRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #globalTimeline,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+        returnValue: _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
-      ) as _i17.Future<Iterable<_i5.Note>>);
+            _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+      ) as _i18.Future<Iterable<_i5.Note>>);
 
   @override
-  _i17.Future<Iterable<_i5.Note>> userListTimeline(
+  _i18.Future<Iterable<_i5.Note>> userListTimeline(
           _i5.UserListTimelineRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #userListTimeline,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+        returnValue: _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
-      ) as _i17.Future<Iterable<_i5.Note>>);
+            _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+      ) as _i18.Future<Iterable<_i5.Note>>);
 
   @override
-  _i17.Future<_i5.NotesStateResponse> state(_i5.NotesStateRequest? request) =>
+  _i18.Future<_i5.NotesStateResponse> state(_i5.NotesStateRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #state,
           [request],
         ),
-        returnValue: _i17.Future<_i5.NotesStateResponse>.value(
+        returnValue: _i18.Future<_i5.NotesStateResponse>.value(
             _FakeNotesStateResponse_50(
           this,
           Invocation.method(
@@ -4371,7 +4391,7 @@ class MockMisskeyNotes extends _i1.Mock implements _i5.MisskeyNotes {
             [request],
           ),
         )),
-        returnValueForMissingStub: _i17.Future<_i5.NotesStateResponse>.value(
+        returnValueForMissingStub: _i18.Future<_i5.NotesStateResponse>.value(
             _FakeNotesStateResponse_50(
           this,
           Invocation.method(
@@ -4379,128 +4399,128 @@ class MockMisskeyNotes extends _i1.Mock implements _i5.MisskeyNotes {
             [request],
           ),
         )),
-      ) as _i17.Future<_i5.NotesStateResponse>);
+      ) as _i18.Future<_i5.NotesStateResponse>);
 
   @override
-  _i17.Future<Iterable<_i5.Note>> search(_i5.NotesSearchRequest? request) =>
+  _i18.Future<Iterable<_i5.Note>> search(_i5.NotesSearchRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #search,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+        returnValue: _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
-      ) as _i17.Future<Iterable<_i5.Note>>);
+            _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+      ) as _i18.Future<Iterable<_i5.Note>>);
 
   @override
-  _i17.Future<Iterable<_i5.Note>> searchByTag(
+  _i18.Future<Iterable<_i5.Note>> searchByTag(
           _i5.NotesSearchByTagRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #searchByTag,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+        returnValue: _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
-      ) as _i17.Future<Iterable<_i5.Note>>);
+            _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+      ) as _i18.Future<Iterable<_i5.Note>>);
 
   @override
-  _i17.Future<Iterable<_i5.Note>> renotes(_i5.NotesRenoteRequest? request) =>
+  _i18.Future<Iterable<_i5.Note>> renotes(_i5.NotesRenoteRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #renotes,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+        returnValue: _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
-      ) as _i17.Future<Iterable<_i5.Note>>);
+            _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+      ) as _i18.Future<Iterable<_i5.Note>>);
 
   @override
-  _i17.Future<Iterable<_i5.Note>> replies(_i5.NotesRepliesRequest? request) =>
+  _i18.Future<Iterable<_i5.Note>> replies(_i5.NotesRepliesRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #replies,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+        returnValue: _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
-      ) as _i17.Future<Iterable<_i5.Note>>);
+            _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+      ) as _i18.Future<Iterable<_i5.Note>>);
 
   @override
-  _i17.Future<Iterable<_i5.Note>> children(_i5.NotesChildrenRequest? request) =>
+  _i18.Future<Iterable<_i5.Note>> children(_i5.NotesChildrenRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #children,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+        returnValue: _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
-      ) as _i17.Future<Iterable<_i5.Note>>);
+            _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+      ) as _i18.Future<Iterable<_i5.Note>>);
 
   @override
-  _i17.Future<Iterable<_i5.Note>> conversation(
+  _i18.Future<Iterable<_i5.Note>> conversation(
           _i5.NotesConversationRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #conversation,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+        returnValue: _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
-      ) as _i17.Future<Iterable<_i5.Note>>);
+            _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+      ) as _i18.Future<Iterable<_i5.Note>>);
 
   @override
-  _i17.Future<Iterable<_i5.Note>> featured(_i5.NotesFeaturedRequest? request) =>
+  _i18.Future<Iterable<_i5.Note>> featured(_i5.NotesFeaturedRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #featured,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+        returnValue: _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
-      ) as _i17.Future<Iterable<_i5.Note>>);
+            _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+      ) as _i18.Future<Iterable<_i5.Note>>);
 
   @override
-  _i17.Future<Iterable<_i5.Note>> mentions(_i5.NotesMentionsRequest? request) =>
+  _i18.Future<Iterable<_i5.Note>> mentions(_i5.NotesMentionsRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #mentions,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+        returnValue: _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
-      ) as _i17.Future<Iterable<_i5.Note>>);
+            _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+      ) as _i18.Future<Iterable<_i5.Note>>);
 
   @override
-  _i17.Future<Iterable<_i5.Clip>> clips(_i5.NotesClipsRequest? request) =>
+  _i18.Future<Iterable<_i5.Clip>> clips(_i5.NotesClipsRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #clips,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Clip>>.value(<_i5.Clip>[]),
+        returnValue: _i18.Future<Iterable<_i5.Clip>>.value(<_i5.Clip>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Clip>>.value(<_i5.Clip>[]),
-      ) as _i17.Future<Iterable<_i5.Clip>>);
+            _i18.Future<Iterable<_i5.Clip>>.value(<_i5.Clip>[]),
+      ) as _i18.Future<Iterable<_i5.Clip>>);
 
   @override
-  _i17.Future<void> unrenote(_i5.NotesUnrenoteRequest? request) =>
+  _i18.Future<void> unrenote(_i5.NotesUnrenoteRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #unrenote,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 }
 
 /// A class which mocks [MisskeyNotesFavorites].
@@ -4509,26 +4529,26 @@ class MockMisskeyNotes extends _i1.Mock implements _i5.MisskeyNotes {
 class MockMisskeyNotesFavorites extends _i1.Mock
     implements _i5.MisskeyNotesFavorites {
   @override
-  _i17.Future<void> create(_i5.NotesFavoritesCreateRequest? request) =>
+  _i18.Future<void> create(_i5.NotesFavoritesCreateRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #create,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> delete(_i5.NotesFavoritesDeleteRequest? request) =>
+  _i18.Future<void> delete(_i5.NotesFavoritesDeleteRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #delete,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 }
 
 /// A class which mocks [MisskeyNotesReactions].
@@ -4537,41 +4557,41 @@ class MockMisskeyNotesFavorites extends _i1.Mock
 class MockMisskeyNotesReactions extends _i1.Mock
     implements _i5.MisskeyNotesReactions {
   @override
-  _i17.Future<void> create(_i5.NotesReactionsCreateRequest? request) =>
+  _i18.Future<void> create(_i5.NotesReactionsCreateRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #create,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> delete(_i5.NotesReactionsDeleteRequest? request) =>
+  _i18.Future<void> delete(_i5.NotesReactionsDeleteRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #delete,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<Iterable<_i5.NotesReactionsResponse>> reactions(
+  _i18.Future<Iterable<_i5.NotesReactionsResponse>> reactions(
           _i5.NotesReactionsRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #reactions,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.NotesReactionsResponse>>.value(
+        returnValue: _i18.Future<Iterable<_i5.NotesReactionsResponse>>.value(
             <_i5.NotesReactionsResponse>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.NotesReactionsResponse>>.value(
+            _i18.Future<Iterable<_i5.NotesReactionsResponse>>.value(
                 <_i5.NotesReactionsResponse>[]),
-      ) as _i17.Future<Iterable<_i5.NotesReactionsResponse>>);
+      ) as _i18.Future<Iterable<_i5.NotesReactionsResponse>>);
 }
 
 /// A class which mocks [MisskeyNotesPolls].
@@ -4579,28 +4599,28 @@ class MockMisskeyNotesReactions extends _i1.Mock
 /// See the documentation for Mockito's code generation for more information.
 class MockMisskeyNotesPolls extends _i1.Mock implements _i5.MisskeyNotesPolls {
   @override
-  _i17.Future<void> vote(_i5.NotesPollsVoteRequest? request) =>
+  _i18.Future<void> vote(_i5.NotesPollsVoteRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #vote,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<Iterable<_i5.Note>> recommendation(
+  _i18.Future<Iterable<_i5.Note>> recommendation(
           _i5.NotesPollsRecommendationRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #recommendation,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+        returnValue: _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
-      ) as _i17.Future<Iterable<_i5.Note>>);
+            _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+      ) as _i18.Future<Iterable<_i5.Note>>);
 }
 
 /// A class which mocks [MisskeyRenoteMute].
@@ -4608,26 +4628,26 @@ class MockMisskeyNotesPolls extends _i1.Mock implements _i5.MisskeyNotesPolls {
 /// See the documentation for Mockito's code generation for more information.
 class MockMisskeyRenoteMute extends _i1.Mock implements _i5.MisskeyRenoteMute {
   @override
-  _i17.Future<void> create(_i5.RenoteMuteCreateRequest? request) =>
+  _i18.Future<void> create(_i5.RenoteMuteCreateRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #create,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> delete(_i5.RenoteMuteDeleteRequest? request) =>
+  _i18.Future<void> delete(_i5.RenoteMuteDeleteRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #delete,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 }
 
 /// A class which mocks [MisskeyRoles].
@@ -4635,42 +4655,42 @@ class MockMisskeyRenoteMute extends _i1.Mock implements _i5.MisskeyRenoteMute {
 /// See the documentation for Mockito's code generation for more information.
 class MockMisskeyRoles extends _i1.Mock implements _i5.MisskeyRoles {
   @override
-  _i17.Future<Iterable<_i5.RolesListResponse>> list() => (super.noSuchMethod(
+  _i18.Future<Iterable<_i5.RolesListResponse>> list() => (super.noSuchMethod(
         Invocation.method(
           #list,
           [],
         ),
-        returnValue: _i17.Future<Iterable<_i5.RolesListResponse>>.value(
+        returnValue: _i18.Future<Iterable<_i5.RolesListResponse>>.value(
             <_i5.RolesListResponse>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.RolesListResponse>>.value(
+            _i18.Future<Iterable<_i5.RolesListResponse>>.value(
                 <_i5.RolesListResponse>[]),
-      ) as _i17.Future<Iterable<_i5.RolesListResponse>>);
+      ) as _i18.Future<Iterable<_i5.RolesListResponse>>);
 
   @override
-  _i17.Future<Iterable<_i5.RolesUsersResponse>> users(
+  _i18.Future<Iterable<_i5.RolesUsersResponse>> users(
           _i5.RolesUsersRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #users,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.RolesUsersResponse>>.value(
+        returnValue: _i18.Future<Iterable<_i5.RolesUsersResponse>>.value(
             <_i5.RolesUsersResponse>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.RolesUsersResponse>>.value(
+            _i18.Future<Iterable<_i5.RolesUsersResponse>>.value(
                 <_i5.RolesUsersResponse>[]),
-      ) as _i17.Future<Iterable<_i5.RolesUsersResponse>>);
+      ) as _i18.Future<Iterable<_i5.RolesUsersResponse>>);
 
   @override
-  _i17.Future<_i5.RolesListResponse> show(_i5.RolesShowRequest? request) =>
+  _i18.Future<_i5.RolesListResponse> show(_i5.RolesShowRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #show,
           [request],
         ),
         returnValue:
-            _i17.Future<_i5.RolesListResponse>.value(_FakeRolesListResponse_51(
+            _i18.Future<_i5.RolesListResponse>.value(_FakeRolesListResponse_51(
           this,
           Invocation.method(
             #show,
@@ -4678,26 +4698,26 @@ class MockMisskeyRoles extends _i1.Mock implements _i5.MisskeyRoles {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i5.RolesListResponse>.value(_FakeRolesListResponse_51(
+            _i18.Future<_i5.RolesListResponse>.value(_FakeRolesListResponse_51(
           this,
           Invocation.method(
             #show,
             [request],
           ),
         )),
-      ) as _i17.Future<_i5.RolesListResponse>);
+      ) as _i18.Future<_i5.RolesListResponse>);
 
   @override
-  _i17.Future<Iterable<_i5.Note>> notes(_i5.RolesNotesRequest? request) =>
+  _i18.Future<Iterable<_i5.Note>> notes(_i5.RolesNotesRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #notes,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+        returnValue: _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
-      ) as _i17.Future<Iterable<_i5.Note>>);
+            _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+      ) as _i18.Future<Iterable<_i5.Note>>);
 }
 
 /// A class which mocks [MisskeyUsers].
@@ -4718,14 +4738,13 @@ class MockMisskeyUsers extends _i1.Mock implements _i5.MisskeyUsers {
       ) as _i5.MisskeyUsersLists);
 
   @override
-  _i17.Future<_i5.UsersShowResponse> show(_i5.UsersShowRequest? request) =>
+  _i18.Future<_i5.UserDetailed> show(_i5.UsersShowRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #show,
           [request],
         ),
-        returnValue:
-            _i17.Future<_i5.UsersShowResponse>.value(_FakeUsersShowResponse_53(
+        returnValue: _i18.Future<_i5.UserDetailed>.value(_FakeUserDetailed_53(
           this,
           Invocation.method(
             #show,
@@ -4733,40 +4752,38 @@ class MockMisskeyUsers extends _i1.Mock implements _i5.MisskeyUsers {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i5.UsersShowResponse>.value(_FakeUsersShowResponse_53(
+            _i18.Future<_i5.UserDetailed>.value(_FakeUserDetailed_53(
           this,
           Invocation.method(
             #show,
             [request],
           ),
         )),
-      ) as _i17.Future<_i5.UsersShowResponse>);
+      ) as _i18.Future<_i5.UserDetailed>);
 
   @override
-  _i17.Future<Iterable<_i5.UsersShowResponse>> showByIds(
+  _i18.Future<Iterable<_i5.UserDetailed>> showByIds(
           _i5.UsersShowByIdsRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #showByIds,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.UsersShowResponse>>.value(
-            <_i5.UsersShowResponse>[]),
+        returnValue:
+            _i18.Future<Iterable<_i5.UserDetailed>>.value(<_i5.UserDetailed>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.UsersShowResponse>>.value(
-                <_i5.UsersShowResponse>[]),
-      ) as _i17.Future<Iterable<_i5.UsersShowResponse>>);
+            _i18.Future<Iterable<_i5.UserDetailed>>.value(<_i5.UserDetailed>[]),
+      ) as _i18.Future<Iterable<_i5.UserDetailed>>);
 
   @override
-  _i17.Future<_i5.UsersShowResponse> showByName(
+  _i18.Future<_i5.UserDetailed> showByName(
           _i5.UsersShowByUserNameRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #showByName,
           [request],
         ),
-        returnValue:
-            _i17.Future<_i5.UsersShowResponse>.value(_FakeUsersShowResponse_53(
+        returnValue: _i18.Future<_i5.UserDetailed>.value(_FakeUserDetailed_53(
           this,
           Invocation.method(
             #showByName,
@@ -4774,41 +4791,41 @@ class MockMisskeyUsers extends _i1.Mock implements _i5.MisskeyUsers {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i5.UsersShowResponse>.value(_FakeUsersShowResponse_53(
+            _i18.Future<_i5.UserDetailed>.value(_FakeUserDetailed_53(
           this,
           Invocation.method(
             #showByName,
             [request],
           ),
         )),
-      ) as _i17.Future<_i5.UsersShowResponse>);
+      ) as _i18.Future<_i5.UserDetailed>);
 
   @override
-  _i17.Future<Iterable<_i5.Note>> notes(_i5.UsersNotesRequest? request) =>
+  _i18.Future<Iterable<_i5.Note>> notes(_i5.UsersNotesRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #notes,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+        returnValue: _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
-      ) as _i17.Future<Iterable<_i5.Note>>);
+            _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+      ) as _i18.Future<Iterable<_i5.Note>>);
 
   @override
-  _i17.Future<Iterable<_i5.Clip>> clips(_i5.UsersClipsRequest? request) =>
+  _i18.Future<Iterable<_i5.Clip>> clips(_i5.UsersClipsRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #clips,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Clip>>.value(<_i5.Clip>[]),
+        returnValue: _i18.Future<Iterable<_i5.Clip>>.value(<_i5.Clip>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Clip>>.value(<_i5.Clip>[]),
-      ) as _i17.Future<Iterable<_i5.Clip>>);
+            _i18.Future<Iterable<_i5.Clip>>.value(<_i5.Clip>[]),
+      ) as _i18.Future<Iterable<_i5.Clip>>);
 
   @override
-  _i17.Future<Iterable<_i5.Following>> followers(
+  _i18.Future<Iterable<_i5.Following>> followers(
           _i5.UsersFollowersRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -4816,13 +4833,13 @@ class MockMisskeyUsers extends _i1.Mock implements _i5.MisskeyUsers {
           [request],
         ),
         returnValue:
-            _i17.Future<Iterable<_i5.Following>>.value(<_i5.Following>[]),
+            _i18.Future<Iterable<_i5.Following>>.value(<_i5.Following>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Following>>.value(<_i5.Following>[]),
-      ) as _i17.Future<Iterable<_i5.Following>>);
+            _i18.Future<Iterable<_i5.Following>>.value(<_i5.Following>[]),
+      ) as _i18.Future<Iterable<_i5.Following>>);
 
   @override
-  _i17.Future<Iterable<_i5.Following>> following(
+  _i18.Future<Iterable<_i5.Following>> following(
           _i5.UsersFollowingRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -4830,121 +4847,123 @@ class MockMisskeyUsers extends _i1.Mock implements _i5.MisskeyUsers {
           [request],
         ),
         returnValue:
-            _i17.Future<Iterable<_i5.Following>>.value(<_i5.Following>[]),
+            _i18.Future<Iterable<_i5.Following>>.value(<_i5.Following>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Following>>.value(<_i5.Following>[]),
-      ) as _i17.Future<Iterable<_i5.Following>>);
+            _i18.Future<Iterable<_i5.Following>>.value(<_i5.Following>[]),
+      ) as _i18.Future<Iterable<_i5.Following>>);
 
   @override
-  _i17.Future<void> reportAbuse(_i5.UsersReportAbuseRequest? request) =>
+  _i18.Future<void> reportAbuse(_i5.UsersReportAbuseRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #reportAbuse,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<Iterable<_i5.UsersReactionsResponse>> reactions(
+  _i18.Future<Iterable<_i5.UsersReactionsResponse>> reactions(
           _i5.UsersReactionsRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #reactions,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.UsersReactionsResponse>>.value(
+        returnValue: _i18.Future<Iterable<_i5.UsersReactionsResponse>>.value(
             <_i5.UsersReactionsResponse>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.UsersReactionsResponse>>.value(
+            _i18.Future<Iterable<_i5.UsersReactionsResponse>>.value(
                 <_i5.UsersReactionsResponse>[]),
-      ) as _i17.Future<Iterable<_i5.UsersReactionsResponse>>);
+      ) as _i18.Future<Iterable<_i5.UsersReactionsResponse>>);
 
   @override
-  _i17.Future<Iterable<_i5.User>> search(_i5.UsersSearchRequest? request) =>
+  _i18.Future<Iterable<_i5.User>> search(_i5.UsersSearchRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #search,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.User>>.value(<_i5.User>[]),
+        returnValue: _i18.Future<Iterable<_i5.User>>.value(<_i5.User>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.User>>.value(<_i5.User>[]),
-      ) as _i17.Future<Iterable<_i5.User>>);
+            _i18.Future<Iterable<_i5.User>>.value(<_i5.User>[]),
+      ) as _i18.Future<Iterable<_i5.User>>);
 
   @override
-  _i17.Future<Iterable<_i5.User>> recommendation(
+  _i18.Future<Iterable<_i5.User>> recommendation(
           _i5.UsersRecommendationRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #recommendation,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.User>>.value(<_i5.User>[]),
+        returnValue: _i18.Future<Iterable<_i5.User>>.value(<_i5.User>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.User>>.value(<_i5.User>[]),
-      ) as _i17.Future<Iterable<_i5.User>>);
+            _i18.Future<Iterable<_i5.User>>.value(<_i5.User>[]),
+      ) as _i18.Future<Iterable<_i5.User>>);
 
   @override
-  _i17.Future<Iterable<_i5.User>> users(_i5.UsersUsersRequest? request) =>
+  _i18.Future<Iterable<_i5.UserDetailed>> users(
+          _i5.UsersUsersRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #users,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.User>>.value(<_i5.User>[]),
+        returnValue:
+            _i18.Future<Iterable<_i5.UserDetailed>>.value(<_i5.UserDetailed>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.User>>.value(<_i5.User>[]),
-      ) as _i17.Future<Iterable<_i5.User>>);
+            _i18.Future<Iterable<_i5.UserDetailed>>.value(<_i5.UserDetailed>[]),
+      ) as _i18.Future<Iterable<_i5.UserDetailed>>);
 
   @override
-  _i17.Future<void> updateMemo(_i5.UsersUpdateMemoRequest? request) =>
+  _i18.Future<void> updateMemo(_i5.UsersUpdateMemoRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #updateMemo,
           [request],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<Iterable<_i5.Flash>> flashs(_i5.UsersFlashsRequest? request) =>
+  _i18.Future<Iterable<_i5.Flash>> flashs(_i5.UsersFlashsRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #flashs,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Flash>>.value(<_i5.Flash>[]),
+        returnValue: _i18.Future<Iterable<_i5.Flash>>.value(<_i5.Flash>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Flash>>.value(<_i5.Flash>[]),
-      ) as _i17.Future<Iterable<_i5.Flash>>);
+            _i18.Future<Iterable<_i5.Flash>>.value(<_i5.Flash>[]),
+      ) as _i18.Future<Iterable<_i5.Flash>>);
 
   @override
-  _i17.Future<Iterable<_i5.Note>> featuredNotes(
+  _i18.Future<Iterable<_i5.Note>> featuredNotes(
           _i5.UsersFeaturedNotesRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #featuredNotes,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+        returnValue: _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
-      ) as _i17.Future<Iterable<_i5.Note>>);
+            _i18.Future<Iterable<_i5.Note>>.value(<_i5.Note>[]),
+      ) as _i18.Future<Iterable<_i5.Note>>);
 
   @override
-  _i17.Future<Iterable<_i5.Page>> pages(_i5.UsersPagesRequest? request) =>
+  _i18.Future<Iterable<_i5.Page>> pages(_i5.UsersPagesRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #pages,
           [request],
         ),
-        returnValue: _i17.Future<Iterable<_i5.Page>>.value(<_i5.Page>[]),
+        returnValue: _i18.Future<Iterable<_i5.Page>>.value(<_i5.Page>[]),
         returnValueForMissingStub:
-            _i17.Future<Iterable<_i5.Page>>.value(<_i5.Page>[]),
-      ) as _i17.Future<Iterable<_i5.Page>>);
+            _i18.Future<Iterable<_i5.Page>>.value(<_i5.Page>[]),
+      ) as _i18.Future<Iterable<_i5.Page>>);
 }
 
 /// A class which mocks [Dio].
@@ -5042,7 +5061,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
       );
 
   @override
-  _i17.Future<_i11.Response<T>> head<T>(
+  _i18.Future<_i11.Response<T>> head<T>(
     String? path, {
     Object? data,
     Map<String, dynamic>? queryParameters,
@@ -5060,7 +5079,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             #cancelToken: cancelToken,
           },
         ),
-        returnValue: _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+        returnValue: _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #head,
@@ -5074,7 +5093,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+            _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #head,
@@ -5087,10 +5106,10 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             },
           ),
         )),
-      ) as _i17.Future<_i11.Response<T>>);
+      ) as _i18.Future<_i11.Response<T>>);
 
   @override
-  _i17.Future<_i11.Response<T>> headUri<T>(
+  _i18.Future<_i11.Response<T>> headUri<T>(
     Uri? uri, {
     Object? data,
     _i11.Options? options,
@@ -5106,7 +5125,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             #cancelToken: cancelToken,
           },
         ),
-        returnValue: _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+        returnValue: _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #headUri,
@@ -5119,7 +5138,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+            _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #headUri,
@@ -5131,10 +5150,10 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             },
           ),
         )),
-      ) as _i17.Future<_i11.Response<T>>);
+      ) as _i18.Future<_i11.Response<T>>);
 
   @override
-  _i17.Future<_i11.Response<T>> get<T>(
+  _i18.Future<_i11.Response<T>> get<T>(
     String? path, {
     Object? data,
     Map<String, dynamic>? queryParameters,
@@ -5154,7 +5173,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             #onReceiveProgress: onReceiveProgress,
           },
         ),
-        returnValue: _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+        returnValue: _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #get,
@@ -5169,7 +5188,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+            _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #get,
@@ -5183,10 +5202,10 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             },
           ),
         )),
-      ) as _i17.Future<_i11.Response<T>>);
+      ) as _i18.Future<_i11.Response<T>>);
 
   @override
-  _i17.Future<_i11.Response<T>> getUri<T>(
+  _i18.Future<_i11.Response<T>> getUri<T>(
     Uri? uri, {
     Object? data,
     _i11.Options? options,
@@ -5204,7 +5223,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             #onReceiveProgress: onReceiveProgress,
           },
         ),
-        returnValue: _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+        returnValue: _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #getUri,
@@ -5218,7 +5237,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+            _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #getUri,
@@ -5231,10 +5250,10 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             },
           ),
         )),
-      ) as _i17.Future<_i11.Response<T>>);
+      ) as _i18.Future<_i11.Response<T>>);
 
   @override
-  _i17.Future<_i11.Response<T>> post<T>(
+  _i18.Future<_i11.Response<T>> post<T>(
     String? path, {
     Object? data,
     Map<String, dynamic>? queryParameters,
@@ -5256,7 +5275,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             #onReceiveProgress: onReceiveProgress,
           },
         ),
-        returnValue: _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+        returnValue: _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #post,
@@ -5272,7 +5291,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+            _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #post,
@@ -5287,10 +5306,10 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             },
           ),
         )),
-      ) as _i17.Future<_i11.Response<T>>);
+      ) as _i18.Future<_i11.Response<T>>);
 
   @override
-  _i17.Future<_i11.Response<T>> postUri<T>(
+  _i18.Future<_i11.Response<T>> postUri<T>(
     Uri? uri, {
     Object? data,
     _i11.Options? options,
@@ -5310,7 +5329,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             #onReceiveProgress: onReceiveProgress,
           },
         ),
-        returnValue: _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+        returnValue: _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #postUri,
@@ -5325,7 +5344,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+            _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #postUri,
@@ -5339,10 +5358,10 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             },
           ),
         )),
-      ) as _i17.Future<_i11.Response<T>>);
+      ) as _i18.Future<_i11.Response<T>>);
 
   @override
-  _i17.Future<_i11.Response<T>> put<T>(
+  _i18.Future<_i11.Response<T>> put<T>(
     String? path, {
     Object? data,
     Map<String, dynamic>? queryParameters,
@@ -5364,7 +5383,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             #onReceiveProgress: onReceiveProgress,
           },
         ),
-        returnValue: _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+        returnValue: _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #put,
@@ -5380,7 +5399,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+            _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #put,
@@ -5395,10 +5414,10 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             },
           ),
         )),
-      ) as _i17.Future<_i11.Response<T>>);
+      ) as _i18.Future<_i11.Response<T>>);
 
   @override
-  _i17.Future<_i11.Response<T>> putUri<T>(
+  _i18.Future<_i11.Response<T>> putUri<T>(
     Uri? uri, {
     Object? data,
     _i11.Options? options,
@@ -5418,7 +5437,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             #onReceiveProgress: onReceiveProgress,
           },
         ),
-        returnValue: _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+        returnValue: _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #putUri,
@@ -5433,7 +5452,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+            _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #putUri,
@@ -5447,10 +5466,10 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             },
           ),
         )),
-      ) as _i17.Future<_i11.Response<T>>);
+      ) as _i18.Future<_i11.Response<T>>);
 
   @override
-  _i17.Future<_i11.Response<T>> patch<T>(
+  _i18.Future<_i11.Response<T>> patch<T>(
     String? path, {
     Object? data,
     Map<String, dynamic>? queryParameters,
@@ -5472,7 +5491,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             #onReceiveProgress: onReceiveProgress,
           },
         ),
-        returnValue: _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+        returnValue: _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #patch,
@@ -5488,7 +5507,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+            _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #patch,
@@ -5503,10 +5522,10 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             },
           ),
         )),
-      ) as _i17.Future<_i11.Response<T>>);
+      ) as _i18.Future<_i11.Response<T>>);
 
   @override
-  _i17.Future<_i11.Response<T>> patchUri<T>(
+  _i18.Future<_i11.Response<T>> patchUri<T>(
     Uri? uri, {
     Object? data,
     _i11.Options? options,
@@ -5526,7 +5545,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             #onReceiveProgress: onReceiveProgress,
           },
         ),
-        returnValue: _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+        returnValue: _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #patchUri,
@@ -5541,7 +5560,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+            _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #patchUri,
@@ -5555,10 +5574,10 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             },
           ),
         )),
-      ) as _i17.Future<_i11.Response<T>>);
+      ) as _i18.Future<_i11.Response<T>>);
 
   @override
-  _i17.Future<_i11.Response<T>> delete<T>(
+  _i18.Future<_i11.Response<T>> delete<T>(
     String? path, {
     Object? data,
     Map<String, dynamic>? queryParameters,
@@ -5576,7 +5595,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             #cancelToken: cancelToken,
           },
         ),
-        returnValue: _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+        returnValue: _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #delete,
@@ -5590,7 +5609,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+            _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #delete,
@@ -5603,10 +5622,10 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             },
           ),
         )),
-      ) as _i17.Future<_i11.Response<T>>);
+      ) as _i18.Future<_i11.Response<T>>);
 
   @override
-  _i17.Future<_i11.Response<T>> deleteUri<T>(
+  _i18.Future<_i11.Response<T>> deleteUri<T>(
     Uri? uri, {
     Object? data,
     _i11.Options? options,
@@ -5622,7 +5641,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             #cancelToken: cancelToken,
           },
         ),
-        returnValue: _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+        returnValue: _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #deleteUri,
@@ -5635,7 +5654,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+            _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #deleteUri,
@@ -5647,10 +5666,10 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             },
           ),
         )),
-      ) as _i17.Future<_i11.Response<T>>);
+      ) as _i18.Future<_i11.Response<T>>);
 
   @override
-  _i17.Future<_i11.Response<dynamic>> download(
+  _i18.Future<_i11.Response<dynamic>> download(
     String? urlPath,
     dynamic savePath, {
     _i11.ProgressCallback? onReceiveProgress,
@@ -5679,7 +5698,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
           },
         ),
         returnValue:
-            _i17.Future<_i11.Response<dynamic>>.value(_FakeResponse_58<dynamic>(
+            _i18.Future<_i11.Response<dynamic>>.value(_FakeResponse_58<dynamic>(
           this,
           Invocation.method(
             #download,
@@ -5699,7 +5718,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i11.Response<dynamic>>.value(_FakeResponse_58<dynamic>(
+            _i18.Future<_i11.Response<dynamic>>.value(_FakeResponse_58<dynamic>(
           this,
           Invocation.method(
             #download,
@@ -5718,10 +5737,10 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             },
           ),
         )),
-      ) as _i17.Future<_i11.Response<dynamic>>);
+      ) as _i18.Future<_i11.Response<dynamic>>);
 
   @override
-  _i17.Future<_i11.Response<dynamic>> downloadUri(
+  _i18.Future<_i11.Response<dynamic>> downloadUri(
     Uri? uri,
     dynamic savePath, {
     _i11.ProgressCallback? onReceiveProgress,
@@ -5748,7 +5767,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
           },
         ),
         returnValue:
-            _i17.Future<_i11.Response<dynamic>>.value(_FakeResponse_58<dynamic>(
+            _i18.Future<_i11.Response<dynamic>>.value(_FakeResponse_58<dynamic>(
           this,
           Invocation.method(
             #downloadUri,
@@ -5767,7 +5786,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i11.Response<dynamic>>.value(_FakeResponse_58<dynamic>(
+            _i18.Future<_i11.Response<dynamic>>.value(_FakeResponse_58<dynamic>(
           this,
           Invocation.method(
             #downloadUri,
@@ -5785,10 +5804,10 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             },
           ),
         )),
-      ) as _i17.Future<_i11.Response<dynamic>>);
+      ) as _i18.Future<_i11.Response<dynamic>>);
 
   @override
-  _i17.Future<_i11.Response<T>> request<T>(
+  _i18.Future<_i11.Response<T>> request<T>(
     String? url, {
     Object? data,
     Map<String, dynamic>? queryParameters,
@@ -5810,7 +5829,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             #onReceiveProgress: onReceiveProgress,
           },
         ),
-        returnValue: _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+        returnValue: _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #request,
@@ -5826,7 +5845,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+            _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #request,
@@ -5841,10 +5860,10 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             },
           ),
         )),
-      ) as _i17.Future<_i11.Response<T>>);
+      ) as _i18.Future<_i11.Response<T>>);
 
   @override
-  _i17.Future<_i11.Response<T>> requestUri<T>(
+  _i18.Future<_i11.Response<T>> requestUri<T>(
     Uri? uri, {
     Object? data,
     _i11.CancelToken? cancelToken,
@@ -5864,7 +5883,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             #onReceiveProgress: onReceiveProgress,
           },
         ),
-        returnValue: _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+        returnValue: _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #requestUri,
@@ -5879,7 +5898,7 @@ class MockDio extends _i1.Mock implements _i11.Dio {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+            _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #requestUri,
@@ -5893,16 +5912,16 @@ class MockDio extends _i1.Mock implements _i11.Dio {
             },
           ),
         )),
-      ) as _i17.Future<_i11.Response<T>>);
+      ) as _i18.Future<_i11.Response<T>>);
 
   @override
-  _i17.Future<_i11.Response<T>> fetch<T>(_i11.RequestOptions? requestOptions) =>
+  _i18.Future<_i11.Response<T>> fetch<T>(_i11.RequestOptions? requestOptions) =>
       (super.noSuchMethod(
         Invocation.method(
           #fetch,
           [requestOptions],
         ),
-        returnValue: _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+        returnValue: _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #fetch,
@@ -5910,14 +5929,14 @@ class MockDio extends _i1.Mock implements _i11.Dio {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
+            _i18.Future<_i11.Response<T>>.value(_FakeResponse_58<T>(
           this,
           Invocation.method(
             #fetch,
             [requestOptions],
           ),
         )),
-      ) as _i17.Future<_i11.Response<T>>);
+      ) as _i18.Future<_i11.Response<T>>);
 }
 
 /// A class which mocks [HttpClient].
@@ -5991,7 +6010,7 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
 
   @override
   set authenticate(
-          _i17.Future<bool> Function(
+          _i18.Future<bool> Function(
             Uri,
             String,
             String?,
@@ -6006,7 +6025,7 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
 
   @override
   set connectionFactory(
-          _i17.Future<_i12.ConnectionTask<_i12.Socket>> Function(
+          _i18.Future<_i12.ConnectionTask<_i12.Socket>> Function(
             Uri,
             String?,
             int?,
@@ -6030,7 +6049,7 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
 
   @override
   set authenticateProxy(
-          _i17.Future<bool> Function(
+          _i18.Future<bool> Function(
             String,
             int,
             String,
@@ -6069,7 +6088,7 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
       );
 
   @override
-  _i17.Future<_i12.HttpClientRequest> open(
+  _i18.Future<_i12.HttpClientRequest> open(
     String? method,
     String? host,
     int? port,
@@ -6086,7 +6105,7 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
           ],
         ),
         returnValue:
-            _i17.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
+            _i18.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
           this,
           Invocation.method(
             #open,
@@ -6099,7 +6118,7 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
+            _i18.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
           this,
           Invocation.method(
             #open,
@@ -6111,10 +6130,10 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
             ],
           ),
         )),
-      ) as _i17.Future<_i12.HttpClientRequest>);
+      ) as _i18.Future<_i12.HttpClientRequest>);
 
   @override
-  _i17.Future<_i12.HttpClientRequest> openUrl(
+  _i18.Future<_i12.HttpClientRequest> openUrl(
     String? method,
     Uri? url,
   ) =>
@@ -6127,7 +6146,7 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
           ],
         ),
         returnValue:
-            _i17.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
+            _i18.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
           this,
           Invocation.method(
             #openUrl,
@@ -6138,7 +6157,7 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
+            _i18.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
           this,
           Invocation.method(
             #openUrl,
@@ -6148,10 +6167,10 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
             ],
           ),
         )),
-      ) as _i17.Future<_i12.HttpClientRequest>);
+      ) as _i18.Future<_i12.HttpClientRequest>);
 
   @override
-  _i17.Future<_i12.HttpClientRequest> get(
+  _i18.Future<_i12.HttpClientRequest> get(
     String? host,
     int? port,
     String? path,
@@ -6166,7 +6185,7 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
           ],
         ),
         returnValue:
-            _i17.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
+            _i18.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
           this,
           Invocation.method(
             #get,
@@ -6178,7 +6197,7 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
+            _i18.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
           this,
           Invocation.method(
             #get,
@@ -6189,16 +6208,16 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
             ],
           ),
         )),
-      ) as _i17.Future<_i12.HttpClientRequest>);
+      ) as _i18.Future<_i12.HttpClientRequest>);
 
   @override
-  _i17.Future<_i12.HttpClientRequest> getUrl(Uri? url) => (super.noSuchMethod(
+  _i18.Future<_i12.HttpClientRequest> getUrl(Uri? url) => (super.noSuchMethod(
         Invocation.method(
           #getUrl,
           [url],
         ),
         returnValue:
-            _i17.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
+            _i18.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
           this,
           Invocation.method(
             #getUrl,
@@ -6206,17 +6225,17 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
+            _i18.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
           this,
           Invocation.method(
             #getUrl,
             [url],
           ),
         )),
-      ) as _i17.Future<_i12.HttpClientRequest>);
+      ) as _i18.Future<_i12.HttpClientRequest>);
 
   @override
-  _i17.Future<_i12.HttpClientRequest> post(
+  _i18.Future<_i12.HttpClientRequest> post(
     String? host,
     int? port,
     String? path,
@@ -6231,7 +6250,7 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
           ],
         ),
         returnValue:
-            _i17.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
+            _i18.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
           this,
           Invocation.method(
             #post,
@@ -6243,7 +6262,7 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
+            _i18.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
           this,
           Invocation.method(
             #post,
@@ -6254,16 +6273,16 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
             ],
           ),
         )),
-      ) as _i17.Future<_i12.HttpClientRequest>);
+      ) as _i18.Future<_i12.HttpClientRequest>);
 
   @override
-  _i17.Future<_i12.HttpClientRequest> postUrl(Uri? url) => (super.noSuchMethod(
+  _i18.Future<_i12.HttpClientRequest> postUrl(Uri? url) => (super.noSuchMethod(
         Invocation.method(
           #postUrl,
           [url],
         ),
         returnValue:
-            _i17.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
+            _i18.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
           this,
           Invocation.method(
             #postUrl,
@@ -6271,17 +6290,17 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
+            _i18.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
           this,
           Invocation.method(
             #postUrl,
             [url],
           ),
         )),
-      ) as _i17.Future<_i12.HttpClientRequest>);
+      ) as _i18.Future<_i12.HttpClientRequest>);
 
   @override
-  _i17.Future<_i12.HttpClientRequest> put(
+  _i18.Future<_i12.HttpClientRequest> put(
     String? host,
     int? port,
     String? path,
@@ -6296,7 +6315,7 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
           ],
         ),
         returnValue:
-            _i17.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
+            _i18.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
           this,
           Invocation.method(
             #put,
@@ -6308,7 +6327,7 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
+            _i18.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
           this,
           Invocation.method(
             #put,
@@ -6319,16 +6338,16 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
             ],
           ),
         )),
-      ) as _i17.Future<_i12.HttpClientRequest>);
+      ) as _i18.Future<_i12.HttpClientRequest>);
 
   @override
-  _i17.Future<_i12.HttpClientRequest> putUrl(Uri? url) => (super.noSuchMethod(
+  _i18.Future<_i12.HttpClientRequest> putUrl(Uri? url) => (super.noSuchMethod(
         Invocation.method(
           #putUrl,
           [url],
         ),
         returnValue:
-            _i17.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
+            _i18.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
           this,
           Invocation.method(
             #putUrl,
@@ -6336,17 +6355,17 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
+            _i18.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
           this,
           Invocation.method(
             #putUrl,
             [url],
           ),
         )),
-      ) as _i17.Future<_i12.HttpClientRequest>);
+      ) as _i18.Future<_i12.HttpClientRequest>);
 
   @override
-  _i17.Future<_i12.HttpClientRequest> delete(
+  _i18.Future<_i12.HttpClientRequest> delete(
     String? host,
     int? port,
     String? path,
@@ -6361,7 +6380,7 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
           ],
         ),
         returnValue:
-            _i17.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
+            _i18.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
           this,
           Invocation.method(
             #delete,
@@ -6373,7 +6392,7 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
+            _i18.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
           this,
           Invocation.method(
             #delete,
@@ -6384,17 +6403,17 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
             ],
           ),
         )),
-      ) as _i17.Future<_i12.HttpClientRequest>);
+      ) as _i18.Future<_i12.HttpClientRequest>);
 
   @override
-  _i17.Future<_i12.HttpClientRequest> deleteUrl(Uri? url) =>
+  _i18.Future<_i12.HttpClientRequest> deleteUrl(Uri? url) =>
       (super.noSuchMethod(
         Invocation.method(
           #deleteUrl,
           [url],
         ),
         returnValue:
-            _i17.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
+            _i18.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
           this,
           Invocation.method(
             #deleteUrl,
@@ -6402,17 +6421,17 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
+            _i18.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
           this,
           Invocation.method(
             #deleteUrl,
             [url],
           ),
         )),
-      ) as _i17.Future<_i12.HttpClientRequest>);
+      ) as _i18.Future<_i12.HttpClientRequest>);
 
   @override
-  _i17.Future<_i12.HttpClientRequest> patch(
+  _i18.Future<_i12.HttpClientRequest> patch(
     String? host,
     int? port,
     String? path,
@@ -6427,7 +6446,7 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
           ],
         ),
         returnValue:
-            _i17.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
+            _i18.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
           this,
           Invocation.method(
             #patch,
@@ -6439,7 +6458,7 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
+            _i18.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
           this,
           Invocation.method(
             #patch,
@@ -6450,16 +6469,16 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
             ],
           ),
         )),
-      ) as _i17.Future<_i12.HttpClientRequest>);
+      ) as _i18.Future<_i12.HttpClientRequest>);
 
   @override
-  _i17.Future<_i12.HttpClientRequest> patchUrl(Uri? url) => (super.noSuchMethod(
+  _i18.Future<_i12.HttpClientRequest> patchUrl(Uri? url) => (super.noSuchMethod(
         Invocation.method(
           #patchUrl,
           [url],
         ),
         returnValue:
-            _i17.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
+            _i18.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
           this,
           Invocation.method(
             #patchUrl,
@@ -6467,17 +6486,17 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
+            _i18.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
           this,
           Invocation.method(
             #patchUrl,
             [url],
           ),
         )),
-      ) as _i17.Future<_i12.HttpClientRequest>);
+      ) as _i18.Future<_i12.HttpClientRequest>);
 
   @override
-  _i17.Future<_i12.HttpClientRequest> head(
+  _i18.Future<_i12.HttpClientRequest> head(
     String? host,
     int? port,
     String? path,
@@ -6492,7 +6511,7 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
           ],
         ),
         returnValue:
-            _i17.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
+            _i18.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
           this,
           Invocation.method(
             #head,
@@ -6504,7 +6523,7 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
+            _i18.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
           this,
           Invocation.method(
             #head,
@@ -6515,16 +6534,16 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
             ],
           ),
         )),
-      ) as _i17.Future<_i12.HttpClientRequest>);
+      ) as _i18.Future<_i12.HttpClientRequest>);
 
   @override
-  _i17.Future<_i12.HttpClientRequest> headUrl(Uri? url) => (super.noSuchMethod(
+  _i18.Future<_i12.HttpClientRequest> headUrl(Uri? url) => (super.noSuchMethod(
         Invocation.method(
           #headUrl,
           [url],
         ),
         returnValue:
-            _i17.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
+            _i18.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
           this,
           Invocation.method(
             #headUrl,
@@ -6532,14 +6551,14 @@ class MockHttpClient extends _i1.Mock implements _i12.HttpClient {
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
+            _i18.Future<_i12.HttpClientRequest>.value(_FakeHttpClientRequest_60(
           this,
           Invocation.method(
             #headUrl,
             [url],
           ),
         )),
-      ) as _i17.Future<_i12.HttpClientRequest>);
+      ) as _i18.Future<_i12.HttpClientRequest>);
 
   @override
   void addCredentials(
@@ -6610,22 +6629,22 @@ class MockSocketController extends _i1.Mock implements _i5.SocketController {
   @override
   String get id => (super.noSuchMethod(
         Invocation.getter(#id),
-        returnValue: _i26.dummyValue<String>(
+        returnValue: _i27.dummyValue<String>(
           this,
           Invocation.getter(#id),
         ),
-        returnValueForMissingStub: _i26.dummyValue<String>(
+        returnValueForMissingStub: _i27.dummyValue<String>(
           this,
           Invocation.getter(#id),
         ),
       ) as String);
 
   @override
-  _i28.Channel get channel => (super.noSuchMethod(
+  _i29.Channel get channel => (super.noSuchMethod(
         Invocation.getter(#channel),
-        returnValue: _i28.Channel.homeTimeline,
-        returnValueForMissingStub: _i28.Channel.homeTimeline,
-      ) as _i28.Channel);
+        returnValue: _i29.Channel.homeTimeline,
+        returnValueForMissingStub: _i29.Channel.homeTimeline,
+      ) as _i29.Channel);
 
   @override
   bool get isDisconnected => (super.noSuchMethod(
@@ -6643,6 +6662,19 @@ class MockSocketController extends _i1.Mock implements _i5.SocketController {
         returnValueForMissingStub: null,
       );
 
+  @override
+  _i13.WebSocketChannel get webSocketChannel => (super.noSuchMethod(
+        Invocation.getter(#webSocketChannel),
+        returnValue: _FakeWebSocketChannel_61(
+          this,
+          Invocation.getter(#webSocketChannel),
+        ),
+        returnValueForMissingStub: _FakeWebSocketChannel_61(
+          this,
+          Invocation.getter(#webSocketChannel),
+        ),
+      ) as _i13.WebSocketChannel);
+
   @override
   void connect() => super.noSuchMethod(
         Invocation.method(
@@ -6671,27 +6703,27 @@ class MockSocketController extends _i1.Mock implements _i5.SocketController {
       );
 
   @override
-  _i17.Future<void> subNote(String? noteId) => (super.noSuchMethod(
+  _i18.Future<void> subNote(String? noteId) => (super.noSuchMethod(
         Invocation.method(
           #subNote,
           [noteId],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> unsubNote(String? noteId) => (super.noSuchMethod(
+  _i18.Future<void> unsubNote(String? noteId) => (super.noSuchMethod(
         Invocation.method(
           #unsubNote,
           [noteId],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> requestLog({
+  _i18.Future<void> requestLog({
     String? id,
     int? length,
   }) =>
@@ -6704,14 +6736,14 @@ class MockSocketController extends _i1.Mock implements _i5.SocketController {
             #length: length,
           },
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> send(
+  _i18.Future<void> send(
     _i5.StreamingRequestType? requestType,
-    _i29.StreamingRequestBody? body,
+    _i30.StreamingRequestBody? body,
   ) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -6721,9 +6753,9 @@ class MockSocketController extends _i1.Mock implements _i5.SocketController {
             body,
           ],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 }
 
 /// A class which mocks [StreamingService].
@@ -6733,34 +6765,34 @@ class MockStreamingService extends _i1.Mock implements _i5.StreamingService {
   @override
   String get host => (super.noSuchMethod(
         Invocation.getter(#host),
-        returnValue: _i26.dummyValue<String>(
+        returnValue: _i27.dummyValue<String>(
           this,
           Invocation.getter(#host),
         ),
-        returnValueForMissingStub: _i26.dummyValue<String>(
+        returnValueForMissingStub: _i27.dummyValue<String>(
           this,
           Invocation.getter(#host),
         ),
       ) as String);
 
   @override
-  _i30.HashMap<String, _i5.SocketController> get streamingChannelControllers =>
+  _i31.HashMap<String, _i5.SocketController> get streamingChannelControllers =>
       (super.noSuchMethod(
         Invocation.getter(#streamingChannelControllers),
         returnValue:
-            _i26.dummyValue<_i30.HashMap<String, _i5.SocketController>>(
+            _i27.dummyValue<_i31.HashMap<String, _i5.SocketController>>(
           this,
           Invocation.getter(#streamingChannelControllers),
         ),
         returnValueForMissingStub:
-            _i26.dummyValue<_i30.HashMap<String, _i5.SocketController>>(
+            _i27.dummyValue<_i31.HashMap<String, _i5.SocketController>>(
           this,
           Invocation.getter(#streamingChannelControllers),
         ),
-      ) as _i30.HashMap<String, _i5.SocketController>);
+      ) as _i31.HashMap<String, _i5.SocketController>);
 
   @override
-  set subscription(_i17.StreamSubscription<dynamic>? _subscription) =>
+  set subscription(_i18.StreamSubscription<dynamic>? _subscription) =>
       super.noSuchMethod(
         Invocation.setter(
           #subscription,
@@ -6770,9 +6802,22 @@ class MockStreamingService extends _i1.Mock implements _i5.StreamingService {
       );
 
   @override
-  _i17.Future<void> onChannelEventReceived(
+  _i13.WebSocketChannel get webSocketChannel => (super.noSuchMethod(
+        Invocation.getter(#webSocketChannel),
+        returnValue: _FakeWebSocketChannel_61(
+          this,
+          Invocation.getter(#webSocketChannel),
+        ),
+        returnValueForMissingStub: _FakeWebSocketChannel_61(
+          this,
+          Invocation.getter(#webSocketChannel),
+        ),
+      ) as _i13.WebSocketChannel);
+
+  @override
+  _i18.Future<void> onChannelEventReceived(
     String? id,
-    _i31.ChannelEventType? type,
+    _i32.ChannelEventType? type,
     dynamic body,
   ) =>
       (super.noSuchMethod(
@@ -6784,14 +6829,14 @@ class MockStreamingService extends _i1.Mock implements _i5.StreamingService {
             body,
           ],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> onNoteUpdatedEventReceived(
+  _i18.Future<void> onNoteUpdatedEventReceived(
     String? id,
-    _i32.NoteUpdatedEventType? type,
+    _i33.NoteUpdatedEventType? type,
     Map<String, dynamic>? body,
   ) =>
       (super.noSuchMethod(
@@ -6803,13 +6848,13 @@ class MockStreamingService extends _i1.Mock implements _i5.StreamingService {
             body,
           ],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> onBroadcastEventReceived(
-    _i33.BroadcastEventType? type,
+  _i18.Future<void> onBroadcastEventReceived(
+    _i34.BroadcastEventType? type,
     Map<String, dynamic>? body,
   ) =>
       (super.noSuchMethod(
@@ -6820,35 +6865,35 @@ class MockStreamingService extends _i1.Mock implements _i5.StreamingService {
             body,
           ],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> startStreaming() => (super.noSuchMethod(
+  _i18.Future<void> startStreaming() => (super.noSuchMethod(
         Invocation.method(
           #startStreaming,
           [],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
   _i5.SocketController connect({
     String? id,
-    required _i28.Channel? channel,
-    _i17.Future<void> Function(
-      _i31.ChannelEventType,
+    required _i29.Channel? channel,
+    _i18.Future<void> Function(
+      _i32.ChannelEventType,
       dynamic,
     )? onChannelEventReceived,
-    _i17.Future<void> Function(
+    _i18.Future<void> Function(
       String,
-      _i32.NoteUpdatedEventType,
+      _i33.NoteUpdatedEventType,
       Map<String, dynamic>,
     )? onNoteUpdatedEventReceived,
-    _i17.Future<void> Function(
-      _i33.BroadcastEventType,
+    _i18.Future<void> Function(
+      _i34.BroadcastEventType,
       Map<String, dynamic>,
     )? onBroadcastEventReceived,
     Map<String, dynamic>? parameters,
@@ -6899,38 +6944,38 @@ class MockStreamingService extends _i1.Mock implements _i5.StreamingService {
       ) as _i5.SocketController);
 
   @override
-  _i17.Future<void> close() => (super.noSuchMethod(
+  _i18.Future<void> close() => (super.noSuchMethod(
         Invocation.method(
           #close,
           [],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> restart() => (super.noSuchMethod(
+  _i18.Future<void> restart() => (super.noSuchMethod(
         Invocation.method(
           #restart,
           [],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 }
 
 /// A class which mocks [FakeFilePickerPlatform].
 ///
 /// See the documentation for Mockito's code generation for more information.
 class MockFilePickerPlatform extends _i1.Mock
-    implements _i34.FakeFilePickerPlatform {
+    implements _i35.FakeFilePickerPlatform {
   @override
-  _i17.Future<_i35.FilePickerResult?> pickFiles({
+  _i18.Future<_i36.FilePickerResult?> pickFiles({
     String? dialogTitle,
     String? initialDirectory,
-    _i35.FileType? type = _i35.FileType.any,
+    _i36.FileType? type = _i36.FileType.any,
     List<String>? allowedExtensions,
-    dynamic Function(_i35.FilePickerStatus)? onFileLoading,
+    dynamic Function(_i36.FilePickerStatus)? onFileLoading,
     bool? allowCompression = true,
     bool? allowMultiple = false,
     bool? withData = false,
@@ -6954,22 +6999,22 @@ class MockFilePickerPlatform extends _i1.Mock
             #lockParentWindow: lockParentWindow,
           },
         ),
-        returnValue: _i17.Future<_i35.FilePickerResult?>.value(),
-        returnValueForMissingStub: _i17.Future<_i35.FilePickerResult?>.value(),
-      ) as _i17.Future<_i35.FilePickerResult?>);
+        returnValue: _i18.Future<_i36.FilePickerResult?>.value(),
+        returnValueForMissingStub: _i18.Future<_i36.FilePickerResult?>.value(),
+      ) as _i18.Future<_i36.FilePickerResult?>);
 
   @override
-  _i17.Future<bool?> clearTemporaryFiles() => (super.noSuchMethod(
+  _i18.Future<bool?> clearTemporaryFiles() => (super.noSuchMethod(
         Invocation.method(
           #clearTemporaryFiles,
           [],
         ),
-        returnValue: _i17.Future<bool?>.value(),
-        returnValueForMissingStub: _i17.Future<bool?>.value(),
-      ) as _i17.Future<bool?>);
+        returnValue: _i18.Future<bool?>.value(),
+        returnValueForMissingStub: _i18.Future<bool?>.value(),
+      ) as _i18.Future<bool?>);
 
   @override
-  _i17.Future<String?> getDirectoryPath({
+  _i18.Future<String?> getDirectoryPath({
     String? dialogTitle,
     bool? lockParentWindow = false,
     String? initialDirectory,
@@ -6984,16 +7029,16 @@ class MockFilePickerPlatform extends _i1.Mock
             #initialDirectory: initialDirectory,
           },
         ),
-        returnValue: _i17.Future<String?>.value(),
-        returnValueForMissingStub: _i17.Future<String?>.value(),
-      ) as _i17.Future<String?>);
+        returnValue: _i18.Future<String?>.value(),
+        returnValueForMissingStub: _i18.Future<String?>.value(),
+      ) as _i18.Future<String?>);
 
   @override
-  _i17.Future<String?> saveFile({
+  _i18.Future<String?> saveFile({
     String? dialogTitle,
     String? fileName,
     String? initialDirectory,
-    _i35.FileType? type = _i35.FileType.any,
+    _i36.FileType? type = _i36.FileType.any,
     List<String>? allowedExtensions,
     bool? lockParentWindow = false,
   }) =>
@@ -7010,18 +7055,18 @@ class MockFilePickerPlatform extends _i1.Mock
             #lockParentWindow: lockParentWindow,
           },
         ),
-        returnValue: _i17.Future<String?>.value(),
-        returnValueForMissingStub: _i17.Future<String?>.value(),
-      ) as _i17.Future<String?>);
+        returnValue: _i18.Future<String?>.value(),
+        returnValueForMissingStub: _i18.Future<String?>.value(),
+      ) as _i18.Future<String?>);
 }
 
 /// A class which mocks [$MockBaseCacheManager].
 ///
 /// See the documentation for Mockito's code generation for more information.
 class MockBaseCacheManager extends _i1.Mock
-    implements _i34.$MockBaseCacheManager {
+    implements _i35.$MockBaseCacheManager {
   @override
-  _i17.Future<_i13.File> getSingleFile(
+  _i18.Future<_i14.File> getSingleFile(
     String? url, {
     String? key,
     Map<String, String>? headers,
@@ -7035,7 +7080,7 @@ class MockBaseCacheManager extends _i1.Mock
             #headers: headers,
           },
         ),
-        returnValue: _i17.Future<_i13.File>.value(_FakeFile_61(
+        returnValue: _i18.Future<_i14.File>.value(_FakeFile_62(
           this,
           Invocation.method(
             #getSingleFile,
@@ -7046,7 +7091,7 @@ class MockBaseCacheManager extends _i1.Mock
             },
           ),
         )),
-        returnValueForMissingStub: _i17.Future<_i13.File>.value(_FakeFile_61(
+        returnValueForMissingStub: _i18.Future<_i14.File>.value(_FakeFile_62(
           this,
           Invocation.method(
             #getSingleFile,
@@ -7057,10 +7102,10 @@ class MockBaseCacheManager extends _i1.Mock
             },
           ),
         )),
-      ) as _i17.Future<_i13.File>);
+      ) as _i18.Future<_i14.File>);
 
   @override
-  _i17.Stream<_i14.FileInfo> getFile(
+  _i18.Stream<_i15.FileInfo> getFile(
     String? url, {
     String? key,
     Map<String, String>? headers,
@@ -7074,12 +7119,12 @@ class MockBaseCacheManager extends _i1.Mock
             #headers: headers,
           },
         ),
-        returnValue: _i17.Stream<_i14.FileInfo>.empty(),
-        returnValueForMissingStub: _i17.Stream<_i14.FileInfo>.empty(),
-      ) as _i17.Stream<_i14.FileInfo>);
+        returnValue: _i18.Stream<_i15.FileInfo>.empty(),
+        returnValueForMissingStub: _i18.Stream<_i15.FileInfo>.empty(),
+      ) as _i18.Stream<_i15.FileInfo>);
 
   @override
-  _i17.Stream<_i14.FileResponse> getFileStream(
+  _i18.Stream<_i15.FileResponse> getFileStream(
     String? url, {
     String? key,
     Map<String, String>? headers,
@@ -7095,12 +7140,12 @@ class MockBaseCacheManager extends _i1.Mock
             #withProgress: withProgress,
           },
         ),
-        returnValue: _i17.Stream<_i14.FileResponse>.empty(),
-        returnValueForMissingStub: _i17.Stream<_i14.FileResponse>.empty(),
-      ) as _i17.Stream<_i14.FileResponse>);
+        returnValue: _i18.Stream<_i15.FileResponse>.empty(),
+        returnValueForMissingStub: _i18.Stream<_i15.FileResponse>.empty(),
+      ) as _i18.Stream<_i15.FileResponse>);
 
   @override
-  _i17.Future<_i14.FileInfo> downloadFile(
+  _i18.Future<_i15.FileInfo> downloadFile(
     String? url, {
     String? key,
     Map<String, String>? authHeaders,
@@ -7116,7 +7161,7 @@ class MockBaseCacheManager extends _i1.Mock
             #force: force,
           },
         ),
-        returnValue: _i17.Future<_i14.FileInfo>.value(_FakeFileInfo_62(
+        returnValue: _i18.Future<_i15.FileInfo>.value(_FakeFileInfo_63(
           this,
           Invocation.method(
             #downloadFile,
@@ -7129,7 +7174,7 @@ class MockBaseCacheManager extends _i1.Mock
           ),
         )),
         returnValueForMissingStub:
-            _i17.Future<_i14.FileInfo>.value(_FakeFileInfo_62(
+            _i18.Future<_i15.FileInfo>.value(_FakeFileInfo_63(
           this,
           Invocation.method(
             #downloadFile,
@@ -7141,10 +7186,10 @@ class MockBaseCacheManager extends _i1.Mock
             },
           ),
         )),
-      ) as _i17.Future<_i14.FileInfo>);
+      ) as _i18.Future<_i15.FileInfo>);
 
   @override
-  _i17.Future<_i14.FileInfo?> getFileFromCache(
+  _i18.Future<_i15.FileInfo?> getFileFromCache(
     String? key, {
     bool? ignoreMemCache = false,
   }) =>
@@ -7154,25 +7199,25 @@ class MockBaseCacheManager extends _i1.Mock
           [key],
           {#ignoreMemCache: ignoreMemCache},
         ),
-        returnValue: _i17.Future<_i14.FileInfo?>.value(),
-        returnValueForMissingStub: _i17.Future<_i14.FileInfo?>.value(),
-      ) as _i17.Future<_i14.FileInfo?>);
+        returnValue: _i18.Future<_i15.FileInfo?>.value(),
+        returnValueForMissingStub: _i18.Future<_i15.FileInfo?>.value(),
+      ) as _i18.Future<_i15.FileInfo?>);
 
   @override
-  _i17.Future<_i14.FileInfo?> getFileFromMemory(String? key) =>
+  _i18.Future<_i15.FileInfo?> getFileFromMemory(String? key) =>
       (super.noSuchMethod(
         Invocation.method(
           #getFileFromMemory,
           [key],
         ),
-        returnValue: _i17.Future<_i14.FileInfo?>.value(),
-        returnValueForMissingStub: _i17.Future<_i14.FileInfo?>.value(),
-      ) as _i17.Future<_i14.FileInfo?>);
+        returnValue: _i18.Future<_i15.FileInfo?>.value(),
+        returnValueForMissingStub: _i18.Future<_i15.FileInfo?>.value(),
+      ) as _i18.Future<_i15.FileInfo?>);
 
   @override
-  _i17.Future<_i13.File> putFile(
+  _i18.Future<_i14.File> putFile(
     String? url,
-    _i27.Uint8List? fileBytes, {
+    _i28.Uint8List? fileBytes, {
     String? key,
     String? eTag,
     Duration? maxAge = const Duration(days: 30),
@@ -7192,7 +7237,7 @@ class MockBaseCacheManager extends _i1.Mock
             #fileExtension: fileExtension,
           },
         ),
-        returnValue: _i17.Future<_i13.File>.value(_FakeFile_61(
+        returnValue: _i18.Future<_i14.File>.value(_FakeFile_62(
           this,
           Invocation.method(
             #putFile,
@@ -7208,7 +7253,7 @@ class MockBaseCacheManager extends _i1.Mock
             },
           ),
         )),
-        returnValueForMissingStub: _i17.Future<_i13.File>.value(_FakeFile_61(
+        returnValueForMissingStub: _i18.Future<_i14.File>.value(_FakeFile_62(
           this,
           Invocation.method(
             #putFile,
@@ -7224,12 +7269,12 @@ class MockBaseCacheManager extends _i1.Mock
             },
           ),
         )),
-      ) as _i17.Future<_i13.File>);
+      ) as _i18.Future<_i14.File>);
 
   @override
-  _i17.Future<_i13.File> putFileStream(
+  _i18.Future<_i14.File> putFileStream(
     String? url,
-    _i17.Stream<List<int>>? source, {
+    _i18.Stream<List<int>>? source, {
     String? key,
     String? eTag,
     Duration? maxAge = const Duration(days: 30),
@@ -7249,7 +7294,7 @@ class MockBaseCacheManager extends _i1.Mock
             #fileExtension: fileExtension,
           },
         ),
-        returnValue: _i17.Future<_i13.File>.value(_FakeFile_61(
+        returnValue: _i18.Future<_i14.File>.value(_FakeFile_62(
           this,
           Invocation.method(
             #putFileStream,
@@ -7265,7 +7310,7 @@ class MockBaseCacheManager extends _i1.Mock
             },
           ),
         )),
-        returnValueForMissingStub: _i17.Future<_i13.File>.value(_FakeFile_61(
+        returnValueForMissingStub: _i18.Future<_i14.File>.value(_FakeFile_62(
           this,
           Invocation.method(
             #putFileStream,
@@ -7281,56 +7326,56 @@ class MockBaseCacheManager extends _i1.Mock
             },
           ),
         )),
-      ) as _i17.Future<_i13.File>);
+      ) as _i18.Future<_i14.File>);
 
   @override
-  _i17.Future<void> removeFile(String? key) => (super.noSuchMethod(
+  _i18.Future<void> removeFile(String? key) => (super.noSuchMethod(
         Invocation.method(
           #removeFile,
           [key],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> emptyCache() => (super.noSuchMethod(
+  _i18.Future<void> emptyCache() => (super.noSuchMethod(
         Invocation.method(
           #emptyCache,
           [],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<void> dispose() => (super.noSuchMethod(
+  _i18.Future<void> dispose() => (super.noSuchMethod(
         Invocation.method(
           #dispose,
           [],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 }
 
 /// A class which mocks [$MockUrlLauncherPlatform].
 ///
 /// See the documentation for Mockito's code generation for more information.
 class MockUrlLauncherPlatform extends _i1.Mock
-    implements _i34.$MockUrlLauncherPlatform {
+    implements _i35.$MockUrlLauncherPlatform {
   @override
-  _i17.Future<bool> canLaunch(String? url) => (super.noSuchMethod(
+  _i18.Future<bool> canLaunch(String? url) => (super.noSuchMethod(
         Invocation.method(
           #canLaunch,
           [url],
         ),
-        returnValue: _i17.Future<bool>.value(false),
-        returnValueForMissingStub: _i17.Future<bool>.value(false),
-      ) as _i17.Future<bool>);
+        returnValue: _i18.Future<bool>.value(false),
+        returnValueForMissingStub: _i18.Future<bool>.value(false),
+      ) as _i18.Future<bool>);
 
   @override
-  _i17.Future<bool> launch(
+  _i18.Future<bool> launch(
     String? url, {
     required bool? useSafariVC,
     required bool? useWebView,
@@ -7354,14 +7399,14 @@ class MockUrlLauncherPlatform extends _i1.Mock
             #webOnlyWindowName: webOnlyWindowName,
           },
         ),
-        returnValue: _i17.Future<bool>.value(false),
-        returnValueForMissingStub: _i17.Future<bool>.value(false),
-      ) as _i17.Future<bool>);
+        returnValue: _i18.Future<bool>.value(false),
+        returnValueForMissingStub: _i18.Future<bool>.value(false),
+      ) as _i18.Future<bool>);
 
   @override
-  _i17.Future<bool> launchUrl(
+  _i18.Future<bool> launchUrl(
     String? url,
-    _i36.LaunchOptions? options,
+    _i37.LaunchOptions? options,
   ) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -7371,39 +7416,39 @@ class MockUrlLauncherPlatform extends _i1.Mock
             options,
           ],
         ),
-        returnValue: _i17.Future<bool>.value(false),
-        returnValueForMissingStub: _i17.Future<bool>.value(false),
-      ) as _i17.Future<bool>);
+        returnValue: _i18.Future<bool>.value(false),
+        returnValueForMissingStub: _i18.Future<bool>.value(false),
+      ) as _i18.Future<bool>);
 
   @override
-  _i17.Future<void> closeWebView() => (super.noSuchMethod(
+  _i18.Future<void> closeWebView() => (super.noSuchMethod(
         Invocation.method(
           #closeWebView,
           [],
         ),
-        returnValue: _i17.Future<void>.value(),
-        returnValueForMissingStub: _i17.Future<void>.value(),
-      ) as _i17.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 
   @override
-  _i17.Future<bool> supportsMode(_i36.PreferredLaunchMode? mode) =>
+  _i18.Future<bool> supportsMode(_i37.PreferredLaunchMode? mode) =>
       (super.noSuchMethod(
         Invocation.method(
           #supportsMode,
           [mode],
         ),
-        returnValue: _i17.Future<bool>.value(false),
-        returnValueForMissingStub: _i17.Future<bool>.value(false),
-      ) as _i17.Future<bool>);
+        returnValue: _i18.Future<bool>.value(false),
+        returnValueForMissingStub: _i18.Future<bool>.value(false),
+      ) as _i18.Future<bool>);
 
   @override
-  _i17.Future<bool> supportsCloseForMode(_i36.PreferredLaunchMode? mode) =>
+  _i18.Future<bool> supportsCloseForMode(_i37.PreferredLaunchMode? mode) =>
       (super.noSuchMethod(
         Invocation.method(
           #supportsCloseForMode,
           [mode],
         ),
-        returnValue: _i17.Future<bool>.value(false),
-        returnValueForMissingStub: _i17.Future<bool>.value(false),
-      ) as _i17.Future<bool>);
+        returnValue: _i18.Future<bool>.value(false),
+        returnValueForMissingStub: _i18.Future<bool>.value(false),
+      ) as _i18.Future<bool>);
 }
diff --git a/test/test_util/test_datas.dart b/test/test_util/test_datas.dart
index 7c4b47224..4642be7c0 100644
--- a/test/test_util/test_datas.dart
+++ b/test/test_util/test_datas.dart
@@ -14,7 +14,7 @@ class TestData {
       meta: meta);
 
   // i
-  static IResponse i1 = IResponse.fromJson(JSON5.parse(r"""
+  static MeDetailed i1 = MeDetailed.fromJson(JSON5.parse(r"""
 {
   id: '7rkr3b1c1c',
   name: '藍',
@@ -379,8 +379,8 @@ class TestData {
   files: [],
   replyId: null,
   renoteId: null,
-}  
-  
+}
+
   '''));
 
   static Note note2 = Note.fromJson(JSON5.parse(r'''
@@ -418,7 +418,7 @@ class TestData {
   files: [],
   replyId: null,
   renoteId: null,
-}  
+}
   '''));
 
   /// 自身でないノート１
@@ -463,7 +463,7 @@ class TestData {
   files: [],
   replyId: null,
   renoteId: null,
-}  
+}
   '''));
 
   /// 自身のノート（投票込みのノート）
@@ -644,7 +644,7 @@ class TestData {
   replyId: null,
   renoteId: null,
   myReaction: ':ultra_igyo@.:',
-}  
+}
   '''));
 
   /// Renote
@@ -779,7 +779,7 @@ class TestData {
     folder: null,
     userId: null,
     user: null,
-  }  
+  }
   '''));
 
   static DriveFile drive2AsVideo = DriveFile.fromJson(JSON5.parse(r'''
@@ -812,7 +812,7 @@ class TestData {
       data: await binaryImage);
 
   // ユーザー情報
-  static User user1 = User.fromJson(JSON5.parse(r'''
+  static UserLite user1 = UserLite.fromJson(JSON5.parse(r'''
 {
   id: '7rkr3b1c1c',
   name: '藍',
@@ -828,7 +828,8 @@ class TestData {
 }'''));
   static String user1ExpectId = "7rkr3b1c1c";
 
-  static User detailedUser1 = User.fromJson(JSON5.parse(r'''
+  static UserDetailedNotMeWithRelations detailedUser1 =
+      UserDetailedNotMeWithRelations.fromJson(JSON5.parse(r'''
 {
   id: '7z9zua5kyv',
   name: 'おいしいBot',
@@ -997,7 +998,8 @@ class TestData {
   isRenoteMuted: false,
 }  '''));
 
-  static User detailedUser2 = User.fromJson(JSON5.parse(r'''
+  static UserDetailedNotMeWithRelations detailedUser2 =
+      UserDetailedNotMeWithRelations.fromJson(JSON5.parse(r'''
 {
   id: '9gbzuv2cze',
   name: '藍ちゃんにおじさん構文でメンションを送るbot',
@@ -1109,8 +1111,8 @@ class TestData {
   static String detailedUser2ExpectedId = "9gbzuv2cze";
 
   // ユーザー情報
-  static UsersShowResponse usersShowResponse1 =
-      UsersShowResponse.fromJson(JSON5.parse(r'''
+  static UserDetailedNotMeWithRelations usersShowResponse1 =
+      UserDetailedNotMeWithRelations.fromJson(JSON5.parse(r'''
 {
   id: '7rkr3b1c1c',
   name: '藍',
@@ -1217,12 +1219,12 @@ class TestData {
   isBlocked: false,
   isMuted: false,
   isRenoteMuted: false,
-}  
-  
+}
+
   '''));
 
-  static UsersShowResponse usersShowResponse2 =
-      UsersShowResponse.fromJson(JSON5.parse(r'''
+  static UserDetailedNotMeWithRelations usersShowResponse2 =
+      UserDetailedNotMeWithRelations.fromJson(JSON5.parse(r'''
 {
   id: '7z9zua5kyv',
   name: 'おいしいBot',
@@ -1391,12 +1393,12 @@ class TestData {
   isBlocked: false,
   isMuted: false,
   isRenoteMuted: false,
-}  
-  
+}
+
   '''));
 
-  static UsersShowResponse usersShowResponse3AsRemoteUser =
-      UsersShowResponse.fromJson(JSON5.parse(r'''
+  static UserDetailedNotMeWithRelations usersShowResponse3AsRemoteUser =
+      UserDetailedNotMeWithRelations.fromJson(JSON5.parse(r'''
 {
   id: '9i08deo0vj',
   name: 'あけおめらんか～',
@@ -1476,8 +1478,8 @@ class TestData {
 }
 '''));
 
-  static UsersShowResponse usersShowResponse3AsLocalUser =
-      UsersShowResponse.fromJson(JSON5.parse('''
+  static UserDetailedNotMeWithRelations usersShowResponse3AsLocalUser =
+      UserDetailedNotMeWithRelations.fromJson(JSON5.parse('''
 {
   id: '9i07ia9bf0',
   name: 'あけおめらんか～',
@@ -1676,7 +1678,7 @@ class TestData {
   isFollowing: true,
   isFavorited: true,
   hasUnreadNote: false,
-}  
+}
   '''));
 
   // アンテナ
diff --git a/test/view/common/misskey_notes/misskey_notes_test.dart b/test/view/common/misskey_notes/misskey_notes_test.dart
index 5da4e8d60..8fd0a45f0 100644
--- a/test/view/common/misskey_notes/misskey_notes_test.dart
+++ b/test/view/common/misskey_notes/misskey_notes_test.dart
@@ -257,7 +257,7 @@ System.out.println("@ai uneune");
             NotesReactionsResponse(
                 id: "reaction1",
                 createdAt: DateTime.now(),
-                user: TestData.detailedUser2,
+                user: UserLite.fromJson(TestData.detailedUser2.toJson()),
                 type: ":ai_yay:")
           ]);
       await tester.pumpWidget(buildTestWidget(
diff --git a/test/view/note_create_page/note_create_page_test.dart b/test/view/note_create_page/note_create_page_test.dart
index 00b85aed3..30d45cfc4 100644
--- a/test/view/note_create_page/note_create_page_test.dart
+++ b/test/view/note_create_page/note_create_page_test.dart
@@ -904,8 +904,8 @@ void main() {
         final misskey = MockMisskey();
         final users = MockMisskeyUsers();
         when(misskey.users).thenReturn(users);
-        when(users.show(any))
-            .thenAnswer((_) async => TestData.usersShowResponse2);
+        when(users.showByIds(any))
+            .thenAnswer((_) async => [TestData.usersShowResponse2]);
 
         await tester.pumpWidget(ProviderScope(
             overrides: [
@@ -941,8 +941,8 @@ void main() {
         final misskey = MockMisskey();
         final users = MockMisskeyUsers();
         when(misskey.users).thenReturn(users);
-        when(users.show(any))
-            .thenAnswer((_) async => TestData.usersShowResponse1);
+        when(users.showByIds(any))
+            .thenAnswer((_) async => [TestData.usersShowResponse1]);
         await tester.pumpWidget(ProviderScope(
             overrides: [
               misskeyProvider.overrideWith((ref, arg) => misskey),
diff --git a/test/view/user_page/user_page_test.dart b/test/view/user_page/user_page_test.dart
index 76302f393..dc2a4ec2b 100644
--- a/test/view/user_page/user_page_test.dart
+++ b/test/view/user_page/user_page_test.dart
@@ -138,11 +138,12 @@ void main() {
           final mockMisskey = MockMisskey();
           final mockUser = MockMisskeyUsers();
           when(mockMisskey.users).thenReturn(mockUser);
-          when(mockUser.show(any)).thenAnswer((_) async =>
-              TestData.usersShowResponse2.copyWith(
-                  isFollowing: false,
-                  isLocked: false,
-                  autoAcceptFollowed: true));
+          when(mockUser.show(any)).thenAnswer(
+            (_) async => TestData.usersShowResponse2.copyWith(
+              isFollowing: false,
+              isLocked: false,
+            ),
+          );
 
           await tester.pumpWidget(ProviderScope(
             overrides: [
@@ -163,13 +164,14 @@ void main() {
           final mockMisskey = MockMisskey();
           final mockUser = MockMisskeyUsers();
           when(mockMisskey.users).thenReturn(mockUser);
-          when(mockUser.show(any)).thenAnswer((_) async =>
-              TestData.usersShowResponse2.copyWith(
-                  isFollowing: false,
-                  hasPendingFollowRequestFromYou: false,
-                  isLocked: true,
-                  isFollowed: false,
-                  autoAcceptFollowed: false));
+          when(mockUser.show(any)).thenAnswer(
+            (_) async => TestData.usersShowResponse2.copyWith(
+              isFollowing: false,
+              hasPendingFollowRequestFromYou: false,
+              isLocked: true,
+              isFollowed: false,
+            ),
+          );
 
           await tester.pumpWidget(ProviderScope(
             overrides: [
@@ -519,7 +521,6 @@ void main() {
                 followeeId: TestData.usersShowResponse2.id,
                 followerId: TestData.account.i.id,
                 followee: TestData.detailedUser2,
-                follower: TestData.user1,
               )
             ]);
 
@@ -557,7 +558,6 @@ void main() {
                 createdAt: DateTime.now(),
                 followeeId: TestData.account.i.id,
                 followerId: TestData.usersShowResponse2.id,
-                followee: TestData.user1,
                 follower: TestData.detailedUser2,
               )
             ]);