From a8fcbe36d03885a0ff799d3faad94868a8cffaa7 Mon Sep 17 00:00:00 2001 From: poppingmoon <63451158+poppingmoon@users.noreply.github.com> Date: Sun, 15 Oct 2023 17:31:37 +0900 Subject: [PATCH] =?UTF-8?q?shiosyakeyakini-info/misskey=5Fdart#25=20?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../users_show_response_extension.dart | 7 - lib/model/account.dart | 6 +- lib/model/account.freezed.dart | 24 +- lib/model/account.g.dart | 2 +- lib/router/app_router.gr.dart | 1552 ++++++------ .../misskey_notes/misskey_note_notifier.dart | 16 +- .../note_create_state_notifier.dart | 26 +- lib/view/common/account_select_dialog.dart | 2 +- lib/view/common/avatar_icon.dart | 33 - lib/view/common/common_drawer.dart | 2 +- .../misskey_notes/note_modal_sheet.dart | 2 - .../note_create_setting_top.dart | 4 +- .../account_settings_page/account_list.dart | 2 +- .../hard_mute_page/hard_mute_page.dart | 2 +- .../instance_mute_page.dart | 2 +- .../account_select_page.dart | 2 +- lib/view/user_page/user_control_dialog.dart | 21 +- lib/view/user_page/user_detail.dart | 233 +- lib/view/user_page/user_page.dart | 8 +- .../users_list_detail_page.dart | 2 +- test/test_util/mock.mocks.dart | 2167 ++++++++--------- test/test_util/test_datas.dart | 48 +- .../misskey_notes/misskey_notes_test.dart | 2 +- .../note_create_page_test.dart | 8 +- test/view/user_page/user_page_test.dart | 28 +- 25 files changed, 2078 insertions(+), 2123 deletions(-) delete mode 100644 lib/extensions/users_show_response_extension.dart 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 dea8b2747..98c472a84 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, }) = _Account; factory Account.fromJson(Map json) => @@ -41,7 +41,7 @@ class Account with _$Account { host: host, userId: "", token: null, - i: IResponse( + i: MeDetailed( id: "", username: "", createdAt: DateTime.now(), @@ -56,7 +56,7 @@ class Account with _$Account { followersCount: 0, notesCount: 0, publicReactions: false, - ffVisibility: "", + ffVisibility: FFVisibility.public, twoFactorEnabled: false, usePasswordLessLogin: false, securityKeys: false, diff --git a/lib/model/account.freezed.dart b/lib/model/account.freezed.dart index ed2914c05..5a8c0cbeb 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; Map toJson() => throw _privateConstructorUsedError; @JsonKey(ignore: true) @@ -35,9 +35,9 @@ abstract class $AccountCopyWith<$Res> { factory $AccountCopyWith(Account value, $Res Function(Account) then) = _$AccountCopyWithImpl<$Res, Account>; @useResult - $Res call({String host, String userId, String? token, IResponse i}); + $Res call({String host, String userId, String? token, MeDetailed i}); - $IResponseCopyWith<$Res> get i; + $MeDetailedCopyWith<$Res> get i; } /// @nodoc @@ -74,14 +74,14 @@ class _$AccountCopyWithImpl<$Res, $Val extends Account> i: null == i ? _value.i : i // ignore: cast_nullable_to_non_nullable - as IResponse, + as MeDetailed, ) as $Val); } @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); }); } @@ -94,10 +94,10 @@ abstract class _$$AccountImplCopyWith<$Res> implements $AccountCopyWith<$Res> { __$$AccountImplCopyWithImpl<$Res>; @override @useResult - $Res call({String host, String userId, String? token, IResponse i}); + $Res call({String host, String userId, String? token, MeDetailed i}); @override - $IResponseCopyWith<$Res> get i; + $MeDetailedCopyWith<$Res> get i; } /// @nodoc @@ -132,7 +132,7 @@ class __$$AccountImplCopyWithImpl<$Res> i: null == i ? _value.i : i // ignore: cast_nullable_to_non_nullable - as IResponse, + as MeDetailed, )); } } @@ -154,7 +154,7 @@ class _$AccountImpl extends _Account { @override final String? token; @override - final IResponse i; + final MeDetailed i; @override String toString() { @@ -180,7 +180,7 @@ abstract class _Account extends Account { {required final String host, required final String userId, final String? token, - required final IResponse i}) = _$AccountImpl; + required final MeDetailed i}) = _$AccountImpl; const _Account._() : super._(); factory _Account.fromJson(Map json) = _$AccountImpl.fromJson; @@ -192,7 +192,7 @@ abstract class _Account extends Account { @override String? get token; @override - IResponse get i; + MeDetailed get i; @override @JsonKey(ignore: true) _$$AccountImplCopyWith<_$AccountImpl> get copyWith => diff --git a/lib/model/account.g.dart b/lib/model/account.g.dart index fac86496a..7e9213d1f 100644 --- a/lib/model/account.g.dart +++ b/lib/model/account.g.dart @@ -11,7 +11,7 @@ _$AccountImpl _$$AccountImplFromJson(Map json) => host: json['host'] as String, userId: json['userId'] as String, token: json['token'] as String?, - i: IResponse.fromJson(json['i'] as Map), + i: MeDetailed.fromJson(json['i'] as Map), ); Map _$$AccountImplToJson(_$AccountImpl instance) => diff --git a/lib/router/app_router.gr.dart b/lib/router/app_router.gr.dart index b80597323..cc41f0e75 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 pagesMap = { - NotesAfterRenoteRoute.name: (routeData) { - final args = routeData.argsAs(); + AnnouncementRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: NotesAfterRenotePage( + child: AnnouncementPage( key: args.key, - note: args.note, + account: args.account, + ), + ); + }, + AntennaNotesRoute.name: (routeData) { + final args = routeData.argsAs(); + return AutoRoutePage( + 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(); + ChannelsRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: AntennaNotesPage( + child: ChannelsPage( key: args.key, - antenna: args.antenna, account: args.account, ), ); }, - NotificationRoute.name: (routeData) { - final args = routeData.argsAs(); + ChannelDetailRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: NotificationPage( + child: ChannelDetailPage( key: args.key, account: args.account, + channelId: args.channelId, ), ); }, - LoginRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: const LoginPage(), - ); - }, ClipDetailRoute.name: (routeData) { final args = routeData.argsAs(); return AutoRoutePage( @@ -84,227 +88,241 @@ abstract class _$AppRouter extends RootStackRouter { ), ); }, - NoteCreateRoute.name: (routeData) { - final args = routeData.argsAs(); + ExploreRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( 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(); + ExploreRoleUsersRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( 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(); + FavoritedNoteRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: UserFolloweePage( + child: FavoritedNotePage( key: args.key, - userId: args.userId, account: args.account, ), ); }, - UserRoute.name: (routeData) { - final args = routeData.argsAs(); + FederationRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( 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(); + HashtagRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( 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(); - return AutoRoutePage( + LoginRoute.name: (routeData) { + return AutoRoutePage( 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(); + MisskeyRouteRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( 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(); return AutoRoutePage( routeData: routeData, - child: const SplashPage(), + child: NotesAfterRenotePage( + key: args.key, + note: args.note, + account: args.account, + ), ); }, - SeveralAccountGeneralSettingsRoute.name: (routeData) { - final args = routeData.argsAs(); + NoteCreateRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( 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(); + NoteDetailRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: SeveralAccountSettingsPage( + child: NoteDetailPage( key: args.key, + note: args.note, account: args.account, ), ); }, - InstanceMuteRoute.name: (routeData) { - final args = routeData.argsAs(); + NotificationRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: InstanceMutePage( + child: NotificationPage( key: args.key, account: args.account, ), ); }, - HardMuteRoute.name: (routeData) { - final args = routeData.argsAs(); - return AutoRoutePage( + PhotoEditRoute.name: (routeData) { + final args = routeData.argsAs(); + return AutoRoutePage( routeData: routeData, - child: HardMutePage( - key: args.key, + child: PhotoEditPage( account: args.account, + file: args.file, + onSubmit: args.onSubmit, + key: args.key, ), ); }, - ReactionDeckRoute.name: (routeData) { - final args = routeData.argsAs(); + SearchRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: ReactionDeckPage( + child: SearchPage( key: args.key, + initialSearchText: args.initialSearchText, account: args.account, ), ); }, - UsersListTimelineRoute.name: (routeData) { - final args = routeData.argsAs(); + AccountListRoute.name: (routeData) { return AutoRoutePage( routeData: routeData, - child: UsersListTimelinePage( - args.account, - args.list, - key: args.key, - ), + child: const AccountListPage(), ); }, - UsersListRoute.name: (routeData) { - final args = routeData.argsAs(); + AppInfoRoute.name: (routeData) { return AutoRoutePage( routeData: routeData, - child: UsersListPage( - args.account, - key: args.key, - ), + child: const AppInfoPage(), ); }, - UsersListDetailRoute.name: (routeData) { - final args = routeData.argsAs(); + GeneralSettingsRoute.name: (routeData) { return AutoRoutePage( routeData: routeData, - child: UsersListDetailPage( + child: const GeneralSettingsPage(), + ); + }, + ImportExportRoute.name: (routeData) { + return AutoRoutePage( + routeData: routeData, + child: const ImportExportPage(), + ); + }, + SettingsRoute.name: (routeData) { + return AutoRoutePage( + routeData: routeData, + child: const SettingsPage(), + ); + }, + TabSettingsListRoute.name: (routeData) { + return AutoRoutePage( + routeData: routeData, + child: const TabSettingsListPage(), + ); + }, + TabSettingsRoute.name: (routeData) { + final args = routeData.argsAs( + orElse: () => const TabSettingsRouteArgs()); + return AutoRoutePage( + routeData: routeData, + child: TabSettingsPage( key: args.key, - account: args.account, - listId: args.listId, + tabIndex: args.tabIndex, ), ); }, - ChannelDetailRoute.name: (routeData) { - final args = routeData.argsAs(); + HardMuteRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: ChannelDetailPage( + child: HardMutePage( key: args.key, account: args.account, - channelId: args.channelId, ), ); }, - ChannelsRoute.name: (routeData) { - final args = routeData.argsAs(); + InstanceMuteRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: ChannelsPage( + child: InstanceMutePage( key: args.key, account: args.account, ), ); }, - FederationRoute.name: (routeData) { - final args = routeData.argsAs(); + ReactionDeckRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: FederationPage( + child: ReactionDeckPage( key: args.key, account: args.account, - host: args.host, ), ); }, - NoteDetailRoute.name: (routeData) { - final args = routeData.argsAs(); + SeveralAccountGeneralSettingsRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: NoteDetailPage( + child: SeveralAccountGeneralSettingsPage( key: args.key, - note: args.note, account: args.account, ), ); }, - SearchRoute.name: (routeData) { - final args = routeData.argsAs(); + SeveralAccountSettingsRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: SearchPage( + child: SeveralAccountSettingsPage( key: args.key, - initialSearchText: args.initialSearchText, account: args.account, ), ); @@ -321,101 +339,83 @@ abstract class _$AppRouter extends RootStackRouter { ), ); }, - MisskeyRouteRoute.name: (routeData) { - final args = routeData.argsAs(); + SplashRoute.name: (routeData) { return AutoRoutePage( routeData: routeData, - child: MisskeyPagePage( - key: args.key, - account: args.account, - page: args.page, - ), + child: const SplashPage(), ); }, - ImportExportRoute.name: (routeData) { + TimeLineRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: const ImportExportPage(), - ); - }, - GeneralSettingsRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: const GeneralSettingsPage(), - ); - }, - TabSettingsRoute.name: (routeData) { - final args = routeData.argsAs( - orElse: () => const TabSettingsRouteArgs()); - return AutoRoutePage( - routeData: routeData, - child: TabSettingsPage( + child: TimeLinePage( key: args.key, - tabIndex: args.tabIndex, + initialTabSetting: args.initialTabSetting, ), ); }, - TabSettingsListRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: const TabSettingsListPage(), - ); - }, - AppInfoRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: const AppInfoPage(), - ); - }, - SettingsRoute.name: (routeData) { + UsersListDetailRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( 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(); return AutoRoutePage( routeData: routeData, - child: const AccountListPage(), + child: UsersListPage( + args.account, + key: args.key, + ), ); }, - ExploreRoleUsersRoute.name: (routeData) { - final args = routeData.argsAs(); + UsersListTimelineRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( 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(); + UserFolloweeRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: ExplorePage( + child: UserFolloweePage( key: args.key, + userId: args.userId, account: args.account, ), ); }, - TimeLineRoute.name: (routeData) { - final args = routeData.argsAs(); + UserFollowerRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( 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(); + UserRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: FavoritedNotePage( + child: UserPage( key: args.key, + userId: args.userId, account: args.account, ), ); @@ -424,45 +424,83 @@ abstract class _$AppRouter extends RootStackRouter { } /// generated route for -/// [NotesAfterRenotePage] -class NotesAfterRenoteRoute extends PageRouteInfo { - NotesAfterRenoteRoute({ +/// [AnnouncementPage] +class AnnouncementRoute extends PageRouteInfo { + AnnouncementRoute({ Key? key, - required Note note, required Account account, List? 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 page = - PageInfo(name); + static const PageInfo page = + PageInfo(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 { + AntennaNotesRoute({ + Key? key, + required Antenna antenna, + required Account account, + List? children, + }) : super( + AntennaNotesRoute.name, + args: AntennaNotesRouteArgs( + key: key, + antenna: antenna, + account: account, + ), + initialChildren: children, + ); + + static const String name = 'AntennaNotesRoute'; + + static const PageInfo page = + PageInfo(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}'; } } @@ -505,100 +543,86 @@ class AntennaRouteArgs { } /// generated route for -/// [AntennaNotesPage] -class AntennaNotesRoute extends PageRouteInfo { - AntennaNotesRoute({ +/// [ChannelsPage] +class ChannelsRoute extends PageRouteInfo { + ChannelsRoute({ Key? key, - required Antenna antenna, required Account account, List? 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 page = - PageInfo(name); + static const PageInfo page = + PageInfo(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 { - NotificationRoute({ +/// [ChannelDetailPage] +class ChannelDetailRoute extends PageRouteInfo { + ChannelDetailRoute({ Key? key, required Account account, + required String channelId, List? 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 page = - PageInfo(name); + static const PageInfo page = + PageInfo(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 { - const LoginRoute({List? children}) - : super( - LoginRoute.name, - initialChildren: children, - ); - - static const String name = 'LoginRoute'; - - static const PageInfo page = PageInfo(name); -} - /// generated route for /// [ClipDetailPage] class ClipDetailRoute extends PageRouteInfo { @@ -681,489 +705,450 @@ class ClipListRouteArgs { } /// generated route for -/// [NoteCreatePage] -class NoteCreateRoute extends PageRouteInfo { - NoteCreateRoute({ +/// [ExplorePage] +class ExploreRoute extends PageRouteInfo { + ExploreRoute({ Key? key, - required Account initialAccount, - String? initialText, - List? initialMediaFiles, - CommunityChannel? channel, - Note? reply, - Note? renote, - Note? note, - NoteCreationMode? noteCreationMode, + required Account account, List? 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 page = - PageInfo(name); + static const PageInfo page = + PageInfo(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? 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 { - HashtagRoute({ +/// [ExploreRoleUsersPage] +class ExploreRoleUsersRoute extends PageRouteInfo { + ExploreRoleUsersRoute({ Key? key, - required String hashtag, + required RolesListResponse item, required Account account, List? 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 page = - PageInfo(name); + static const PageInfo page = + PageInfo(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 { - UserFolloweeRoute({ +/// [FavoritedNotePage] +class FavoritedNoteRoute extends PageRouteInfo { + FavoritedNoteRoute({ Key? key, - required String userId, required Account account, List? 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 page = - PageInfo(name); + static const PageInfo page = + PageInfo(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 { - UserRoute({ +/// [FederationPage] +class FederationRoute extends PageRouteInfo { + FederationRoute({ Key? key, - required String userId, required Account account, + required String host, List? 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 page = PageInfo(name); + static const PageInfo page = + PageInfo(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 { - UserFollowerRoute({ +/// [HashtagPage] +class HashtagRoute extends PageRouteInfo { + HashtagRoute({ Key? key, - required String userId, + required String hashtag, required Account account, List? 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 page = - PageInfo(name); + static const PageInfo page = + PageInfo(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 { - PhotoEditRoute({ - required Account account, - required MisskeyPostFile file, - required void Function(Uint8List) onSubmit, - Key? key, - List? children, - }) : super( - PhotoEditRoute.name, - args: PhotoEditRouteArgs( - account: account, - file: file, - onSubmit: onSubmit, - key: key, - ), +/// [LoginPage] +class LoginRoute extends PageRouteInfo { + const LoginRoute({List? children}) + : super( + LoginRoute.name, initialChildren: children, ); - static const String name = 'PhotoEditRoute'; - - static const PageInfo page = - PageInfo(name); -} - -class PhotoEditRouteArgs { - const PhotoEditRouteArgs({ - required this.account, - required this.file, - required this.onSubmit, - this.key, - }); - - final Account account; - - final MisskeyPostFile file; - - final void Function(Uint8List) onSubmit; - - final Key? key; + static const String name = 'LoginRoute'; - @override - String toString() { - return 'PhotoEditRouteArgs{account: $account, file: $file, onSubmit: $onSubmit, key: $key}'; - } + static const PageInfo page = PageInfo(name); } /// generated route for -/// [AnnouncementPage] -class AnnouncementRoute extends PageRouteInfo { - AnnouncementRoute({ +/// [MisskeyPagePage] +class MisskeyRouteRoute extends PageRouteInfo { + MisskeyRouteRoute({ Key? key, required Account account, + required Page page, List? children, }) : super( - AnnouncementRoute.name, - args: AnnouncementRouteArgs( + MisskeyRouteRoute.name, + args: MisskeyRouteRouteArgs( key: key, account: account, + page: page, ), initialChildren: children, ); - static const String name = 'AnnouncementRoute'; + static const String name = 'MisskeyRouteRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class AnnouncementRouteArgs { - const AnnouncementRouteArgs({ +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 'AnnouncementRouteArgs{key: $key, account: $account}'; + return 'MisskeyRouteRouteArgs{key: $key, account: $account, page: $page}'; } } /// generated route for -/// [SplashPage] -class SplashRoute extends PageRouteInfo { - const SplashRoute({List? children}) - : super( - SplashRoute.name, - initialChildren: children, - ); - - static const String name = 'SplashRoute'; - - static const PageInfo page = PageInfo(name); -} - -/// generated route for -/// [SeveralAccountGeneralSettingsPage] -class SeveralAccountGeneralSettingsRoute - extends PageRouteInfo { - SeveralAccountGeneralSettingsRoute({ +/// [NotesAfterRenotePage] +class NotesAfterRenoteRoute extends PageRouteInfo { + NotesAfterRenoteRoute({ Key? key, + required Note note, required Account account, List? children, }) : super( - SeveralAccountGeneralSettingsRoute.name, - args: SeveralAccountGeneralSettingsRouteArgs( + NotesAfterRenoteRoute.name, + args: NotesAfterRenoteRouteArgs( key: key, + note: note, account: account, ), initialChildren: children, ); - static const String name = 'SeveralAccountGeneralSettingsRoute'; + static const String name = 'NotesAfterRenoteRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class SeveralAccountGeneralSettingsRouteArgs { - const SeveralAccountGeneralSettingsRouteArgs({ +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 'SeveralAccountGeneralSettingsRouteArgs{key: $key, account: $account}'; + return 'NotesAfterRenoteRouteArgs{key: $key, note: $note, account: $account}'; } } /// generated route for -/// [SeveralAccountSettingsPage] -class SeveralAccountSettingsRoute - extends PageRouteInfo { - SeveralAccountSettingsRoute({ +/// [NoteCreatePage] +class NoteCreateRoute extends PageRouteInfo { + NoteCreateRoute({ Key? key, - required Account account, + required Account initialAccount, + String? initialText, + List? initialMediaFiles, + CommunityChannel? channel, + Note? reply, + Note? renote, + Note? note, + NoteCreationMode? noteCreationMode, List? children, }) : super( - SeveralAccountSettingsRoute.name, - args: SeveralAccountSettingsRouteArgs( + 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 = 'SeveralAccountSettingsRoute'; + static const String name = 'NoteCreateRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class SeveralAccountSettingsRouteArgs { - const SeveralAccountSettingsRouteArgs({ +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? initialMediaFiles; + + final CommunityChannel? channel; + + final Note? reply; + + final Note? renote; + + final Note? note; + + final NoteCreationMode? noteCreationMode; @override String toString() { - return 'SeveralAccountSettingsRouteArgs{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 -/// [InstanceMutePage] -class InstanceMuteRoute extends PageRouteInfo { - InstanceMuteRoute({ +/// [NoteDetailPage] +class NoteDetailRoute extends PageRouteInfo { + NoteDetailRoute({ Key? key, + required Note note, required Account account, List? children, }) : super( - InstanceMuteRoute.name, - args: InstanceMuteRouteArgs( + NoteDetailRoute.name, + args: NoteDetailRouteArgs( key: key, + note: note, account: account, ), initialChildren: children, ); - static const String name = 'InstanceMuteRoute'; + static const String name = 'NoteDetailRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class InstanceMuteRouteArgs { - const InstanceMuteRouteArgs({ +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 'InstanceMuteRouteArgs{key: $key, account: $account}'; + return 'NoteDetailRouteArgs{key: $key, note: $note, account: $account}'; } } /// generated route for -/// [HardMutePage] -class HardMuteRoute extends PageRouteInfo { - HardMuteRoute({ +/// [NotificationPage] +class NotificationRoute extends PageRouteInfo { + NotificationRoute({ Key? key, required Account account, List? children, }) : super( - HardMuteRoute.name, - args: HardMuteRouteArgs( + NotificationRoute.name, + args: NotificationRouteArgs( key: key, account: account, ), initialChildren: children, ); - static const String name = 'HardMuteRoute'; + static const String name = 'NotificationRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class HardMuteRouteArgs { - const HardMuteRouteArgs({ +class NotificationRouteArgs { + const NotificationRouteArgs({ this.key, required this.account, }); @@ -1174,239 +1159,284 @@ class HardMuteRouteArgs { @override String toString() { - return 'HardMuteRouteArgs{key: $key, account: $account}'; + return 'NotificationRouteArgs{key: $key, account: $account}'; } } /// generated route for -/// [ReactionDeckPage] -class ReactionDeckRoute extends PageRouteInfo { - ReactionDeckRoute({ - Key? key, +/// [PhotoEditPage] +class PhotoEditRoute extends PageRouteInfo { + PhotoEditRoute({ required Account account, + required MisskeyPostFile file, + required void Function(Uint8List) onSubmit, + Key? key, List? children, }) : super( - ReactionDeckRoute.name, - args: ReactionDeckRouteArgs( - key: key, + PhotoEditRoute.name, + args: PhotoEditRouteArgs( account: account, + file: file, + onSubmit: onSubmit, + key: key, ), initialChildren: children, ); - static const String name = 'ReactionDeckRoute'; + static const String name = 'PhotoEditRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class ReactionDeckRouteArgs { - const ReactionDeckRouteArgs({ - this.key, +class PhotoEditRouteArgs { + const PhotoEditRouteArgs({ required this.account, + required this.file, + required this.onSubmit, + this.key, }); - final Key? key; - final Account account; + final MisskeyPostFile file; + + final void Function(Uint8List) onSubmit; + + final Key? key; + @override String toString() { - return 'ReactionDeckRouteArgs{key: $key, account: $account}'; + return 'PhotoEditRouteArgs{account: $account, file: $file, onSubmit: $onSubmit, key: $key}'; } } /// generated route for -/// [UsersListTimelinePage] -class UsersListTimelineRoute extends PageRouteInfo { - UsersListTimelineRoute({ - required Account account, - required UsersList list, +/// [SearchPage] +class SearchRoute extends PageRouteInfo { + SearchRoute({ Key? key, + String? initialSearchText, + required Account account, List? children, }) : super( - UsersListTimelineRoute.name, - args: UsersListTimelineRouteArgs( - account: account, - list: list, + SearchRoute.name, + args: SearchRouteArgs( key: key, + initialSearchText: initialSearchText, + account: account, ), initialChildren: children, ); - static const String name = 'UsersListTimelineRoute'; + static const String name = 'SearchRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = PageInfo(name); } -class UsersListTimelineRouteArgs { - const UsersListTimelineRouteArgs({ - required this.account, - required this.list, +class SearchRouteArgs { + const SearchRouteArgs({ this.key, + this.initialSearchText, + required this.account, }); - final Account account; + final Key? key; - final UsersList list; + final String? initialSearchText; - final Key? key; + final Account account; @override String toString() { - return 'UsersListTimelineRouteArgs{account: $account, list: $list, key: $key}'; + return 'SearchRouteArgs{key: $key, initialSearchText: $initialSearchText, account: $account}'; } } /// generated route for -/// [UsersListPage] -class UsersListRoute extends PageRouteInfo { - UsersListRoute({ - required Account account, - Key? key, - List? children, - }) : super( - UsersListRoute.name, - args: UsersListRouteArgs( - account: account, - key: key, - ), +/// [AccountListPage] +class AccountListRoute extends PageRouteInfo { + const AccountListRoute({List? children}) + : super( + AccountListRoute.name, + initialChildren: children, + ); + + static const String name = 'AccountListRoute'; + + static const PageInfo page = PageInfo(name); +} + +/// generated route for +/// [AppInfoPage] +class AppInfoRoute extends PageRouteInfo { + const AppInfoRoute({List? children}) + : super( + AppInfoRoute.name, + initialChildren: children, + ); + + static const String name = 'AppInfoRoute'; + + static const PageInfo page = PageInfo(name); +} + +/// generated route for +/// [GeneralSettingsPage] +class GeneralSettingsRoute extends PageRouteInfo { + const GeneralSettingsRoute({List? children}) + : super( + GeneralSettingsRoute.name, + initialChildren: children, + ); + + static const String name = 'GeneralSettingsRoute'; + + static const PageInfo page = PageInfo(name); +} + +/// generated route for +/// [ImportExportPage] +class ImportExportRoute extends PageRouteInfo { + const ImportExportRoute({List? children}) + : super( + ImportExportRoute.name, + initialChildren: children, + ); + + static const String name = 'ImportExportRoute'; + + static const PageInfo page = PageInfo(name); +} + +/// generated route for +/// [SettingsPage] +class SettingsRoute extends PageRouteInfo { + const SettingsRoute({List? children}) + : super( + SettingsRoute.name, initialChildren: children, ); - static const String name = 'UsersListRoute'; + static const String name = 'SettingsRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = PageInfo(name); } -class UsersListRouteArgs { - const UsersListRouteArgs({ - required this.account, - this.key, - }); - - final Account account; +/// generated route for +/// [TabSettingsListPage] +class TabSettingsListRoute extends PageRouteInfo { + const TabSettingsListRoute({List? children}) + : super( + TabSettingsListRoute.name, + initialChildren: children, + ); - final Key? key; + static const String name = 'TabSettingsListRoute'; - @override - String toString() { - return 'UsersListRouteArgs{account: $account, key: $key}'; - } + static const PageInfo page = PageInfo(name); } /// generated route for -/// [UsersListDetailPage] -class UsersListDetailRoute extends PageRouteInfo { - UsersListDetailRoute({ +/// [TabSettingsPage] +class TabSettingsRoute extends PageRouteInfo { + TabSettingsRoute({ Key? key, - required Account account, - required String listId, + int? tabIndex, List? children, }) : super( - UsersListDetailRoute.name, - args: UsersListDetailRouteArgs( + TabSettingsRoute.name, + args: TabSettingsRouteArgs( key: key, - account: account, - listId: listId, + tabIndex: tabIndex, ), initialChildren: children, ); - static const String name = 'UsersListDetailRoute'; + static const String name = 'TabSettingsRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class UsersListDetailRouteArgs { - const UsersListDetailRouteArgs({ +class TabSettingsRouteArgs { + const TabSettingsRouteArgs({ this.key, - required this.account, - required this.listId, + this.tabIndex, }); final Key? key; - final Account account; - - final String listId; + final int? tabIndex; @override String toString() { - return 'UsersListDetailRouteArgs{key: $key, account: $account, listId: $listId}'; + return 'TabSettingsRouteArgs{key: $key, tabIndex: $tabIndex}'; } } /// generated route for -/// [ChannelDetailPage] -class ChannelDetailRoute extends PageRouteInfo { - ChannelDetailRoute({ +/// [HardMutePage] +class HardMuteRoute extends PageRouteInfo { + HardMuteRoute({ Key? key, required Account account, - required String channelId, List? children, }) : super( - ChannelDetailRoute.name, - args: ChannelDetailRouteArgs( + HardMuteRoute.name, + args: HardMuteRouteArgs( key: key, account: account, - channelId: channelId, ), initialChildren: children, ); - static const String name = 'ChannelDetailRoute'; + static const String name = 'HardMuteRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class ChannelDetailRouteArgs { - const ChannelDetailRouteArgs({ +class HardMuteRouteArgs { + const HardMuteRouteArgs({ 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 'HardMuteRouteArgs{key: $key, account: $account}'; } } /// generated route for -/// [ChannelsPage] -class ChannelsRoute extends PageRouteInfo { - ChannelsRoute({ +/// [InstanceMutePage] +class InstanceMuteRoute extends PageRouteInfo { + InstanceMuteRoute({ Key? key, required Account account, List? children, }) : super( - ChannelsRoute.name, - args: ChannelsRouteArgs( + InstanceMuteRoute.name, + args: InstanceMuteRouteArgs( key: key, account: account, ), initialChildren: children, ); - static const String name = 'ChannelsRoute'; + static const String name = 'InstanceMuteRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class ChannelsRouteArgs { - const ChannelsRouteArgs({ +class InstanceMuteRouteArgs { + const InstanceMuteRouteArgs({ this.key, required this.account, }); @@ -1417,135 +1447,123 @@ class ChannelsRouteArgs { @override String toString() { - return 'ChannelsRouteArgs{key: $key, account: $account}'; + return 'InstanceMuteRouteArgs{key: $key, account: $account}'; } } /// generated route for -/// [FederationPage] -class FederationRoute extends PageRouteInfo { - FederationRoute({ +/// [ReactionDeckPage] +class ReactionDeckRoute extends PageRouteInfo { + ReactionDeckRoute({ Key? key, required Account account, - required String host, List? children, }) : super( - FederationRoute.name, - args: FederationRouteArgs( + ReactionDeckRoute.name, + args: ReactionDeckRouteArgs( key: key, account: account, - host: host, ), initialChildren: children, ); - static const String name = 'FederationRoute'; + static const String name = 'ReactionDeckRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class FederationRouteArgs { - const FederationRouteArgs({ +class ReactionDeckRouteArgs { + const ReactionDeckRouteArgs({ 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 'ReactionDeckRouteArgs{key: $key, account: $account}'; } } /// generated route for -/// [NoteDetailPage] -class NoteDetailRoute extends PageRouteInfo { - NoteDetailRoute({ +/// [SeveralAccountGeneralSettingsPage] +class SeveralAccountGeneralSettingsRoute + extends PageRouteInfo { + SeveralAccountGeneralSettingsRoute({ Key? key, - required Note note, required Account account, List? children, }) : super( - NoteDetailRoute.name, - args: NoteDetailRouteArgs( + SeveralAccountGeneralSettingsRoute.name, + args: SeveralAccountGeneralSettingsRouteArgs( key: key, - note: note, account: account, ), initialChildren: children, ); - static const String name = 'NoteDetailRoute'; + static const String name = 'SeveralAccountGeneralSettingsRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class NoteDetailRouteArgs { - const NoteDetailRouteArgs({ +class SeveralAccountGeneralSettingsRouteArgs { + const SeveralAccountGeneralSettingsRouteArgs({ 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 'SeveralAccountGeneralSettingsRouteArgs{key: $key, account: $account}'; } } /// generated route for -/// [SearchPage] -class SearchRoute extends PageRouteInfo { - SearchRoute({ +/// [SeveralAccountSettingsPage] +class SeveralAccountSettingsRoute + extends PageRouteInfo { + SeveralAccountSettingsRoute({ Key? key, - String? initialSearchText, required Account account, List? children, }) : super( - SearchRoute.name, - args: SearchRouteArgs( + SeveralAccountSettingsRoute.name, + args: SeveralAccountSettingsRouteArgs( key: key, - initialSearchText: initialSearchText, account: account, ), initialChildren: children, ); - static const String name = 'SearchRoute'; + static const String name = 'SeveralAccountSettingsRoute'; - static const PageInfo page = PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class SearchRouteArgs { - const SearchRouteArgs({ +class SeveralAccountSettingsRouteArgs { + const SeveralAccountSettingsRouteArgs({ this.key, - this.initialSearchText, required this.account, }); final Key? key; - final String? initialSearchText; - final Account account; @override String toString() { - return 'SearchRouteArgs{key: $key, initialSearchText: $initialSearchText, account: $account}'; + return 'SeveralAccountSettingsRouteArgs{key: $key, account: $account}'; } } @@ -1594,323 +1612,305 @@ class SharingAccountSelectRouteArgs { } /// generated route for -/// [MisskeyPagePage] -class MisskeyRouteRoute extends PageRouteInfo { - MisskeyRouteRoute({ - Key? key, - required Account account, - required Page page, - List? children, - }) : super( - MisskeyRouteRoute.name, - args: MisskeyRouteRouteArgs( - key: key, - account: account, - page: page, - ), - initialChildren: children, - ); - - static const String name = 'MisskeyRouteRoute'; - - static const PageInfo page = - PageInfo(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 { - const ImportExportRoute({List? children}) - : super( - ImportExportRoute.name, - initialChildren: children, - ); - - static const String name = 'ImportExportRoute'; - - static const PageInfo page = PageInfo(name); -} - -/// generated route for -/// [GeneralSettingsPage] -class GeneralSettingsRoute extends PageRouteInfo { - const GeneralSettingsRoute({List? children}) +/// [SplashPage] +class SplashRoute extends PageRouteInfo { + const SplashRoute({List? children}) : super( - GeneralSettingsRoute.name, + SplashRoute.name, initialChildren: children, ); - static const String name = 'GeneralSettingsRoute'; + static const String name = 'SplashRoute'; static const PageInfo page = PageInfo(name); } /// generated route for -/// [TabSettingsPage] -class TabSettingsRoute extends PageRouteInfo { - TabSettingsRoute({ +/// [TimeLinePage] +class TimeLineRoute extends PageRouteInfo { + TimeLineRoute({ Key? key, - int? tabIndex, + required TabSetting initialTabSetting, List? 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 page = - PageInfo(name); + static const PageInfo page = + PageInfo(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 { - const TabSettingsListRoute({List? children}) - : super( - TabSettingsListRoute.name, +/// [UsersListDetailPage] +class UsersListDetailRoute extends PageRouteInfo { + UsersListDetailRoute({ + Key? key, + required Account account, + required String listId, + List? 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 page = PageInfo(name); + static const PageInfo page = + PageInfo(name); } -/// generated route for -/// [AppInfoPage] -class AppInfoRoute extends PageRouteInfo { - const AppInfoRoute({List? 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 page = PageInfo(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 { - const SettingsRoute({List? children}) - : super( - SettingsRoute.name, +/// [UsersListPage] +class UsersListRoute extends PageRouteInfo { + UsersListRoute({ + required Account account, + Key? key, + List? 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 page = PageInfo(name); + static const PageInfo page = + PageInfo(name); } -/// generated route for -/// [AccountListPage] -class AccountListRoute extends PageRouteInfo { - const AccountListRoute({List? 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 page = PageInfo(name); + final Key? key; + + @override + String toString() { + return 'UsersListRouteArgs{account: $account, key: $key}'; + } } /// generated route for -/// [ExploreRoleUsersPage] -class ExploreRoleUsersRoute extends PageRouteInfo { - ExploreRoleUsersRoute({ - Key? key, - required RolesListResponse item, +/// [UsersListTimelinePage] +class UsersListTimelineRoute extends PageRouteInfo { + UsersListTimelineRoute({ required Account account, + required UsersList list, + Key? key, List? 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 page = - PageInfo(name); + static const PageInfo page = + PageInfo(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 { - ExploreRoute({ +/// [UserFolloweePage] +class UserFolloweeRoute extends PageRouteInfo { + UserFolloweeRoute({ Key? key, + required String userId, required Account account, List? 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 page = - PageInfo(name); + static const PageInfo page = + PageInfo(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 { - TimeLineRoute({ +/// [UserFollowerPage] +class UserFollowerRoute extends PageRouteInfo { + UserFollowerRoute({ Key? key, - required TabSetting initialTabSetting, + required String userId, + required Account account, List? 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 page = - PageInfo(name); + static const PageInfo page = + PageInfo(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 { - FavoritedNoteRoute({ +/// [UserPage] +class UserRoute extends PageRouteInfo { + UserRoute({ Key? key, + required String userId, required Account account, List? 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 page = - PageInfo(name); + static const PageInfo page = PageInfo(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 { 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 { ), ), ); - 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 { } final deletedNoteChannel = note.channel; + final replyTo = []; + 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 { 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 { } if (reply != null) { + final replyTo = []; + 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 { 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 23bf5c21d..dda350e42 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 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/hard_mute_page/hard_mute_page.dart b/lib/view/several_account_settings_page/hard_mute_page/hard_mute_page.dart index 82c44f402..18def7ca8 100644 --- a/lib/view/several_account_settings_page/hard_mute_page/hard_mute_page.dart +++ b/lib/view/several_account_settings_page/hard_mute_page/hard_mute_page.dart @@ -68,7 +68,7 @@ class HardMutePageState extends ConsumerState { body: SingleChildScrollView( child: Padding( padding: const EdgeInsets.all(10), - child: CommonFuture( + child: CommonFuture( future: ref.read(misskeyProvider(widget.account)).i.i(), futureFinished: (data) { controller.text = muteValueString(data.mutedWords); 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 { body: SingleChildScrollView( child: Padding( padding: const EdgeInsets.all(10), - child: CommonFuture( + child: CommonFuture( future: ref.read(misskeyProvider(widget.account)).i.i(), futureFinished: (data) { controller.text = data.mutedInstances.join("\n"); 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 { context: context, builder: (context) => UsersListModalSheet( account: widget.account, - user: widget.response.toUser(), + user: widget.response, ), ); } @@ -53,7 +51,7 @@ class UserControlDialogState extends ConsumerState { context: context, builder: (context) => AntennaModalSheet( account: widget.account, - user: widget.response.toUser(), + user: widget.response, ), ); } @@ -131,6 +129,7 @@ class UserControlDialogState extends ConsumerState { @override Widget build(BuildContext context) { + final user = widget.response; return ListView( children: [ ListTile( @@ -209,7 +208,7 @@ class UserControlDialogState extends ConsumerState { 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 { 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 { 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 { 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 { - late UsersShowResponse response; + late UserDetailed response; bool isFollowEditing = false; String memo = ""; Future followCreate() async { if (isFollowEditing) return; + + final user = response; + if (user is! UserDetailedNotMeWithRelations) { + return; + } + setState(() { isFollowEditing = true; }); @@ -48,13 +55,14 @@ class UserDetailState extends ConsumerState { 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 { Future 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 { 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 { Future followRequestCancel() async { if (isFollowEditing) return; + + final user = response; + if (user is! UserDetailedNotMeWithRelations) { + return; + } + setState(() { isFollowEditing = true; }); @@ -109,11 +129,11 @@ class UserDetailState extends ConsumerState { .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 { } } - Future userControl(bool isMe) async { + Future userControl() async { final result = await showModalBottomSheet( - 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 { } 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 { 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 { 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 { child: Column(children: [ Row( children: [ - AvatarIcon.fromUserResponse( - response, + AvatarIcon( + user: response, height: 80, ), Expanded( @@ -304,16 +330,16 @@ class UserDetailState extends ConsumerState { 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 { 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 { 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 { } class BirthdayConfetti extends StatefulWidget { - final UsersShowResponse response; + final UserDetailed response; final Widget child; const BirthdayConfetti({ @@ -589,10 +615,3 @@ class BirthdayConfettiState extends State { 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 8e50808b6..d7271228f 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; const UserInfo({ required this.userId, @@ -180,8 +180,8 @@ class UserDetailTab extends ConsumerStatefulWidget { } class UserDetailTabState extends ConsumerState { - 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 a7298a9ac..d377628ca 100644 --- a/test/test_util/mock.mocks.dart +++ b/test/test_util/mock.mocks.dart @@ -3,46 +3,45 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes -import 'dart:async' as _i17; -import 'dart:collection' as _i31; +import 'dart:async' as _i16; +import 'dart:collection' as _i30; import 'dart:io' as _i11; -import 'dart:typed_data' as _i28; -import 'dart:ui' as _i20; +import 'dart:typed_data' as _i27; +import 'dart:ui' as _i19; import 'package:dio/dio.dart' as _i10; -import 'package:file/file.dart' as _i13; -import 'package:file_picker/file_picker.dart' as _i36; -import 'package:flutter_cache_manager/flutter_cache_manager.dart' as _i14; +import 'package:file/file.dart' as _i12; +import 'package:file_picker/file_picker.dart' as _i35; +import 'package:flutter_cache_manager/flutter_cache_manager.dart' as _i13; import 'package:flutter_riverpod/flutter_riverpod.dart' as _i4; -import 'package:miria/model/account.dart' as _i18; +import 'package:miria/model/account.dart' as _i17; import 'package:miria/model/account_settings.dart' as _i2; -import 'package:miria/model/acct.dart' as _i19; +import 'package:miria/model/acct.dart' as _i18; import 'package:miria/model/general_settings.dart' as _i3; -import 'package:miria/model/misskey_emoji_data.dart' as _i23; -import 'package:miria/model/tab_setting.dart' as _i16; -import 'package:miria/repository/account_repository.dart' as _i25; -import 'package:miria/repository/account_settings_repository.dart' as _i21; -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 _i15; +import 'package:miria/model/misskey_emoji_data.dart' as _i22; +import 'package:miria/model/tab_setting.dart' as _i15; +import 'package:miria/repository/account_repository.dart' as _i24; +import 'package:miria/repository/account_settings_repository.dart' as _i20; +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 _i14; import 'package:misskey_dart/misskey_dart.dart' as _i5; import 'package:misskey_dart/src/data/ping_response.dart' as _i9; import 'package:misskey_dart/src/data/stats_response.dart' as _i8; -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/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/misskey_flash.dart' as _i7; import 'package:misskey_dart/src/services/api_service.dart' as _i6; import 'package:mockito/mockito.dart' as _i1; -import 'package:mockito/src/dummies.dart' as _i27; +import 'package:mockito/src/dummies.dart' as _i26; import 'package:url_launcher_platform_interface/url_launcher_platform_interface.dart' - as _i37; -import 'package:web_socket_channel/web_socket_channel.dart' as _i12; + as _i36; -import 'mock.dart' as _i35; +import 'mock.dart' as _i34; // ignore_for_file: type=lint // ignore_for_file: avoid_redundant_argument_values @@ -488,8 +487,8 @@ class _FakeMisskeyFollowingRequests_40 extends _i1.SmartFake ); } -class _FakeUser_41 extends _i1.SmartFake implements _i5.User { - _FakeUser_41( +class _FakeUserLite_41 extends _i1.SmartFake implements _i5.UserLite { + _FakeUserLite_41( Object parent, Invocation parentInvocation, ) : super( @@ -508,8 +507,8 @@ class _FakeHashtag_42 extends _i1.SmartFake implements _i5.Hashtag { ); } -class _FakeIResponse_43 extends _i1.SmartFake implements _i5.IResponse { - _FakeIResponse_43( +class _FakeMeDetailed_43 extends _i1.SmartFake implements _i5.MeDetailed { + _FakeMeDetailed_43( Object parent, Invocation parentInvocation, ) : super( @@ -605,9 +604,8 @@ class _FakeMisskeyUsersLists_51 extends _i1.SmartFake ); } -class _FakeUsersShowResponse_52 extends _i1.SmartFake - implements _i5.UsersShowResponse { - _FakeUsersShowResponse_52( +class _FakeUserDetailed_52 extends _i1.SmartFake implements _i5.UserDetailed { + _FakeUserDetailed_52( Object parent, Invocation parentInvocation, ) : super( @@ -688,9 +686,8 @@ class _FakeHttpClientRequest_59 extends _i1.SmartFake ); } -class _FakeWebSocketChannel_60 extends _i1.SmartFake - implements _i12.WebSocketChannel { - _FakeWebSocketChannel_60( +class _FakeFile_60 extends _i1.SmartFake implements _i12.File { + _FakeFile_60( Object parent, Invocation parentInvocation, ) : super( @@ -699,18 +696,8 @@ class _FakeWebSocketChannel_60 extends _i1.SmartFake ); } -class _FakeFile_61 extends _i1.SmartFake implements _i13.File { - _FakeFile_61( - Object parent, - Invocation parentInvocation, - ) : super( - parent, - parentInvocation, - ); -} - -class _FakeFileInfo_62 extends _i1.SmartFake implements _i14.FileInfo { - _FakeFileInfo_62( +class _FakeFileInfo_61 extends _i1.SmartFake implements _i13.FileInfo { + _FakeFileInfo_61( Object parent, Invocation parentInvocation, ) : super( @@ -723,13 +710,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 _i14.TabSettingsRepository { @override - Iterable<_i16.TabSetting> get tabSettings => (super.noSuchMethod( + Iterable<_i15.TabSetting> get tabSettings => (super.noSuchMethod( Invocation.getter(#tabSettings), - returnValue: <_i16.TabSetting>[], - returnValueForMissingStub: <_i16.TabSetting>[], - ) as Iterable<_i16.TabSetting>); + returnValue: <_i15.TabSetting>[], + returnValueForMissingStub: <_i15.TabSetting>[], + ) as Iterable<_i15.TabSetting>); @override bool get hasListeners => (super.noSuchMethod( @@ -739,49 +726,49 @@ class MockTabSettingsRepository extends _i1.Mock ) as bool); @override - _i17.Future load() => (super.noSuchMethod( + _i16.Future load() => (super.noSuchMethod( Invocation.method( #load, [], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future save(List<_i16.TabSetting>? tabSettings) => + _i16.Future save(List<_i15.TabSetting>? tabSettings) => (super.noSuchMethod( Invocation.method( #save, [tabSettings], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future removeAccount(_i18.Account? account) => (super.noSuchMethod( + _i16.Future removeAccount(_i17.Account? account) => (super.noSuchMethod( Invocation.method( #removeAccount, [account], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future initializeTabSettings(_i19.Acct? acct) => + _i16.Future initializeTabSettings(_i18.Acct? acct) => (super.noSuchMethod( Invocation.method( #initializeTabSettings, [acct], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - void addListener(_i20.VoidCallback? listener) => super.noSuchMethod( + void addListener(_i19.VoidCallback? listener) => super.noSuchMethod( Invocation.method( #addListener, [listener], @@ -790,7 +777,7 @@ class MockTabSettingsRepository extends _i1.Mock ); @override - void removeListener(_i20.VoidCallback? listener) => super.noSuchMethod( + void removeListener(_i19.VoidCallback? listener) => super.noSuchMethod( Invocation.method( #removeListener, [listener], @@ -821,7 +808,7 @@ class MockTabSettingsRepository extends _i1.Mock /// /// See the documentation for Mockito's code generation for more information. class MockAccountSettingsRepository extends _i1.Mock - implements _i21.AccountSettingsRepository { + implements _i20.AccountSettingsRepository { @override Iterable<_i2.AccountSettings> get accountSettings => (super.noSuchMethod( Invocation.getter(#accountSettings), @@ -837,37 +824,37 @@ class MockAccountSettingsRepository extends _i1.Mock ) as bool); @override - _i17.Future load() => (super.noSuchMethod( + _i16.Future load() => (super.noSuchMethod( Invocation.method( #load, [], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future save(_i2.AccountSettings? settings) => (super.noSuchMethod( + _i16.Future save(_i2.AccountSettings? settings) => (super.noSuchMethod( Invocation.method( #save, [settings], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future removeAccount(_i18.Account? account) => (super.noSuchMethod( + _i16.Future removeAccount(_i17.Account? account) => (super.noSuchMethod( Invocation.method( #removeAccount, [account], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i2.AccountSettings fromAcct(_i19.Acct? acct) => (super.noSuchMethod( + _i2.AccountSettings fromAcct(_i18.Acct? acct) => (super.noSuchMethod( Invocation.method( #fromAcct, [acct], @@ -889,7 +876,7 @@ class MockAccountSettingsRepository extends _i1.Mock ) as _i2.AccountSettings); @override - _i2.AccountSettings fromAccount(_i18.Account? account) => (super.noSuchMethod( + _i2.AccountSettings fromAccount(_i17.Account? account) => (super.noSuchMethod( Invocation.method( #fromAccount, [account], @@ -911,7 +898,7 @@ class MockAccountSettingsRepository extends _i1.Mock ) as _i2.AccountSettings); @override - void addListener(_i20.VoidCallback? listener) => super.noSuchMethod( + void addListener(_i19.VoidCallback? listener) => super.noSuchMethod( Invocation.method( #addListener, [listener], @@ -920,7 +907,7 @@ class MockAccountSettingsRepository extends _i1.Mock ); @override - void removeListener(_i20.VoidCallback? listener) => super.noSuchMethod( + void removeListener(_i19.VoidCallback? listener) => super.noSuchMethod( Invocation.method( #removeListener, [listener], @@ -950,9 +937,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 _i22.EmojiRepository { +class MockEmojiRepository extends _i1.Mock implements _i21.EmojiRepository { @override - set emoji(List<_i22.EmojiRepositoryData>? _emoji) => super.noSuchMethod( + set emoji(List<_i21.EmojiRepositoryData>? _emoji) => super.noSuchMethod( Invocation.setter( #emoji, _emoji, @@ -961,37 +948,37 @@ class MockEmojiRepository extends _i1.Mock implements _i22.EmojiRepository { ); @override - _i17.Future loadFromSourceIfNeed() => (super.noSuchMethod( + _i16.Future loadFromSourceIfNeed() => (super.noSuchMethod( Invocation.method( #loadFromSourceIfNeed, [], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future loadFromSource() => (super.noSuchMethod( + _i16.Future loadFromSource() => (super.noSuchMethod( Invocation.method( #loadFromSource, [], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future loadFromLocalCache() => (super.noSuchMethod( + _i16.Future loadFromLocalCache() => (super.noSuchMethod( Invocation.method( #loadFromLocalCache, [], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future> searchEmojis( + _i16.Future> searchEmojis( String? name, { int? limit = 30, }) => @@ -1001,31 +988,31 @@ class MockEmojiRepository extends _i1.Mock implements _i22.EmojiRepository { [name], {#limit: limit}, ), - returnValue: _i17.Future>.value( - <_i23.MisskeyEmojiData>[]), + returnValue: _i16.Future>.value( + <_i22.MisskeyEmojiData>[]), returnValueForMissingStub: - _i17.Future>.value( - <_i23.MisskeyEmojiData>[]), - ) as _i17.Future>); + _i16.Future>.value( + <_i22.MisskeyEmojiData>[]), + ) as _i16.Future>); @override - List<_i23.MisskeyEmojiData> defaultEmojis({int? limit}) => + List<_i22.MisskeyEmojiData> defaultEmojis({int? limit}) => (super.noSuchMethod( Invocation.method( #defaultEmojis, [], {#limit: limit}, ), - returnValue: <_i23.MisskeyEmojiData>[], - returnValueForMissingStub: <_i23.MisskeyEmojiData>[], - ) as List<_i23.MisskeyEmojiData>); + returnValue: <_i22.MisskeyEmojiData>[], + returnValueForMissingStub: <_i22.MisskeyEmojiData>[], + ) as List<_i22.MisskeyEmojiData>); } /// A class which mocks [GeneralSettingsRepository]. /// /// See the documentation for Mockito's code generation for more information. class MockGeneralSettingsRepository extends _i1.Mock - implements _i24.GeneralSettingsRepository { + implements _i23.GeneralSettingsRepository { @override _i3.GeneralSettings get settings => (super.noSuchMethod( Invocation.getter(#settings), @@ -1047,28 +1034,28 @@ class MockGeneralSettingsRepository extends _i1.Mock ) as bool); @override - _i17.Future load() => (super.noSuchMethod( + _i16.Future load() => (super.noSuchMethod( Invocation.method( #load, [], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future update(_i3.GeneralSettings? settings) => + _i16.Future update(_i3.GeneralSettings? settings) => (super.noSuchMethod( Invocation.method( #update, [settings], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - void addListener(_i20.VoidCallback? listener) => super.noSuchMethod( + void addListener(_i19.VoidCallback? listener) => super.noSuchMethod( Invocation.method( #addListener, [listener], @@ -1077,7 +1064,7 @@ class MockGeneralSettingsRepository extends _i1.Mock ); @override - void removeListener(_i20.VoidCallback? listener) => super.noSuchMethod( + void removeListener(_i19.VoidCallback? listener) => super.noSuchMethod( Invocation.method( #removeListener, [listener], @@ -1107,30 +1094,30 @@ 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 _i25.AccountRepository { +class MockAccountRepository extends _i1.Mock implements _i24.AccountRepository { @override - _i4.NotifierProviderRef> get ref => (super.noSuchMethod( + _i4.NotifierProviderRef> get ref => (super.noSuchMethod( Invocation.getter(#ref), - returnValue: _FakeNotifierProviderRef_2>( + returnValue: _FakeNotifierProviderRef_2>( this, Invocation.getter(#ref), ), returnValueForMissingStub: - _FakeNotifierProviderRef_2>( + _FakeNotifierProviderRef_2>( this, Invocation.getter(#ref), ), - ) as _i4.NotifierProviderRef>); + ) as _i4.NotifierProviderRef>); @override - List<_i18.Account> get state => (super.noSuchMethod( + List<_i17.Account> get state => (super.noSuchMethod( Invocation.getter(#state), - returnValue: <_i18.Account>[], - returnValueForMissingStub: <_i18.Account>[], - ) as List<_i18.Account>); + returnValue: <_i17.Account>[], + returnValueForMissingStub: <_i17.Account>[], + ) as List<_i17.Account>); @override - set state(List<_i18.Account>? value) => super.noSuchMethod( + set state(List<_i17.Account>? value) => super.noSuchMethod( Invocation.setter( #state, value, @@ -1139,39 +1126,39 @@ class MockAccountRepository extends _i1.Mock implements _i25.AccountRepository { ); @override - List<_i18.Account> build() => (super.noSuchMethod( + List<_i17.Account> build() => (super.noSuchMethod( Invocation.method( #build, [], ), - returnValue: <_i18.Account>[], - returnValueForMissingStub: <_i18.Account>[], - ) as List<_i18.Account>); + returnValue: <_i17.Account>[], + returnValueForMissingStub: <_i17.Account>[], + ) as List<_i17.Account>); @override - _i17.Future load() => (super.noSuchMethod( + _i16.Future load() => (super.noSuchMethod( Invocation.method( #load, [], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future loadFromSourceIfNeed(_i19.Acct? acct) => + _i16.Future loadFromSourceIfNeed(_i18.Acct? acct) => (super.noSuchMethod( Invocation.method( #loadFromSourceIfNeed, [acct], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future createUnreadAnnouncement( - _i18.Account? account, + _i16.Future createUnreadAnnouncement( + _i17.Account? account, _i5.AnnouncementsResponse? announcement, ) => (super.noSuchMethod( @@ -1182,33 +1169,33 @@ class MockAccountRepository extends _i1.Mock implements _i25.AccountRepository { announcement, ], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future removeUnreadAnnouncement(_i18.Account? account) => + _i16.Future removeUnreadAnnouncement(_i17.Account? account) => (super.noSuchMethod( Invocation.method( #removeUnreadAnnouncement, [account], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future remove(_i18.Account? account) => (super.noSuchMethod( + _i16.Future remove(_i17.Account? account) => (super.noSuchMethod( Invocation.method( #remove, [account], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future loginAsPassword( + _i16.Future loginAsPassword( String? server, String? userId, String? password, @@ -1222,12 +1209,12 @@ class MockAccountRepository extends _i1.Mock implements _i25.AccountRepository { password, ], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future loginAsToken( + _i16.Future loginAsToken( String? server, String? token, ) => @@ -1239,32 +1226,32 @@ class MockAccountRepository extends _i1.Mock implements _i25.AccountRepository { token, ], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future openMiAuth(String? server) => (super.noSuchMethod( + _i16.Future openMiAuth(String? server) => (super.noSuchMethod( Invocation.method( #openMiAuth, [server], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future validateMiAuth(String? server) => (super.noSuchMethod( + _i16.Future validateMiAuth(String? server) => (super.noSuchMethod( Invocation.method( #validateMiAuth, [server], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future reorder( + _i16.Future reorder( int? oldIndex, int? newIndex, ) => @@ -1276,14 +1263,14 @@ class MockAccountRepository extends _i1.Mock implements _i25.AccountRepository { newIndex, ], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override bool updateShouldNotify( - List<_i18.Account>? previous, - List<_i18.Account>? next, + List<_i17.Account>? previous, + List<_i17.Account>? next, ) => (super.noSuchMethod( Invocation.method( @@ -1301,7 +1288,7 @@ class MockAccountRepository extends _i1.Mock implements _i25.AccountRepository { /// A class which mocks [NoteRepository]. /// /// See the documentation for Mockito's code generation for more information. -class MockNoteRepository extends _i1.Mock implements _i26.NoteRepository { +class MockNoteRepository extends _i1.Mock implements _i25.NoteRepository { @override _i5.Misskey get misskey => (super.noSuchMethod( Invocation.getter(#misskey), @@ -1337,11 +1324,11 @@ class MockNoteRepository extends _i1.Mock implements _i26.NoteRepository { ) as Map); @override - Map get noteStatuses => (super.noSuchMethod( + Map get noteStatuses => (super.noSuchMethod( Invocation.getter(#noteStatuses), - returnValue: {}, - returnValueForMissingStub: {}, - ) as Map); + returnValue: {}, + returnValueForMissingStub: {}, + ) as Map); @override bool get hasListeners => (super.noSuchMethod( @@ -1362,7 +1349,7 @@ class MockNoteRepository extends _i1.Mock implements _i26.NoteRepository { @override void updateNoteStatus( String? id, - _i26.NoteStatus Function(_i26.NoteStatus)? statusPredicate, { + _i25.NoteStatus Function(_i25.NoteStatus)? statusPredicate, { bool? isNotify = true, }) => super.noSuchMethod( @@ -1396,14 +1383,14 @@ class MockNoteRepository extends _i1.Mock implements _i26.NoteRepository { ); @override - _i17.Future refresh(String? noteId) => (super.noSuchMethod( + _i16.Future refresh(String? noteId) => (super.noSuchMethod( Invocation.method( #refresh, [noteId], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override void delete(String? noteId) => super.noSuchMethod( @@ -1415,7 +1402,7 @@ class MockNoteRepository extends _i1.Mock implements _i26.NoteRepository { ); @override - void addListener(_i20.VoidCallback? listener) => super.noSuchMethod( + void addListener(_i19.VoidCallback? listener) => super.noSuchMethod( Invocation.method( #addListener, [listener], @@ -1424,7 +1411,7 @@ class MockNoteRepository extends _i1.Mock implements _i26.NoteRepository { ); @override - void removeListener(_i20.VoidCallback? listener) => super.noSuchMethod( + void removeListener(_i19.VoidCallback? listener) => super.noSuchMethod( Invocation.method( #removeListener, [listener], @@ -1458,11 +1445,11 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { @override String get host => (super.noSuchMethod( Invocation.getter(#host), - returnValue: _i27.dummyValue( + returnValue: _i26.dummyValue( this, Invocation.getter(#host), ), - returnValueForMissingStub: _i27.dummyValue( + returnValueForMissingStub: _i26.dummyValue( this, Invocation.getter(#host), ), @@ -1888,38 +1875,38 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { ); @override - _i17.Future> announcements( + _i16.Future> announcements( _i5.AnnouncementsRequest? request) => (super.noSuchMethod( Invocation.method( #announcements, [request], ), - returnValue: _i17.Future>.value( + returnValue: _i16.Future>.value( <_i5.AnnouncementsResponse>[]), returnValueForMissingStub: - _i17.Future>.value( + _i16.Future>.value( <_i5.AnnouncementsResponse>[]), - ) as _i17.Future>); + ) as _i16.Future>); @override - _i17.Future> endpoints() => (super.noSuchMethod( + _i16.Future> endpoints() => (super.noSuchMethod( Invocation.method( #endpoints, [], ), - returnValue: _i17.Future>.value([]), - returnValueForMissingStub: _i17.Future>.value([]), - ) as _i17.Future>); + returnValue: _i16.Future>.value([]), + returnValueForMissingStub: _i16.Future>.value([]), + ) as _i16.Future>); @override - _i17.Future<_i5.EmojisResponse> emojis() => (super.noSuchMethod( + _i16.Future<_i5.EmojisResponse> emojis() => (super.noSuchMethod( Invocation.method( #emojis, [], ), returnValue: - _i17.Future<_i5.EmojisResponse>.value(_FakeEmojisResponse_23( + _i16.Future<_i5.EmojisResponse>.value(_FakeEmojisResponse_23( this, Invocation.method( #emojis, @@ -1927,23 +1914,23 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { ), )), returnValueForMissingStub: - _i17.Future<_i5.EmojisResponse>.value(_FakeEmojisResponse_23( + _i16.Future<_i5.EmojisResponse>.value(_FakeEmojisResponse_23( this, Invocation.method( #emojis, [], ), )), - ) as _i17.Future<_i5.EmojisResponse>); + ) as _i16.Future<_i5.EmojisResponse>); @override - _i17.Future<_i5.EmojiResponse> emoji(_i5.EmojiRequest? request) => + _i16.Future<_i5.EmojiResponse> emoji(_i5.EmojiRequest? request) => (super.noSuchMethod( Invocation.method( #emoji, [request], ), - returnValue: _i17.Future<_i5.EmojiResponse>.value(_FakeEmojiResponse_24( + returnValue: _i16.Future<_i5.EmojiResponse>.value(_FakeEmojiResponse_24( this, Invocation.method( #emoji, @@ -1951,22 +1938,22 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { ), )), returnValueForMissingStub: - _i17.Future<_i5.EmojiResponse>.value(_FakeEmojiResponse_24( + _i16.Future<_i5.EmojiResponse>.value(_FakeEmojiResponse_24( this, Invocation.method( #emoji, [request], ), )), - ) as _i17.Future<_i5.EmojiResponse>); + ) as _i16.Future<_i5.EmojiResponse>); @override - _i17.Future<_i5.MetaResponse> meta() => (super.noSuchMethod( + _i16.Future<_i5.MetaResponse> meta() => (super.noSuchMethod( Invocation.method( #meta, [], ), - returnValue: _i17.Future<_i5.MetaResponse>.value(_FakeMetaResponse_25( + returnValue: _i16.Future<_i5.MetaResponse>.value(_FakeMetaResponse_25( this, Invocation.method( #meta, @@ -1974,22 +1961,22 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { ), )), returnValueForMissingStub: - _i17.Future<_i5.MetaResponse>.value(_FakeMetaResponse_25( + _i16.Future<_i5.MetaResponse>.value(_FakeMetaResponse_25( this, Invocation.method( #meta, [], ), )), - ) as _i17.Future<_i5.MetaResponse>); + ) as _i16.Future<_i5.MetaResponse>); @override - _i17.Future<_i8.StatsResponse> stats() => (super.noSuchMethod( + _i16.Future<_i8.StatsResponse> stats() => (super.noSuchMethod( Invocation.method( #stats, [], ), - returnValue: _i17.Future<_i8.StatsResponse>.value(_FakeStatsResponse_26( + returnValue: _i16.Future<_i8.StatsResponse>.value(_FakeStatsResponse_26( this, Invocation.method( #stats, @@ -1997,22 +1984,22 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { ), )), returnValueForMissingStub: - _i17.Future<_i8.StatsResponse>.value(_FakeStatsResponse_26( + _i16.Future<_i8.StatsResponse>.value(_FakeStatsResponse_26( this, Invocation.method( #stats, [], ), )), - ) as _i17.Future<_i8.StatsResponse>); + ) as _i16.Future<_i8.StatsResponse>); @override - _i17.Future<_i9.PingResponse> ping() => (super.noSuchMethod( + _i16.Future<_i9.PingResponse> ping() => (super.noSuchMethod( Invocation.method( #ping, [], ), - returnValue: _i17.Future<_i9.PingResponse>.value(_FakePingResponse_27( + returnValue: _i16.Future<_i9.PingResponse>.value(_FakePingResponse_27( this, Invocation.method( #ping, @@ -2020,22 +2007,22 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { ), )), returnValueForMissingStub: - _i17.Future<_i9.PingResponse>.value(_FakePingResponse_27( + _i16.Future<_i9.PingResponse>.value(_FakePingResponse_27( this, Invocation.method( #ping, [], ), )), - ) as _i17.Future<_i9.PingResponse>); + ) as _i16.Future<_i9.PingResponse>); @override - _i17.Future<_i5.ServerInfoResponse> serverInfo() => (super.noSuchMethod( + _i16.Future<_i5.ServerInfoResponse> serverInfo() => (super.noSuchMethod( Invocation.method( #serverInfo, [], ), - returnValue: _i17.Future<_i5.ServerInfoResponse>.value( + returnValue: _i16.Future<_i5.ServerInfoResponse>.value( _FakeServerInfoResponse_28( this, Invocation.method( @@ -2043,7 +2030,7 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { [], ), )), - returnValueForMissingStub: _i17.Future<_i5.ServerInfoResponse>.value( + returnValueForMissingStub: _i16.Future<_i5.ServerInfoResponse>.value( _FakeServerInfoResponse_28( this, Invocation.method( @@ -2051,16 +2038,16 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { [], ), )), - ) as _i17.Future<_i5.ServerInfoResponse>); + ) as _i16.Future<_i5.ServerInfoResponse>); @override - _i17.Future<_i5.GetOnlineUsersCountResponse> getOnlineUsersCount() => + _i16.Future<_i5.GetOnlineUsersCountResponse> getOnlineUsersCount() => (super.noSuchMethod( Invocation.method( #getOnlineUsersCount, [], ), - returnValue: _i17.Future<_i5.GetOnlineUsersCountResponse>.value( + returnValue: _i16.Future<_i5.GetOnlineUsersCountResponse>.value( _FakeGetOnlineUsersCountResponse_29( this, Invocation.method( @@ -2069,7 +2056,7 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { ), )), returnValueForMissingStub: - _i17.Future<_i5.GetOnlineUsersCountResponse>.value( + _i16.Future<_i5.GetOnlineUsersCountResponse>.value( _FakeGetOnlineUsersCountResponse_29( this, Invocation.method( @@ -2077,55 +2064,56 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { [], ), )), - ) as _i17.Future<_i5.GetOnlineUsersCountResponse>); + ) as _i16.Future<_i5.GetOnlineUsersCountResponse>); @override - _i17.Future> + _i16.Future> getAvatarDecorations() => (super.noSuchMethod( Invocation.method( #getAvatarDecorations, [], ), returnValue: - _i17.Future>.value( + _i16.Future>.value( <_i5.GetAvatarDecorationsResponse>[]), returnValueForMissingStub: - _i17.Future>.value( + _i16.Future>.value( <_i5.GetAvatarDecorationsResponse>[]), - ) as _i17.Future>); + ) as _i16.Future>); @override - _i17.Future> pinnedUsers() => (super.noSuchMethod( + _i16.Future> pinnedUsers() => (super.noSuchMethod( Invocation.method( #pinnedUsers, [], ), - returnValue: _i17.Future>.value(<_i5.User>[]), + returnValue: + _i16.Future>.value(<_i5.UserDetailed>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.User>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.UserDetailed>[]), + ) as _i16.Future>); @override _i5.SocketController homeTimelineStream({ required _i5.HomeTimelineParameter? parameter, - _i17.FutureOr Function(_i5.Note)? onNoteReceived, - _i17.FutureOr Function( + _i16.FutureOr Function(_i5.Note)? onNoteReceived, + _i16.FutureOr Function( String, _i5.TimelineReacted, )? onReacted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, _i5.TimelineReacted, )? onUnreacted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, DateTime, )? onDeleted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, _i5.TimelineVoted, )? onVoted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, _i5.NoteEdited, )? onUpdated, @@ -2181,24 +2169,24 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { @override _i5.SocketController localTimelineStream({ required _i5.LocalTimelineParameter? parameter, - _i17.FutureOr Function(_i5.Note)? onNoteReceived, - _i17.FutureOr Function( + _i16.FutureOr Function(_i5.Note)? onNoteReceived, + _i16.FutureOr Function( String, _i5.TimelineReacted, )? onReacted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, _i5.TimelineReacted, )? onUnreacted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, DateTime, )? onDeleted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, _i5.TimelineVoted, )? onVoted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, _i5.NoteEdited, )? onUpdated, @@ -2254,24 +2242,24 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { @override _i5.SocketController globalTimelineStream({ required _i5.GlobalTimelineParameter? parameter, - _i17.FutureOr Function(_i5.Note)? onNoteReceived, - _i17.FutureOr Function( + _i16.FutureOr Function(_i5.Note)? onNoteReceived, + _i16.FutureOr Function( String, _i5.TimelineReacted, )? onReacted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, _i5.TimelineReacted, )? onUnreacted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, DateTime, )? onDeleted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, _i5.TimelineVoted, )? onVoted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, _i5.NoteEdited, )? onUpdated, @@ -2327,24 +2315,24 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { @override _i5.SocketController hybridTimelineStream({ required _i5.HybridTimelineParameter? parameter, - _i17.FutureOr Function(_i5.Note)? onNoteReceived, - _i17.FutureOr Function( + _i16.FutureOr Function(_i5.Note)? onNoteReceived, + _i16.FutureOr Function( String, _i5.TimelineReacted, )? onReacted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, _i5.TimelineReacted, )? onUnreacted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, DateTime, )? onDeleted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, _i5.TimelineVoted, )? onVoted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, _i5.NoteEdited, )? onUpdated, @@ -2400,24 +2388,24 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { @override _i5.SocketController roleTimelineStream({ required String? roleId, - _i17.FutureOr Function(_i5.Note)? onNoteReceived, - _i17.FutureOr Function( + _i16.FutureOr Function(_i5.Note)? onNoteReceived, + _i16.FutureOr Function( String, _i5.TimelineReacted, )? onReacted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, _i5.TimelineReacted, )? onUnreacted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, DateTime, )? onDeleted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, _i5.TimelineVoted, )? onVoted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, _i5.NoteEdited, )? onUpdated, @@ -2473,24 +2461,24 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { @override _i5.SocketController channelStream({ required String? channelId, - _i17.FutureOr Function(_i5.Note)? onNoteReceived, - _i17.FutureOr Function( + _i16.FutureOr Function(_i5.Note)? onNoteReceived, + _i16.FutureOr Function( String, _i5.TimelineReacted, )? onReacted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, _i5.TimelineReacted, )? onUnreacted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, DateTime, )? onDeleted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, _i5.TimelineVoted, )? onVoted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, _i5.NoteEdited, )? onUpdated, @@ -2546,23 +2534,23 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { @override _i5.SocketController userListStream({ required String? listId, - _i17.FutureOr Function(_i5.Note)? onNoteReceived, - _i17.FutureOr Function(_i5.User)? onUserAdded, - _i17.FutureOr Function(_i5.User)? onUserRemoved, - _i17.FutureOr Function( + _i16.FutureOr Function(_i5.Note)? onNoteReceived, + _i16.FutureOr Function(_i5.UserLite)? onUserAdded, + _i16.FutureOr Function(_i5.UserLite)? onUserRemoved, + _i16.FutureOr Function( String, _i5.TimelineReacted, )? onReacted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, _i5.TimelineReacted, )? onUnreacted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, _i5.NoteEdited, )? onUpdated, - _i17.FutureOr Function(DateTime)? onDeleted, - _i17.FutureOr Function( + _i16.FutureOr Function(DateTime)? onDeleted, + _i16.FutureOr Function( String, _i5.TimelineVoted, )? onVoted, @@ -2624,24 +2612,24 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { @override _i5.SocketController antennaStream({ required String? antennaId, - _i17.FutureOr Function(_i5.Note)? onNoteReceived, - _i17.FutureOr Function( + _i16.FutureOr Function(_i5.Note)? onNoteReceived, + _i16.FutureOr Function( String, _i5.TimelineReacted, )? onReacted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, _i5.TimelineReacted, )? onUnreacted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, DateTime, )? onDeleted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, _i5.TimelineVoted, )? onVoted, - _i17.FutureOr Function( + _i16.FutureOr Function( String, _i5.NoteEdited, )? onUpdated, @@ -2696,8 +2684,8 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { @override _i5.SocketController serverStatsLogStream( - _i17.FutureOr Function(List<_i5.StatsLogResponse>)? onLogReceived, - _i17.FutureOr Function(_i5.StatsLogResponse)? onEventReceived, + _i16.FutureOr Function(List<_i5.StatsLogResponse>)? onLogReceived, + _i16.FutureOr Function(_i5.StatsLogResponse)? onEventReceived, ) => (super.noSuchMethod( Invocation.method( @@ -2731,9 +2719,9 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { @override _i5.SocketController queueStatsLogStream( - _i17.FutureOr Function(List<_i5.QueueStatsLogResponse>)? + _i16.FutureOr Function(List<_i5.QueueStatsLogResponse>)? onLogReceived, - _i17.FutureOr Function(_i5.QueueStatsLogResponse)? onEventReceived, + _i16.FutureOr Function(_i5.QueueStatsLogResponse)? onEventReceived, ) => (super.noSuchMethod( Invocation.method( @@ -2767,28 +2755,28 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { @override _i5.SocketController mainStream({ - _i17.FutureOr Function(_i5.Emoji)? onEmojiAdded, - _i17.FutureOr Function(Iterable<_i5.Emoji>)? onEmojiUpdated, - _i17.FutureOr Function(Iterable<_i5.Emoji>)? onEmojiDeleted, - _i17.FutureOr Function(_i5.AnnouncementsResponse)? + _i16.FutureOr Function(_i5.Emoji)? onEmojiAdded, + _i16.FutureOr Function(Iterable<_i5.Emoji>)? onEmojiUpdated, + _i16.FutureOr Function(Iterable<_i5.Emoji>)? onEmojiDeleted, + _i16.FutureOr Function(_i5.AnnouncementsResponse)? onAnnouncementCreated, - _i17.FutureOr Function(_i5.INotificationsResponse)? onNotification, - _i17.FutureOr Function(_i5.Note)? onMention, - _i17.FutureOr Function(_i5.Note)? onReply, - _i17.FutureOr Function(_i5.Note)? onRenote, - _i17.FutureOr Function(_i5.User)? onFollow, - _i17.FutureOr Function(_i5.User)? onFollowed, - _i17.FutureOr Function(_i5.User)? onUnfollow, - _i17.FutureOr Function(_i5.User)? onMeUpdated, - _i17.FutureOr Function()? onReadAllNotifications, - _i17.FutureOr Function(_i5.INotificationsResponse)? + _i16.FutureOr Function(_i5.INotificationsResponse)? onNotification, + _i16.FutureOr Function(_i5.Note)? onMention, + _i16.FutureOr Function(_i5.Note)? onReply, + _i16.FutureOr Function(_i5.Note)? onRenote, + _i16.FutureOr Function(_i5.UserDetailedNotMe)? onFollow, + _i16.FutureOr Function(_i5.UserLite)? onFollowed, + _i16.FutureOr Function(_i5.UserDetailedNotMe)? onUnfollow, + _i16.FutureOr Function(_i5.MeDetailed)? onMeUpdated, + _i16.FutureOr Function()? onReadAllNotifications, + _i16.FutureOr Function(_i5.INotificationsResponse)? onUnreadNotification, - _i17.FutureOr Function(String)? onUnreadMention, - _i17.FutureOr Function()? onReadAllUnreadMentions, - _i17.FutureOr Function(String)? onUnreadSpecifiedNote, - _i17.FutureOr Function()? onReadAllUnreadSpecifiedNotes, - _i17.FutureOr Function(_i5.User)? onReceiveFollowRequest, - _i17.FutureOr Function()? onReadAllAnnouncements, + _i16.FutureOr Function(String)? onUnreadMention, + _i16.FutureOr Function()? onReadAllUnreadMentions, + _i16.FutureOr Function(String)? onUnreadSpecifiedNote, + _i16.FutureOr Function()? onReadAllUnreadSpecifiedNotes, + _i16.FutureOr Function(_i5.UserLite)? onReceiveFollowRequest, + _i16.FutureOr Function()? onReadAllAnnouncements, }) => (super.noSuchMethod( Invocation.method( @@ -2878,14 +2866,14 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { ) as _i5.SocketController); @override - _i17.Future startStreaming() => (super.noSuchMethod( + _i16.Future startStreaming() => (super.noSuchMethod( Invocation.method( #startStreaming, [], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); } /// A class which mocks [MisskeyAntenna]. @@ -2893,13 +2881,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) => + _i16.Future<_i5.Antenna> create(_i5.AntennasCreateRequest? request) => (super.noSuchMethod( Invocation.method( #create, [request], ), - returnValue: _i17.Future<_i5.Antenna>.value(_FakeAntenna_31( + returnValue: _i16.Future<_i5.Antenna>.value(_FakeAntenna_31( this, Invocation.method( #create, @@ -2907,57 +2895,57 @@ class MockMisskeyAntenna extends _i1.Mock implements _i5.MisskeyAntenna { ), )), returnValueForMissingStub: - _i17.Future<_i5.Antenna>.value(_FakeAntenna_31( + _i16.Future<_i5.Antenna>.value(_FakeAntenna_31( this, Invocation.method( #create, [request], ), )), - ) as _i17.Future<_i5.Antenna>); + ) as _i16.Future<_i5.Antenna>); @override - _i17.Future delete(_i5.AntennasDeleteRequest? request) => + _i16.Future delete(_i5.AntennasDeleteRequest? request) => (super.noSuchMethod( Invocation.method( #delete, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future> list() => (super.noSuchMethod( + _i16.Future> list() => (super.noSuchMethod( Invocation.method( #list, [], ), - returnValue: _i17.Future>.value(<_i5.Antenna>[]), + returnValue: _i16.Future>.value(<_i5.Antenna>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Antenna>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Antenna>[]), + ) as _i16.Future>); @override - _i17.Future> notes(_i5.AntennasNotesRequest? request) => + _i16.Future> notes(_i5.AntennasNotesRequest? request) => (super.noSuchMethod( Invocation.method( #notes, [request], ), - returnValue: _i17.Future>.value(<_i5.Note>[]), + returnValue: _i16.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Note>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Note>[]), + ) as _i16.Future>); @override - _i17.Future<_i5.Antenna> show(_i5.AntennasShowRequest? request) => + _i16.Future<_i5.Antenna> show(_i5.AntennasShowRequest? request) => (super.noSuchMethod( Invocation.method( #show, [request], ), - returnValue: _i17.Future<_i5.Antenna>.value(_FakeAntenna_31( + returnValue: _i16.Future<_i5.Antenna>.value(_FakeAntenna_31( this, Invocation.method( #show, @@ -2965,25 +2953,25 @@ class MockMisskeyAntenna extends _i1.Mock implements _i5.MisskeyAntenna { ), )), returnValueForMissingStub: - _i17.Future<_i5.Antenna>.value(_FakeAntenna_31( + _i16.Future<_i5.Antenna>.value(_FakeAntenna_31( this, Invocation.method( #show, [request], ), )), - ) as _i17.Future<_i5.Antenna>); + ) as _i16.Future<_i5.Antenna>); @override - _i17.Future update(_i5.AntennasUpdateRequest? request) => + _i16.Future update(_i5.AntennasUpdateRequest? request) => (super.noSuchMethod( Invocation.method( #update, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); } /// A class which mocks [MisskeyAp]. @@ -2991,14 +2979,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) => + _i16.Future<_i5.ApShowResponse> show(_i5.ApShowRequest? request) => (super.noSuchMethod( Invocation.method( #show, [request], ), returnValue: - _i17.Future<_i5.ApShowResponse>.value(_FakeApShowResponse_32( + _i16.Future<_i5.ApShowResponse>.value(_FakeApShowResponse_32( this, Invocation.method( #show, @@ -3006,14 +2994,14 @@ class MockMisskeyAp extends _i1.Mock implements _i5.MisskeyAp { ), )), returnValueForMissingStub: - _i17.Future<_i5.ApShowResponse>.value(_FakeApShowResponse_32( + _i16.Future<_i5.ApShowResponse>.value(_FakeApShowResponse_32( this, Invocation.method( #show, [request], ), )), - ) as _i17.Future<_i5.ApShowResponse>); + ) as _i16.Future<_i5.ApShowResponse>); } /// A class which mocks [MisskeyBlocking]. @@ -3021,26 +3009,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 create(_i5.BlockCreateRequest? request) => + _i16.Future create(_i5.BlockCreateRequest? request) => (super.noSuchMethod( Invocation.method( #create, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future delete(_i5.BlockDeleteRequest? request) => + _i16.Future delete(_i5.BlockDeleteRequest? request) => (super.noSuchMethod( Invocation.method( #delete, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); } /// A class which mocks [MisskeyChannels]. @@ -3048,27 +3036,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> timeline( + _i16.Future> timeline( _i5.ChannelsTimelineRequest? request) => (super.noSuchMethod( Invocation.method( #timeline, [request], ), - returnValue: _i17.Future>.value(<_i5.Note>[]), + returnValue: _i16.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Note>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Note>[]), + ) as _i16.Future>); @override - _i17.Future<_i5.CommunityChannel> show(_i5.ChannelsShowRequest? request) => + _i16.Future<_i5.CommunityChannel> show(_i5.ChannelsShowRequest? request) => (super.noSuchMethod( Invocation.method( #show, [request], ), returnValue: - _i17.Future<_i5.CommunityChannel>.value(_FakeCommunityChannel_33( + _i16.Future<_i5.CommunityChannel>.value(_FakeCommunityChannel_33( this, Invocation.method( #show, @@ -3076,90 +3064,90 @@ class MockMisskeyChannels extends _i1.Mock implements _i5.MisskeyChannels { ), )), returnValueForMissingStub: - _i17.Future<_i5.CommunityChannel>.value(_FakeCommunityChannel_33( + _i16.Future<_i5.CommunityChannel>.value(_FakeCommunityChannel_33( this, Invocation.method( #show, [request], ), )), - ) as _i17.Future<_i5.CommunityChannel>); + ) as _i16.Future<_i5.CommunityChannel>); @override - _i17.Future> followed( + _i16.Future> followed( _i5.ChannelsFollowedRequest? request) => (super.noSuchMethod( Invocation.method( #followed, [request], ), - returnValue: _i17.Future>.value( + returnValue: _i16.Future>.value( <_i5.CommunityChannel>[]), returnValueForMissingStub: - _i17.Future>.value( + _i16.Future>.value( <_i5.CommunityChannel>[]), - ) as _i17.Future>); + ) as _i16.Future>); @override - _i17.Future> myFavorite( + _i16.Future> myFavorite( _i5.ChannelsMyFavoriteRequest? request) => (super.noSuchMethod( Invocation.method( #myFavorite, [request], ), - returnValue: _i17.Future>.value( + returnValue: _i16.Future>.value( <_i5.CommunityChannel>[]), returnValueForMissingStub: - _i17.Future>.value( + _i16.Future>.value( <_i5.CommunityChannel>[]), - ) as _i17.Future>); + ) as _i16.Future>); @override - _i17.Future> featured() => (super.noSuchMethod( + _i16.Future> featured() => (super.noSuchMethod( Invocation.method( #featured, [], ), - returnValue: _i17.Future>.value( + returnValue: _i16.Future>.value( <_i5.CommunityChannel>[]), returnValueForMissingStub: - _i17.Future>.value( + _i16.Future>.value( <_i5.CommunityChannel>[]), - ) as _i17.Future>); + ) as _i16.Future>); @override - _i17.Future> owned( + _i16.Future> owned( _i5.ChannelsOwnedRequest? request) => (super.noSuchMethod( Invocation.method( #owned, [request], ), - returnValue: _i17.Future>.value( + returnValue: _i16.Future>.value( <_i5.CommunityChannel>[]), returnValueForMissingStub: - _i17.Future>.value( + _i16.Future>.value( <_i5.CommunityChannel>[]), - ) as _i17.Future>); + ) as _i16.Future>); @override - _i17.Future> search( + _i16.Future> search( _i5.ChannelsSearchRequest? request) => (super.noSuchMethod( Invocation.method( #search, [request], ), - returnValue: _i17.Future>.value( + returnValue: _i16.Future>.value( <_i5.CommunityChannel>[]), returnValueForMissingStub: - _i17.Future>.value( + _i16.Future>.value( <_i5.CommunityChannel>[]), - ) as _i17.Future>); + ) as _i16.Future>); @override - _i17.Future<_i5.CommunityChannel> create( + _i16.Future<_i5.CommunityChannel> create( _i5.ChannelsCreateRequest? request) => (super.noSuchMethod( Invocation.method( @@ -3167,7 +3155,7 @@ class MockMisskeyChannels extends _i1.Mock implements _i5.MisskeyChannels { [request], ), returnValue: - _i17.Future<_i5.CommunityChannel>.value(_FakeCommunityChannel_33( + _i16.Future<_i5.CommunityChannel>.value(_FakeCommunityChannel_33( this, Invocation.method( #create, @@ -3175,69 +3163,69 @@ class MockMisskeyChannels extends _i1.Mock implements _i5.MisskeyChannels { ), )), returnValueForMissingStub: - _i17.Future<_i5.CommunityChannel>.value(_FakeCommunityChannel_33( + _i16.Future<_i5.CommunityChannel>.value(_FakeCommunityChannel_33( this, Invocation.method( #create, [request], ), )), - ) as _i17.Future<_i5.CommunityChannel>); + ) as _i16.Future<_i5.CommunityChannel>); @override - _i17.Future update(_i5.ChannelsUpdateRequest? request) => + _i16.Future update(_i5.ChannelsUpdateRequest? request) => (super.noSuchMethod( Invocation.method( #update, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future favorite(_i5.ChannelsFavoriteRequest? request) => + _i16.Future favorite(_i5.ChannelsFavoriteRequest? request) => (super.noSuchMethod( Invocation.method( #favorite, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future unfavorite(_i5.ChannelsUnfavoriteRequest? request) => + _i16.Future unfavorite(_i5.ChannelsUnfavoriteRequest? request) => (super.noSuchMethod( Invocation.method( #unfavorite, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future follow(_i5.ChannelsFollowRequest? request) => + _i16.Future follow(_i5.ChannelsFollowRequest? request) => (super.noSuchMethod( Invocation.method( #follow, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future unfollow(_i5.ChannelsUnfollowRequest? request) => + _i16.Future unfollow(_i5.ChannelsUnfollowRequest? request) => (super.noSuchMethod( Invocation.method( #unfollow, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); } /// A class which mocks [MisskeyClips]. @@ -3245,162 +3233,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> list() => (super.noSuchMethod( + _i16.Future> list() => (super.noSuchMethod( Invocation.method( #list, [], ), - returnValue: _i17.Future>.value(<_i5.Clip>[]), + returnValue: _i16.Future>.value(<_i5.Clip>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Clip>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Clip>[]), + ) as _i16.Future>); @override - _i17.Future> myFavorites() => (super.noSuchMethod( + _i16.Future> myFavorites() => (super.noSuchMethod( Invocation.method( #myFavorites, [], ), - returnValue: _i17.Future>.value(<_i5.Clip>[]), + returnValue: _i16.Future>.value(<_i5.Clip>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Clip>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Clip>[]), + ) as _i16.Future>); @override - _i17.Future> notes(_i5.ClipsNotesRequest? request) => + _i16.Future> notes(_i5.ClipsNotesRequest? request) => (super.noSuchMethod( Invocation.method( #notes, [request], ), - returnValue: _i17.Future>.value(<_i5.Note>[]), + returnValue: _i16.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Note>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Note>[]), + ) as _i16.Future>); @override - _i17.Future addNote(_i5.ClipsAddNoteRequest? request) => + _i16.Future addNote(_i5.ClipsAddNoteRequest? request) => (super.noSuchMethod( Invocation.method( #addNote, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future removeNote(_i5.ClipsRemoveNoteRequest? request) => + _i16.Future removeNote(_i5.ClipsRemoveNoteRequest? request) => (super.noSuchMethod( Invocation.method( #removeNote, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future<_i5.Clip> create(_i5.ClipsCreateRequest? request) => + _i16.Future<_i5.Clip> create(_i5.ClipsCreateRequest? request) => (super.noSuchMethod( Invocation.method( #create, [request], ), - returnValue: _i17.Future<_i5.Clip>.value(_FakeClip_34( + returnValue: _i16.Future<_i5.Clip>.value(_FakeClip_34( this, Invocation.method( #create, [request], ), )), - returnValueForMissingStub: _i17.Future<_i5.Clip>.value(_FakeClip_34( + returnValueForMissingStub: _i16.Future<_i5.Clip>.value(_FakeClip_34( this, Invocation.method( #create, [request], ), )), - ) as _i17.Future<_i5.Clip>); + ) as _i16.Future<_i5.Clip>); @override - _i17.Future delete(_i5.ClipsDeleteRequest? request) => + _i16.Future delete(_i5.ClipsDeleteRequest? request) => (super.noSuchMethod( Invocation.method( #delete, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future<_i5.Clip> update(_i5.ClipsUpdateRequest? request) => + _i16.Future<_i5.Clip> update(_i5.ClipsUpdateRequest? request) => (super.noSuchMethod( Invocation.method( #update, [request], ), - returnValue: _i17.Future<_i5.Clip>.value(_FakeClip_34( + returnValue: _i16.Future<_i5.Clip>.value(_FakeClip_34( this, Invocation.method( #update, [request], ), )), - returnValueForMissingStub: _i17.Future<_i5.Clip>.value(_FakeClip_34( + returnValueForMissingStub: _i16.Future<_i5.Clip>.value(_FakeClip_34( this, Invocation.method( #update, [request], ), )), - ) as _i17.Future<_i5.Clip>); + ) as _i16.Future<_i5.Clip>); @override - _i17.Future<_i5.Clip> show(_i5.ClipsShowRequest? request) => + _i16.Future<_i5.Clip> show(_i5.ClipsShowRequest? request) => (super.noSuchMethod( Invocation.method( #show, [request], ), - returnValue: _i17.Future<_i5.Clip>.value(_FakeClip_34( + returnValue: _i16.Future<_i5.Clip>.value(_FakeClip_34( this, Invocation.method( #show, [request], ), )), - returnValueForMissingStub: _i17.Future<_i5.Clip>.value(_FakeClip_34( + returnValueForMissingStub: _i16.Future<_i5.Clip>.value(_FakeClip_34( this, Invocation.method( #show, [request], ), )), - ) as _i17.Future<_i5.Clip>); + ) as _i16.Future<_i5.Clip>); @override - _i17.Future favorite(_i5.ClipsFavoriteRequest? request) => + _i16.Future favorite(_i5.ClipsFavoriteRequest? request) => (super.noSuchMethod( Invocation.method( #favorite, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future unfavorite(_i5.ClipsUnfavoriteRequest? request) => + _i16.Future unfavorite(_i5.ClipsUnfavoriteRequest? request) => (super.noSuchMethod( Invocation.method( #unfavorite, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); } /// A class which mocks [MisskeyDrive]. @@ -3434,7 +3422,7 @@ class MockMisskeyDrive extends _i1.Mock implements _i5.MisskeyDrive { ) as _i5.MisskeyDriveFolders); @override - _i17.Future> stream( + _i16.Future> stream( _i5.DriveStreamRequest? request) => (super.noSuchMethod( Invocation.method( @@ -3442,10 +3430,10 @@ class MockMisskeyDrive extends _i1.Mock implements _i5.MisskeyDrive { [request], ), returnValue: - _i17.Future>.value(<_i5.DriveFile>[]), + _i16.Future>.value(<_i5.DriveFile>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.DriveFile>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.DriveFile>[]), + ) as _i16.Future>); } /// A class which mocks [MisskeyDriveFolders]. @@ -3454,7 +3442,7 @@ class MockMisskeyDrive extends _i1.Mock implements _i5.MisskeyDrive { class MockMisskeyDriveFolders extends _i1.Mock implements _i5.MisskeyDriveFolders { @override - _i17.Future> folders( + _i16.Future> folders( _i5.DriveFoldersRequest? request) => (super.noSuchMethod( Invocation.method( @@ -3462,19 +3450,19 @@ class MockMisskeyDriveFolders extends _i1.Mock [request], ), returnValue: - _i17.Future>.value(<_i5.DriveFolder>[]), + _i16.Future>.value(<_i5.DriveFolder>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.DriveFolder>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.DriveFolder>[]), + ) as _i16.Future>); @override - _i17.Future<_i5.DriveFolder> create(_i5.DriveFoldersCreateRequest? request) => + _i16.Future<_i5.DriveFolder> create(_i5.DriveFoldersCreateRequest? request) => (super.noSuchMethod( Invocation.method( #create, [request], ), - returnValue: _i17.Future<_i5.DriveFolder>.value(_FakeDriveFolder_37( + returnValue: _i16.Future<_i5.DriveFolder>.value(_FakeDriveFolder_37( this, Invocation.method( #create, @@ -3482,28 +3470,28 @@ class MockMisskeyDriveFolders extends _i1.Mock ), )), returnValueForMissingStub: - _i17.Future<_i5.DriveFolder>.value(_FakeDriveFolder_37( + _i16.Future<_i5.DriveFolder>.value(_FakeDriveFolder_37( this, Invocation.method( #create, [request], ), )), - ) as _i17.Future<_i5.DriveFolder>); + ) as _i16.Future<_i5.DriveFolder>); @override - _i17.Future delete(_i5.DriveFoldersDeleteRequest? request) => + _i16.Future delete(_i5.DriveFoldersDeleteRequest? request) => (super.noSuchMethod( Invocation.method( #delete, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future> find( + _i16.Future> find( _i5.DriveFoldersFindRequest? request) => (super.noSuchMethod( Invocation.method( @@ -3511,19 +3499,19 @@ class MockMisskeyDriveFolders extends _i1.Mock [request], ), returnValue: - _i17.Future>.value(<_i5.DriveFolder>[]), + _i16.Future>.value(<_i5.DriveFolder>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.DriveFolder>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.DriveFolder>[]), + ) as _i16.Future>); @override - _i17.Future<_i5.DriveFolder> show(_i5.DriveFoldersShowRequest? request) => + _i16.Future<_i5.DriveFolder> show(_i5.DriveFoldersShowRequest? request) => (super.noSuchMethod( Invocation.method( #show, [request], ), - returnValue: _i17.Future<_i5.DriveFolder>.value(_FakeDriveFolder_37( + returnValue: _i16.Future<_i5.DriveFolder>.value(_FakeDriveFolder_37( this, Invocation.method( #show, @@ -3531,23 +3519,23 @@ class MockMisskeyDriveFolders extends _i1.Mock ), )), returnValueForMissingStub: - _i17.Future<_i5.DriveFolder>.value(_FakeDriveFolder_37( + _i16.Future<_i5.DriveFolder>.value(_FakeDriveFolder_37( this, Invocation.method( #show, [request], ), )), - ) as _i17.Future<_i5.DriveFolder>); + ) as _i16.Future<_i5.DriveFolder>); @override - _i17.Future<_i5.DriveFolder> update(_i5.DriveFoldersUpdateRequest? request) => + _i16.Future<_i5.DriveFolder> update(_i5.DriveFoldersUpdateRequest? request) => (super.noSuchMethod( Invocation.method( #update, [request], ), - returnValue: _i17.Future<_i5.DriveFolder>.value(_FakeDriveFolder_37( + returnValue: _i16.Future<_i5.DriveFolder>.value(_FakeDriveFolder_37( this, Invocation.method( #update, @@ -3555,14 +3543,14 @@ class MockMisskeyDriveFolders extends _i1.Mock ), )), returnValueForMissingStub: - _i17.Future<_i5.DriveFolder>.value(_FakeDriveFolder_37( + _i16.Future<_i5.DriveFolder>.value(_FakeDriveFolder_37( this, Invocation.method( #update, [request], ), )), - ) as _i17.Future<_i5.DriveFolder>); + ) as _i16.Future<_i5.DriveFolder>); } /// A class which mocks [MisskeyDriveFiles]. @@ -3570,7 +3558,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( + _i16.Future<_i5.DriveFile> create( _i5.DriveFilesCreateRequest? request, _i11.File? fileContent, ) => @@ -3582,7 +3570,7 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles { fileContent, ], ), - returnValue: _i17.Future<_i5.DriveFile>.value(_FakeDriveFile_38( + returnValue: _i16.Future<_i5.DriveFile>.value(_FakeDriveFile_38( this, Invocation.method( #create, @@ -3593,7 +3581,7 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles { ), )), returnValueForMissingStub: - _i17.Future<_i5.DriveFile>.value(_FakeDriveFile_38( + _i16.Future<_i5.DriveFile>.value(_FakeDriveFile_38( this, Invocation.method( #create, @@ -3603,12 +3591,12 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles { ], ), )), - ) as _i17.Future<_i5.DriveFile>); + ) as _i16.Future<_i5.DriveFile>); @override - _i17.Future<_i5.DriveFile> createAsBinary( + _i16.Future<_i5.DriveFile> createAsBinary( _i5.DriveFilesCreateRequest? request, - _i28.Uint8List? fileContent, + _i27.Uint8List? fileContent, ) => (super.noSuchMethod( Invocation.method( @@ -3618,7 +3606,7 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles { fileContent, ], ), - returnValue: _i17.Future<_i5.DriveFile>.value(_FakeDriveFile_38( + returnValue: _i16.Future<_i5.DriveFile>.value(_FakeDriveFile_38( this, Invocation.method( #createAsBinary, @@ -3629,7 +3617,7 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles { ), )), returnValueForMissingStub: - _i17.Future<_i5.DriveFile>.value(_FakeDriveFile_38( + _i16.Future<_i5.DriveFile>.value(_FakeDriveFile_38( this, Invocation.method( #createAsBinary, @@ -3639,16 +3627,16 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles { ], ), )), - ) as _i17.Future<_i5.DriveFile>); + ) as _i16.Future<_i5.DriveFile>); @override - _i17.Future<_i5.DriveFile> update(_i5.DriveFilesUpdateRequest? request) => + _i16.Future<_i5.DriveFile> update(_i5.DriveFilesUpdateRequest? request) => (super.noSuchMethod( Invocation.method( #update, [request], ), - returnValue: _i17.Future<_i5.DriveFile>.value(_FakeDriveFile_38( + returnValue: _i16.Future<_i5.DriveFile>.value(_FakeDriveFile_38( this, Invocation.method( #update, @@ -3656,41 +3644,41 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles { ), )), returnValueForMissingStub: - _i17.Future<_i5.DriveFile>.value(_FakeDriveFile_38( + _i16.Future<_i5.DriveFile>.value(_FakeDriveFile_38( this, Invocation.method( #update, [request], ), )), - ) as _i17.Future<_i5.DriveFile>); + ) as _i16.Future<_i5.DriveFile>); @override - _i17.Future delete(_i5.DriveFilesDeleteRequest? request) => + _i16.Future delete(_i5.DriveFilesDeleteRequest? request) => (super.noSuchMethod( Invocation.method( #delete, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future> files(_i5.DriveFilesRequest? request) => + _i16.Future> files(_i5.DriveFilesRequest? request) => (super.noSuchMethod( Invocation.method( #files, [request], ), returnValue: - _i17.Future>.value(<_i5.DriveFile>[]), + _i16.Future>.value(<_i5.DriveFile>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.DriveFile>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.DriveFile>[]), + ) as _i16.Future>); @override - _i17.Future> find( + _i16.Future> find( _i5.DriveFilesFindRequest? request) => (super.noSuchMethod( Invocation.method( @@ -3698,38 +3686,38 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles { [request], ), returnValue: - _i17.Future>.value(<_i5.DriveFile>[]), + _i16.Future>.value(<_i5.DriveFile>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.DriveFile>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.DriveFile>[]), + ) as _i16.Future>); @override - _i17.Future> attachedNotes( + _i16.Future> attachedNotes( _i5.DriveFilesAttachedNotesRequest? request) => (super.noSuchMethod( Invocation.method( #attachedNotes, [request], ), - returnValue: _i17.Future>.value(<_i5.Note>[]), + returnValue: _i16.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Note>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Note>[]), + ) as _i16.Future>); @override - _i17.Future checkExistence( + _i16.Future checkExistence( _i5.DriveFilesCheckExistenceRequest? request) => (super.noSuchMethod( Invocation.method( #checkExistence, [request], ), - returnValue: _i17.Future.value(false), - returnValueForMissingStub: _i17.Future.value(false), - ) as _i17.Future); + returnValue: _i16.Future.value(false), + returnValueForMissingStub: _i16.Future.value(false), + ) as _i16.Future); @override - _i17.Future> findByHash( + _i16.Future> findByHash( _i5.DriveFilesFindByHashRequest? request) => (super.noSuchMethod( Invocation.method( @@ -3737,19 +3725,19 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles { [request], ), returnValue: - _i17.Future>.value(<_i5.DriveFile>[]), + _i16.Future>.value(<_i5.DriveFile>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.DriveFile>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.DriveFile>[]), + ) as _i16.Future>); @override - _i17.Future<_i5.DriveFile> show(_i5.DriveFilesShowRequest? request) => + _i16.Future<_i5.DriveFile> show(_i5.DriveFilesShowRequest? request) => (super.noSuchMethod( Invocation.method( #show, [request], ), - returnValue: _i17.Future<_i5.DriveFile>.value(_FakeDriveFile_38( + returnValue: _i16.Future<_i5.DriveFile>.value(_FakeDriveFile_38( this, Invocation.method( #show, @@ -3757,26 +3745,26 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles { ), )), returnValueForMissingStub: - _i17.Future<_i5.DriveFile>.value(_FakeDriveFile_38( + _i16.Future<_i5.DriveFile>.value(_FakeDriveFile_38( this, Invocation.method( #show, [request], ), )), - ) as _i17.Future<_i5.DriveFile>); + ) as _i16.Future<_i5.DriveFile>); @override - _i17.Future uploadFromUrl( + _i16.Future uploadFromUrl( _i5.DriveFilesUploadFromUrlRequest? request) => (super.noSuchMethod( Invocation.method( #uploadFromUrl, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); } /// A class which mocks [MisskeyFederation]. @@ -3784,14 +3772,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( + _i16.Future<_i5.FederationShowInstanceResponse> showInstance( _i5.FederationShowInstanceRequest? request) => (super.noSuchMethod( Invocation.method( #showInstance, [request], ), - returnValue: _i17.Future<_i5.FederationShowInstanceResponse>.value( + returnValue: _i16.Future<_i5.FederationShowInstanceResponse>.value( _FakeFederationShowInstanceResponse_39( this, Invocation.method( @@ -3800,7 +3788,7 @@ class MockMisskeyFederation extends _i1.Mock implements _i5.MisskeyFederation { ), )), returnValueForMissingStub: - _i17.Future<_i5.FederationShowInstanceResponse>.value( + _i16.Future<_i5.FederationShowInstanceResponse>.value( _FakeFederationShowInstanceResponse_39( this, Invocation.method( @@ -3808,19 +3796,21 @@ class MockMisskeyFederation extends _i1.Mock implements _i5.MisskeyFederation { [request], ), )), - ) as _i17.Future<_i5.FederationShowInstanceResponse>); + ) as _i16.Future<_i5.FederationShowInstanceResponse>); @override - _i17.Future> users(_i5.FederationUsersRequest? request) => + _i16.Future> users( + _i5.FederationUsersRequest? request) => (super.noSuchMethod( Invocation.method( #users, [request], ), - returnValue: _i17.Future>.value(<_i5.User>[]), + returnValue: + _i16.Future>.value(<_i5.UserDetailed>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.User>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.UserDetailed>[]), + ) as _i16.Future>); } /// A class which mocks [MisskeyFollowing]. @@ -3841,84 +3831,88 @@ class MockMisskeyFollowing extends _i1.Mock implements _i5.MisskeyFollowing { ) as _i5.MisskeyFollowingRequests); @override - _i17.Future<_i5.User> create(_i5.FollowingCreateRequest? request) => + _i16.Future<_i5.UserLite> create(_i5.FollowingCreateRequest? request) => (super.noSuchMethod( Invocation.method( #create, [request], ), - returnValue: _i17.Future<_i5.User>.value(_FakeUser_41( + returnValue: _i16.Future<_i5.UserLite>.value(_FakeUserLite_41( this, Invocation.method( #create, [request], ), )), - returnValueForMissingStub: _i17.Future<_i5.User>.value(_FakeUser_41( + returnValueForMissingStub: + _i16.Future<_i5.UserLite>.value(_FakeUserLite_41( this, Invocation.method( #create, [request], ), )), - ) as _i17.Future<_i5.User>); + ) as _i16.Future<_i5.UserLite>); @override - _i17.Future<_i5.User> delete(_i5.FollowingDeleteRequest? request) => + _i16.Future<_i5.UserLite> delete(_i5.FollowingDeleteRequest? request) => (super.noSuchMethod( Invocation.method( #delete, [request], ), - returnValue: _i17.Future<_i5.User>.value(_FakeUser_41( + returnValue: _i16.Future<_i5.UserLite>.value(_FakeUserLite_41( this, Invocation.method( #delete, [request], ), )), - returnValueForMissingStub: _i17.Future<_i5.User>.value(_FakeUser_41( + returnValueForMissingStub: + _i16.Future<_i5.UserLite>.value(_FakeUserLite_41( this, Invocation.method( #delete, [request], ), )), - ) as _i17.Future<_i5.User>); + ) as _i16.Future<_i5.UserLite>); @override - _i17.Future<_i5.User> invalidate(_i5.FollowingInvalidateRequest? request) => + _i16.Future<_i5.UserLite> invalidate( + _i5.FollowingInvalidateRequest? request) => (super.noSuchMethod( Invocation.method( #invalidate, [request], ), - returnValue: _i17.Future<_i5.User>.value(_FakeUser_41( + returnValue: _i16.Future<_i5.UserLite>.value(_FakeUserLite_41( this, Invocation.method( #invalidate, [request], ), )), - returnValueForMissingStub: _i17.Future<_i5.User>.value(_FakeUser_41( + returnValueForMissingStub: + _i16.Future<_i5.UserLite>.value(_FakeUserLite_41( this, Invocation.method( #invalidate, [request], ), )), - ) as _i17.Future<_i5.User>); + ) as _i16.Future<_i5.UserLite>); @override - _i17.Future updateAll(_i5.FollowingUpdateAllRequest? request) => + _i16.Future updateAll(_i5.FollowingUpdateAllRequest? request) => (super.noSuchMethod( Invocation.method( #updateAll, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); } /// A class which mocks [MisskeyHashtags]. @@ -3926,37 +3920,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> list(_i5.HashtagsListRequest? request) => + _i16.Future> list(_i5.HashtagsListRequest? request) => (super.noSuchMethod( Invocation.method( #list, [request], ), - returnValue: _i17.Future>.value(<_i5.Hashtag>[]), + returnValue: _i16.Future>.value(<_i5.Hashtag>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Hashtag>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Hashtag>[]), + ) as _i16.Future>); @override - _i17.Future> search(_i5.HashtagsSearchRequest? request) => + _i16.Future> search(_i5.HashtagsSearchRequest? request) => (super.noSuchMethod( Invocation.method( #search, [request], ), - returnValue: _i17.Future>.value([]), + returnValue: _i16.Future>.value([]), returnValueForMissingStub: - _i17.Future>.value([]), - ) as _i17.Future>); + _i16.Future>.value([]), + ) as _i16.Future>); @override - _i17.Future<_i5.Hashtag> show(_i5.HashtagsShowRequest? request) => + _i16.Future<_i5.Hashtag> show(_i5.HashtagsShowRequest? request) => (super.noSuchMethod( Invocation.method( #show, [request], ), - returnValue: _i17.Future<_i5.Hashtag>.value(_FakeHashtag_42( + returnValue: _i16.Future<_i5.Hashtag>.value(_FakeHashtag_42( this, Invocation.method( #show, @@ -3964,40 +3958,42 @@ class MockMisskeyHashtags extends _i1.Mock implements _i5.MisskeyHashtags { ), )), returnValueForMissingStub: - _i17.Future<_i5.Hashtag>.value(_FakeHashtag_42( + _i16.Future<_i5.Hashtag>.value(_FakeHashtag_42( this, Invocation.method( #show, [request], ), )), - ) as _i17.Future<_i5.Hashtag>); + ) as _i16.Future<_i5.Hashtag>); @override - _i17.Future> trend() => + _i16.Future> trend() => (super.noSuchMethod( Invocation.method( #trend, [], ), - returnValue: _i17.Future>.value( + returnValue: _i16.Future>.value( <_i5.HashtagsTrendResponse>[]), returnValueForMissingStub: - _i17.Future>.value( + _i16.Future>.value( <_i5.HashtagsTrendResponse>[]), - ) as _i17.Future>); + ) as _i16.Future>); @override - _i17.Future> users(_i5.HashtagsUsersRequest? request) => + _i16.Future> users( + _i5.HashtagsUsersRequest? request) => (super.noSuchMethod( Invocation.method( #users, [request], ), - returnValue: _i17.Future>.value(<_i5.User>[]), + returnValue: + _i16.Future>.value(<_i5.UserDetailed>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.User>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.UserDetailed>[]), + ) as _i16.Future>); } /// A class which mocks [MisskeyI]. @@ -4005,12 +4001,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( + _i16.Future<_i5.MeDetailed> i() => (super.noSuchMethod( Invocation.method( #i, [], ), - returnValue: _i17.Future<_i5.IResponse>.value(_FakeIResponse_43( + returnValue: _i16.Future<_i5.MeDetailed>.value(_FakeMeDetailed_43( this, Invocation.method( #i, @@ -4018,64 +4014,64 @@ class MockMisskeyI extends _i1.Mock implements _i5.MisskeyI { ), )), returnValueForMissingStub: - _i17.Future<_i5.IResponse>.value(_FakeIResponse_43( + _i16.Future<_i5.MeDetailed>.value(_FakeMeDetailed_43( this, Invocation.method( #i, [], ), )), - ) as _i17.Future<_i5.IResponse>); + ) as _i16.Future<_i5.MeDetailed>); @override - _i17.Future> notifications( + _i16.Future> notifications( _i5.INotificationsRequest? request) => (super.noSuchMethod( Invocation.method( #notifications, [request], ), - returnValue: _i17.Future>.value( + returnValue: _i16.Future>.value( <_i5.INotificationsResponse>[]), returnValueForMissingStub: - _i17.Future>.value( + _i16.Future>.value( <_i5.INotificationsResponse>[]), - ) as _i17.Future>); + ) as _i16.Future>); @override - _i17.Future readAnnouncement(_i5.IReadAnnouncementRequest? request) => + _i16.Future readAnnouncement(_i5.IReadAnnouncementRequest? request) => (super.noSuchMethod( Invocation.method( #readAnnouncement, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future> favorites( + _i16.Future> favorites( _i5.IFavoritesRequest? request) => (super.noSuchMethod( Invocation.method( #favorites, [request], ), - returnValue: _i17.Future>.value( + returnValue: _i16.Future>.value( <_i5.IFavoritesResponse>[]), returnValueForMissingStub: - _i17.Future>.value( + _i16.Future>.value( <_i5.IFavoritesResponse>[]), - ) as _i17.Future>); + ) as _i16.Future>); @override - _i17.Future<_i5.IResponse> update(_i5.IUpdateRequest? request) => + _i16.Future<_i5.MeDetailed> update(_i5.IUpdateRequest? request) => (super.noSuchMethod( Invocation.method( #update, [request], ), - returnValue: _i17.Future<_i5.IResponse>.value(_FakeIResponse_43( + returnValue: _i16.Future<_i5.MeDetailed>.value(_FakeMeDetailed_43( this, Invocation.method( #update, @@ -4083,14 +4079,14 @@ class MockMisskeyI extends _i1.Mock implements _i5.MisskeyI { ), )), returnValueForMissingStub: - _i17.Future<_i5.IResponse>.value(_FakeIResponse_43( + _i16.Future<_i5.MeDetailed>.value(_FakeMeDetailed_43( this, Invocation.method( #update, [request], ), )), - ) as _i17.Future<_i5.IResponse>); + ) as _i16.Future<_i5.MeDetailed>); } /// A class which mocks [MisskeyNotes]. @@ -4150,146 +4146,146 @@ class MockMisskeyNotes extends _i1.Mock implements _i5.MisskeyNotes { ) as _i5.MisskeyNotesThreadMuting); @override - _i17.Future create(_i5.NotesCreateRequest? request) => + _i16.Future create(_i5.NotesCreateRequest? request) => (super.noSuchMethod( Invocation.method( #create, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future update(_i5.NotesUpdateRequest? request) => + _i16.Future update(_i5.NotesUpdateRequest? request) => (super.noSuchMethod( Invocation.method( #update, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future delete(_i5.NotesDeleteRequest? request) => + _i16.Future delete(_i5.NotesDeleteRequest? request) => (super.noSuchMethod( Invocation.method( #delete, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future> notes(_i5.NotesRequest? request) => + _i16.Future> notes(_i5.NotesRequest? request) => (super.noSuchMethod( Invocation.method( #notes, [request], ), - returnValue: _i17.Future>.value(<_i5.Note>[]), + returnValue: _i16.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Note>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Note>[]), + ) as _i16.Future>); @override - _i17.Future<_i5.Note> show(_i5.NotesShowRequest? request) => + _i16.Future<_i5.Note> show(_i5.NotesShowRequest? request) => (super.noSuchMethod( Invocation.method( #show, [request], ), - returnValue: _i17.Future<_i5.Note>.value(_FakeNote_48( + returnValue: _i16.Future<_i5.Note>.value(_FakeNote_48( this, Invocation.method( #show, [request], ), )), - returnValueForMissingStub: _i17.Future<_i5.Note>.value(_FakeNote_48( + returnValueForMissingStub: _i16.Future<_i5.Note>.value(_FakeNote_48( this, Invocation.method( #show, [request], ), )), - ) as _i17.Future<_i5.Note>); + ) as _i16.Future<_i5.Note>); @override - _i17.Future> homeTimeline( + _i16.Future> homeTimeline( _i5.NotesTimelineRequest? request) => (super.noSuchMethod( Invocation.method( #homeTimeline, [request], ), - returnValue: _i17.Future>.value(<_i5.Note>[]), + returnValue: _i16.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Note>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Note>[]), + ) as _i16.Future>); @override - _i17.Future> localTimeline( + _i16.Future> localTimeline( _i5.NotesLocalTimelineRequest? request) => (super.noSuchMethod( Invocation.method( #localTimeline, [request], ), - returnValue: _i17.Future>.value(<_i5.Note>[]), + returnValue: _i16.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Note>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Note>[]), + ) as _i16.Future>); @override - _i17.Future> hybridTimeline( + _i16.Future> hybridTimeline( _i5.NotesHybridTimelineRequest? request) => (super.noSuchMethod( Invocation.method( #hybridTimeline, [request], ), - returnValue: _i17.Future>.value(<_i5.Note>[]), + returnValue: _i16.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Note>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Note>[]), + ) as _i16.Future>); @override - _i17.Future> globalTimeline( + _i16.Future> globalTimeline( _i5.NotesGlobalTimelineRequest? request) => (super.noSuchMethod( Invocation.method( #globalTimeline, [request], ), - returnValue: _i17.Future>.value(<_i5.Note>[]), + returnValue: _i16.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Note>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Note>[]), + ) as _i16.Future>); @override - _i17.Future> userListTimeline( + _i16.Future> userListTimeline( _i5.UserListTimelineRequest? request) => (super.noSuchMethod( Invocation.method( #userListTimeline, [request], ), - returnValue: _i17.Future>.value(<_i5.Note>[]), + returnValue: _i16.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Note>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Note>[]), + ) as _i16.Future>); @override - _i17.Future<_i5.NotesStateResponse> state(_i5.NotesStateRequest? request) => + _i16.Future<_i5.NotesStateResponse> state(_i5.NotesStateRequest? request) => (super.noSuchMethod( Invocation.method( #state, [request], ), - returnValue: _i17.Future<_i5.NotesStateResponse>.value( + returnValue: _i16.Future<_i5.NotesStateResponse>.value( _FakeNotesStateResponse_49( this, Invocation.method( @@ -4297,7 +4293,7 @@ class MockMisskeyNotes extends _i1.Mock implements _i5.MisskeyNotes { [request], ), )), - returnValueForMissingStub: _i17.Future<_i5.NotesStateResponse>.value( + returnValueForMissingStub: _i16.Future<_i5.NotesStateResponse>.value( _FakeNotesStateResponse_49( this, Invocation.method( @@ -4305,128 +4301,128 @@ class MockMisskeyNotes extends _i1.Mock implements _i5.MisskeyNotes { [request], ), )), - ) as _i17.Future<_i5.NotesStateResponse>); + ) as _i16.Future<_i5.NotesStateResponse>); @override - _i17.Future> search(_i5.NotesSearchRequest? request) => + _i16.Future> search(_i5.NotesSearchRequest? request) => (super.noSuchMethod( Invocation.method( #search, [request], ), - returnValue: _i17.Future>.value(<_i5.Note>[]), + returnValue: _i16.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Note>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Note>[]), + ) as _i16.Future>); @override - _i17.Future> searchByTag( + _i16.Future> searchByTag( _i5.NotesSearchByTagRequest? request) => (super.noSuchMethod( Invocation.method( #searchByTag, [request], ), - returnValue: _i17.Future>.value(<_i5.Note>[]), + returnValue: _i16.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Note>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Note>[]), + ) as _i16.Future>); @override - _i17.Future> renotes(_i5.NotesRenoteRequest? request) => + _i16.Future> renotes(_i5.NotesRenoteRequest? request) => (super.noSuchMethod( Invocation.method( #renotes, [request], ), - returnValue: _i17.Future>.value(<_i5.Note>[]), + returnValue: _i16.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Note>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Note>[]), + ) as _i16.Future>); @override - _i17.Future> replies(_i5.NotesRepliesRequest? request) => + _i16.Future> replies(_i5.NotesRepliesRequest? request) => (super.noSuchMethod( Invocation.method( #replies, [request], ), - returnValue: _i17.Future>.value(<_i5.Note>[]), + returnValue: _i16.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Note>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Note>[]), + ) as _i16.Future>); @override - _i17.Future> children(_i5.NotesChildrenRequest? request) => + _i16.Future> children(_i5.NotesChildrenRequest? request) => (super.noSuchMethod( Invocation.method( #children, [request], ), - returnValue: _i17.Future>.value(<_i5.Note>[]), + returnValue: _i16.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Note>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Note>[]), + ) as _i16.Future>); @override - _i17.Future> conversation( + _i16.Future> conversation( _i5.NotesConversationRequest? request) => (super.noSuchMethod( Invocation.method( #conversation, [request], ), - returnValue: _i17.Future>.value(<_i5.Note>[]), + returnValue: _i16.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Note>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Note>[]), + ) as _i16.Future>); @override - _i17.Future> featured(_i5.NotesFeaturedRequest? request) => + _i16.Future> featured(_i5.NotesFeaturedRequest? request) => (super.noSuchMethod( Invocation.method( #featured, [request], ), - returnValue: _i17.Future>.value(<_i5.Note>[]), + returnValue: _i16.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Note>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Note>[]), + ) as _i16.Future>); @override - _i17.Future> mentions(_i5.NotesMentionsRequest? request) => + _i16.Future> mentions(_i5.NotesMentionsRequest? request) => (super.noSuchMethod( Invocation.method( #mentions, [request], ), - returnValue: _i17.Future>.value(<_i5.Note>[]), + returnValue: _i16.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Note>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Note>[]), + ) as _i16.Future>); @override - _i17.Future> clips(_i5.NotesClipsRequest? request) => + _i16.Future> clips(_i5.NotesClipsRequest? request) => (super.noSuchMethod( Invocation.method( #clips, [request], ), - returnValue: _i17.Future>.value(<_i5.Clip>[]), + returnValue: _i16.Future>.value(<_i5.Clip>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Clip>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Clip>[]), + ) as _i16.Future>); @override - _i17.Future unrenote(_i5.NotesUnrenoteRequest? request) => + _i16.Future unrenote(_i5.NotesUnrenoteRequest? request) => (super.noSuchMethod( Invocation.method( #unrenote, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); } /// A class which mocks [MisskeyNotesFavorites]. @@ -4435,26 +4431,26 @@ class MockMisskeyNotes extends _i1.Mock implements _i5.MisskeyNotes { class MockMisskeyNotesFavorites extends _i1.Mock implements _i5.MisskeyNotesFavorites { @override - _i17.Future create(_i5.NotesFavoritesCreateRequest? request) => + _i16.Future create(_i5.NotesFavoritesCreateRequest? request) => (super.noSuchMethod( Invocation.method( #create, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future delete(_i5.NotesFavoritesDeleteRequest? request) => + _i16.Future delete(_i5.NotesFavoritesDeleteRequest? request) => (super.noSuchMethod( Invocation.method( #delete, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); } /// A class which mocks [MisskeyNotesReactions]. @@ -4463,41 +4459,41 @@ class MockMisskeyNotesFavorites extends _i1.Mock class MockMisskeyNotesReactions extends _i1.Mock implements _i5.MisskeyNotesReactions { @override - _i17.Future create(_i5.NotesReactionsCreateRequest? request) => + _i16.Future create(_i5.NotesReactionsCreateRequest? request) => (super.noSuchMethod( Invocation.method( #create, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future delete(_i5.NotesReactionsDeleteRequest? request) => + _i16.Future delete(_i5.NotesReactionsDeleteRequest? request) => (super.noSuchMethod( Invocation.method( #delete, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future> reactions( + _i16.Future> reactions( _i5.NotesReactionsRequest? request) => (super.noSuchMethod( Invocation.method( #reactions, [request], ), - returnValue: _i17.Future>.value( + returnValue: _i16.Future>.value( <_i5.NotesReactionsResponse>[]), returnValueForMissingStub: - _i17.Future>.value( + _i16.Future>.value( <_i5.NotesReactionsResponse>[]), - ) as _i17.Future>); + ) as _i16.Future>); } /// A class which mocks [MisskeyNotesPolls]. @@ -4505,28 +4501,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 vote(_i5.NotesPollsVoteRequest? request) => + _i16.Future vote(_i5.NotesPollsVoteRequest? request) => (super.noSuchMethod( Invocation.method( #vote, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future> recommendation( + _i16.Future> recommendation( _i5.NotesPollsRecommendationRequest? request) => (super.noSuchMethod( Invocation.method( #recommendation, [request], ), - returnValue: _i17.Future>.value(<_i5.Note>[]), + returnValue: _i16.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Note>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Note>[]), + ) as _i16.Future>); } /// A class which mocks [MisskeyRenoteMute]. @@ -4534,26 +4530,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 create(_i5.RenoteMuteCreateRequest? request) => + _i16.Future create(_i5.RenoteMuteCreateRequest? request) => (super.noSuchMethod( Invocation.method( #create, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future delete(_i5.RenoteMuteDeleteRequest? request) => + _i16.Future delete(_i5.RenoteMuteDeleteRequest? request) => (super.noSuchMethod( Invocation.method( #delete, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); } /// A class which mocks [MisskeyRoles]. @@ -4561,42 +4557,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> list() => (super.noSuchMethod( + _i16.Future> list() => (super.noSuchMethod( Invocation.method( #list, [], ), - returnValue: _i17.Future>.value( + returnValue: _i16.Future>.value( <_i5.RolesListResponse>[]), returnValueForMissingStub: - _i17.Future>.value( + _i16.Future>.value( <_i5.RolesListResponse>[]), - ) as _i17.Future>); + ) as _i16.Future>); @override - _i17.Future> users( + _i16.Future> users( _i5.RolesUsersRequest? request) => (super.noSuchMethod( Invocation.method( #users, [request], ), - returnValue: _i17.Future>.value( + returnValue: _i16.Future>.value( <_i5.RolesUsersResponse>[]), returnValueForMissingStub: - _i17.Future>.value( + _i16.Future>.value( <_i5.RolesUsersResponse>[]), - ) as _i17.Future>); + ) as _i16.Future>); @override - _i17.Future<_i5.RolesListResponse> show(_i5.RolesShowRequest? request) => + _i16.Future<_i5.RolesListResponse> show(_i5.RolesShowRequest? request) => (super.noSuchMethod( Invocation.method( #show, [request], ), returnValue: - _i17.Future<_i5.RolesListResponse>.value(_FakeRolesListResponse_50( + _i16.Future<_i5.RolesListResponse>.value(_FakeRolesListResponse_50( this, Invocation.method( #show, @@ -4604,26 +4600,26 @@ class MockMisskeyRoles extends _i1.Mock implements _i5.MisskeyRoles { ), )), returnValueForMissingStub: - _i17.Future<_i5.RolesListResponse>.value(_FakeRolesListResponse_50( + _i16.Future<_i5.RolesListResponse>.value(_FakeRolesListResponse_50( this, Invocation.method( #show, [request], ), )), - ) as _i17.Future<_i5.RolesListResponse>); + ) as _i16.Future<_i5.RolesListResponse>); @override - _i17.Future> notes(_i5.RolesNotesRequest? request) => + _i16.Future> notes(_i5.RolesNotesRequest? request) => (super.noSuchMethod( Invocation.method( #notes, [request], ), - returnValue: _i17.Future>.value(<_i5.Note>[]), + returnValue: _i16.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Note>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Note>[]), + ) as _i16.Future>); } /// A class which mocks [MisskeyUsers]. @@ -4644,14 +4640,13 @@ class MockMisskeyUsers extends _i1.Mock implements _i5.MisskeyUsers { ) as _i5.MisskeyUsersLists); @override - _i17.Future<_i5.UsersShowResponse> show(_i5.UsersShowRequest? request) => + _i16.Future<_i5.UserDetailed> show(_i5.UsersShowRequest? request) => (super.noSuchMethod( Invocation.method( #show, [request], ), - returnValue: - _i17.Future<_i5.UsersShowResponse>.value(_FakeUsersShowResponse_52( + returnValue: _i16.Future<_i5.UserDetailed>.value(_FakeUserDetailed_52( this, Invocation.method( #show, @@ -4659,40 +4654,38 @@ class MockMisskeyUsers extends _i1.Mock implements _i5.MisskeyUsers { ), )), returnValueForMissingStub: - _i17.Future<_i5.UsersShowResponse>.value(_FakeUsersShowResponse_52( + _i16.Future<_i5.UserDetailed>.value(_FakeUserDetailed_52( this, Invocation.method( #show, [request], ), )), - ) as _i17.Future<_i5.UsersShowResponse>); + ) as _i16.Future<_i5.UserDetailed>); @override - _i17.Future> showByIds( + _i16.Future> showByIds( _i5.UsersShowByIdsRequest? request) => (super.noSuchMethod( Invocation.method( #showByIds, [request], ), - returnValue: _i17.Future>.value( - <_i5.UsersShowResponse>[]), + returnValue: + _i16.Future>.value(<_i5.UserDetailed>[]), returnValueForMissingStub: - _i17.Future>.value( - <_i5.UsersShowResponse>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.UserDetailed>[]), + ) as _i16.Future>); @override - _i17.Future<_i5.UsersShowResponse> showByName( + _i16.Future<_i5.UserDetailed> showByName( _i5.UsersShowByUserNameRequest? request) => (super.noSuchMethod( Invocation.method( #showByName, [request], ), - returnValue: - _i17.Future<_i5.UsersShowResponse>.value(_FakeUsersShowResponse_52( + returnValue: _i16.Future<_i5.UserDetailed>.value(_FakeUserDetailed_52( this, Invocation.method( #showByName, @@ -4700,41 +4693,41 @@ class MockMisskeyUsers extends _i1.Mock implements _i5.MisskeyUsers { ), )), returnValueForMissingStub: - _i17.Future<_i5.UsersShowResponse>.value(_FakeUsersShowResponse_52( + _i16.Future<_i5.UserDetailed>.value(_FakeUserDetailed_52( this, Invocation.method( #showByName, [request], ), )), - ) as _i17.Future<_i5.UsersShowResponse>); + ) as _i16.Future<_i5.UserDetailed>); @override - _i17.Future> notes(_i5.UsersNotesRequest? request) => + _i16.Future> notes(_i5.UsersNotesRequest? request) => (super.noSuchMethod( Invocation.method( #notes, [request], ), - returnValue: _i17.Future>.value(<_i5.Note>[]), + returnValue: _i16.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Note>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Note>[]), + ) as _i16.Future>); @override - _i17.Future> clips(_i5.UsersClipsRequest? request) => + _i16.Future> clips(_i5.UsersClipsRequest? request) => (super.noSuchMethod( Invocation.method( #clips, [request], ), - returnValue: _i17.Future>.value(<_i5.Clip>[]), + returnValue: _i16.Future>.value(<_i5.Clip>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Clip>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Clip>[]), + ) as _i16.Future>); @override - _i17.Future> followers( + _i16.Future> followers( _i5.UsersFollowersRequest? request) => (super.noSuchMethod( Invocation.method( @@ -4742,13 +4735,13 @@ class MockMisskeyUsers extends _i1.Mock implements _i5.MisskeyUsers { [request], ), returnValue: - _i17.Future>.value(<_i5.Following>[]), + _i16.Future>.value(<_i5.Following>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Following>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Following>[]), + ) as _i16.Future>); @override - _i17.Future> following( + _i16.Future> following( _i5.UsersFollowingRequest? request) => (super.noSuchMethod( Invocation.method( @@ -4756,121 +4749,123 @@ class MockMisskeyUsers extends _i1.Mock implements _i5.MisskeyUsers { [request], ), returnValue: - _i17.Future>.value(<_i5.Following>[]), + _i16.Future>.value(<_i5.Following>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Following>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Following>[]), + ) as _i16.Future>); @override - _i17.Future reportAbuse(_i5.UsersReportAbuseRequest? request) => + _i16.Future reportAbuse(_i5.UsersReportAbuseRequest? request) => (super.noSuchMethod( Invocation.method( #reportAbuse, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future> reactions( + _i16.Future> reactions( _i5.UsersReactionsRequest? request) => (super.noSuchMethod( Invocation.method( #reactions, [request], ), - returnValue: _i17.Future>.value( + returnValue: _i16.Future>.value( <_i5.UsersReactionsResponse>[]), returnValueForMissingStub: - _i17.Future>.value( + _i16.Future>.value( <_i5.UsersReactionsResponse>[]), - ) as _i17.Future>); + ) as _i16.Future>); @override - _i17.Future> search(_i5.UsersSearchRequest? request) => + _i16.Future> search(_i5.UsersSearchRequest? request) => (super.noSuchMethod( Invocation.method( #search, [request], ), - returnValue: _i17.Future>.value(<_i5.User>[]), + returnValue: _i16.Future>.value(<_i5.User>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.User>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.User>[]), + ) as _i16.Future>); @override - _i17.Future> recommendation( + _i16.Future> recommendation( _i5.UsersRecommendationRequest? request) => (super.noSuchMethod( Invocation.method( #recommendation, [request], ), - returnValue: _i17.Future>.value(<_i5.User>[]), + returnValue: _i16.Future>.value(<_i5.User>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.User>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.User>[]), + ) as _i16.Future>); @override - _i17.Future> users(_i5.UsersUsersRequest? request) => + _i16.Future> users( + _i5.UsersUsersRequest? request) => (super.noSuchMethod( Invocation.method( #users, [request], ), - returnValue: _i17.Future>.value(<_i5.User>[]), + returnValue: + _i16.Future>.value(<_i5.UserDetailed>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.User>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.UserDetailed>[]), + ) as _i16.Future>); @override - _i17.Future updateMemo(_i5.UsersUpdateMemoRequest? request) => + _i16.Future updateMemo(_i5.UsersUpdateMemoRequest? request) => (super.noSuchMethod( Invocation.method( #updateMemo, [request], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future> flashs(_i5.UsersFlashsRequest? request) => + _i16.Future> flashs(_i5.UsersFlashsRequest? request) => (super.noSuchMethod( Invocation.method( #flashs, [request], ), - returnValue: _i17.Future>.value(<_i5.Flash>[]), + returnValue: _i16.Future>.value(<_i5.Flash>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Flash>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Flash>[]), + ) as _i16.Future>); @override - _i17.Future> featuredNotes( + _i16.Future> featuredNotes( _i5.UsersFeaturedNotesRequest? request) => (super.noSuchMethod( Invocation.method( #featuredNotes, [request], ), - returnValue: _i17.Future>.value(<_i5.Note>[]), + returnValue: _i16.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Note>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Note>[]), + ) as _i16.Future>); @override - _i17.Future> pages(_i5.UsersPagesRequest? request) => + _i16.Future> pages(_i5.UsersPagesRequest? request) => (super.noSuchMethod( Invocation.method( #pages, [request], ), - returnValue: _i17.Future>.value(<_i5.Page>[]), + returnValue: _i16.Future>.value(<_i5.Page>[]), returnValueForMissingStub: - _i17.Future>.value(<_i5.Page>[]), - ) as _i17.Future>); + _i16.Future>.value(<_i5.Page>[]), + ) as _i16.Future>); } /// A class which mocks [Dio]. @@ -4968,7 +4963,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ); @override - _i17.Future<_i10.Response> head( + _i16.Future<_i10.Response> head( String? path, { Object? data, Map? queryParameters, @@ -4986,7 +4981,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { #cancelToken: cancelToken, }, ), - returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( + returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #head, @@ -5000,7 +4995,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i17.Future<_i10.Response>.value(_FakeResponse_57( + _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #head, @@ -5013,10 +5008,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i17.Future<_i10.Response>); + ) as _i16.Future<_i10.Response>); @override - _i17.Future<_i10.Response> headUri( + _i16.Future<_i10.Response> headUri( Uri? uri, { Object? data, _i10.Options? options, @@ -5032,7 +5027,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { #cancelToken: cancelToken, }, ), - returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( + returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #headUri, @@ -5045,7 +5040,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i17.Future<_i10.Response>.value(_FakeResponse_57( + _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #headUri, @@ -5057,10 +5052,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i17.Future<_i10.Response>); + ) as _i16.Future<_i10.Response>); @override - _i17.Future<_i10.Response> get( + _i16.Future<_i10.Response> get( String? path, { Object? data, Map? queryParameters, @@ -5080,7 +5075,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { #onReceiveProgress: onReceiveProgress, }, ), - returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( + returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #get, @@ -5095,7 +5090,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i17.Future<_i10.Response>.value(_FakeResponse_57( + _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #get, @@ -5109,10 +5104,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i17.Future<_i10.Response>); + ) as _i16.Future<_i10.Response>); @override - _i17.Future<_i10.Response> getUri( + _i16.Future<_i10.Response> getUri( Uri? uri, { Object? data, _i10.Options? options, @@ -5130,7 +5125,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { #onReceiveProgress: onReceiveProgress, }, ), - returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( + returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #getUri, @@ -5144,7 +5139,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i17.Future<_i10.Response>.value(_FakeResponse_57( + _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #getUri, @@ -5157,10 +5152,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i17.Future<_i10.Response>); + ) as _i16.Future<_i10.Response>); @override - _i17.Future<_i10.Response> post( + _i16.Future<_i10.Response> post( String? path, { Object? data, Map? queryParameters, @@ -5182,7 +5177,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { #onReceiveProgress: onReceiveProgress, }, ), - returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( + returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #post, @@ -5198,7 +5193,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i17.Future<_i10.Response>.value(_FakeResponse_57( + _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #post, @@ -5213,10 +5208,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i17.Future<_i10.Response>); + ) as _i16.Future<_i10.Response>); @override - _i17.Future<_i10.Response> postUri( + _i16.Future<_i10.Response> postUri( Uri? uri, { Object? data, _i10.Options? options, @@ -5236,7 +5231,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { #onReceiveProgress: onReceiveProgress, }, ), - returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( + returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #postUri, @@ -5251,7 +5246,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i17.Future<_i10.Response>.value(_FakeResponse_57( + _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #postUri, @@ -5265,10 +5260,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i17.Future<_i10.Response>); + ) as _i16.Future<_i10.Response>); @override - _i17.Future<_i10.Response> put( + _i16.Future<_i10.Response> put( String? path, { Object? data, Map? queryParameters, @@ -5290,7 +5285,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { #onReceiveProgress: onReceiveProgress, }, ), - returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( + returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #put, @@ -5306,7 +5301,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i17.Future<_i10.Response>.value(_FakeResponse_57( + _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #put, @@ -5321,10 +5316,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i17.Future<_i10.Response>); + ) as _i16.Future<_i10.Response>); @override - _i17.Future<_i10.Response> putUri( + _i16.Future<_i10.Response> putUri( Uri? uri, { Object? data, _i10.Options? options, @@ -5344,7 +5339,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { #onReceiveProgress: onReceiveProgress, }, ), - returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( + returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #putUri, @@ -5359,7 +5354,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i17.Future<_i10.Response>.value(_FakeResponse_57( + _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #putUri, @@ -5373,10 +5368,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i17.Future<_i10.Response>); + ) as _i16.Future<_i10.Response>); @override - _i17.Future<_i10.Response> patch( + _i16.Future<_i10.Response> patch( String? path, { Object? data, Map? queryParameters, @@ -5398,7 +5393,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { #onReceiveProgress: onReceiveProgress, }, ), - returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( + returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #patch, @@ -5414,7 +5409,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i17.Future<_i10.Response>.value(_FakeResponse_57( + _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #patch, @@ -5429,10 +5424,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i17.Future<_i10.Response>); + ) as _i16.Future<_i10.Response>); @override - _i17.Future<_i10.Response> patchUri( + _i16.Future<_i10.Response> patchUri( Uri? uri, { Object? data, _i10.Options? options, @@ -5452,7 +5447,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { #onReceiveProgress: onReceiveProgress, }, ), - returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( + returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #patchUri, @@ -5467,7 +5462,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i17.Future<_i10.Response>.value(_FakeResponse_57( + _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #patchUri, @@ -5481,10 +5476,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i17.Future<_i10.Response>); + ) as _i16.Future<_i10.Response>); @override - _i17.Future<_i10.Response> delete( + _i16.Future<_i10.Response> delete( String? path, { Object? data, Map? queryParameters, @@ -5502,7 +5497,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { #cancelToken: cancelToken, }, ), - returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( + returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #delete, @@ -5516,7 +5511,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i17.Future<_i10.Response>.value(_FakeResponse_57( + _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #delete, @@ -5529,10 +5524,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i17.Future<_i10.Response>); + ) as _i16.Future<_i10.Response>); @override - _i17.Future<_i10.Response> deleteUri( + _i16.Future<_i10.Response> deleteUri( Uri? uri, { Object? data, _i10.Options? options, @@ -5548,7 +5543,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { #cancelToken: cancelToken, }, ), - returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( + returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #deleteUri, @@ -5561,7 +5556,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i17.Future<_i10.Response>.value(_FakeResponse_57( + _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #deleteUri, @@ -5573,10 +5568,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i17.Future<_i10.Response>); + ) as _i16.Future<_i10.Response>); @override - _i17.Future<_i10.Response> download( + _i16.Future<_i10.Response> download( String? urlPath, dynamic savePath, { _i10.ProgressCallback? onReceiveProgress, @@ -5605,7 +5600,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), returnValue: - _i17.Future<_i10.Response>.value(_FakeResponse_57( + _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #download, @@ -5625,7 +5620,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i17.Future<_i10.Response>.value(_FakeResponse_57( + _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #download, @@ -5644,10 +5639,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i17.Future<_i10.Response>); + ) as _i16.Future<_i10.Response>); @override - _i17.Future<_i10.Response> downloadUri( + _i16.Future<_i10.Response> downloadUri( Uri? uri, dynamic savePath, { _i10.ProgressCallback? onReceiveProgress, @@ -5674,7 +5669,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), returnValue: - _i17.Future<_i10.Response>.value(_FakeResponse_57( + _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #downloadUri, @@ -5693,7 +5688,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i17.Future<_i10.Response>.value(_FakeResponse_57( + _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #downloadUri, @@ -5711,10 +5706,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i17.Future<_i10.Response>); + ) as _i16.Future<_i10.Response>); @override - _i17.Future<_i10.Response> request( + _i16.Future<_i10.Response> request( String? url, { Object? data, Map? queryParameters, @@ -5736,7 +5731,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { #onReceiveProgress: onReceiveProgress, }, ), - returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( + returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #request, @@ -5752,7 +5747,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i17.Future<_i10.Response>.value(_FakeResponse_57( + _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #request, @@ -5767,10 +5762,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i17.Future<_i10.Response>); + ) as _i16.Future<_i10.Response>); @override - _i17.Future<_i10.Response> requestUri( + _i16.Future<_i10.Response> requestUri( Uri? uri, { Object? data, _i10.CancelToken? cancelToken, @@ -5790,7 +5785,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { #onReceiveProgress: onReceiveProgress, }, ), - returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( + returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #requestUri, @@ -5805,7 +5800,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i17.Future<_i10.Response>.value(_FakeResponse_57( + _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #requestUri, @@ -5819,16 +5814,16 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i17.Future<_i10.Response>); + ) as _i16.Future<_i10.Response>); @override - _i17.Future<_i10.Response> fetch(_i10.RequestOptions? requestOptions) => + _i16.Future<_i10.Response> fetch(_i10.RequestOptions? requestOptions) => (super.noSuchMethod( Invocation.method( #fetch, [requestOptions], ), - returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( + returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #fetch, @@ -5836,14 +5831,14 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i17.Future<_i10.Response>.value(_FakeResponse_57( + _i16.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #fetch, [requestOptions], ), )), - ) as _i17.Future<_i10.Response>); + ) as _i16.Future<_i10.Response>); } /// A class which mocks [HttpClient]. @@ -5917,7 +5912,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { @override set authenticate( - _i17.Future Function( + _i16.Future Function( Uri, String, String?, @@ -5932,7 +5927,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { @override set connectionFactory( - _i17.Future<_i11.ConnectionTask<_i11.Socket>> Function( + _i16.Future<_i11.ConnectionTask<_i11.Socket>> Function( Uri, String?, int?, @@ -5956,7 +5951,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { @override set authenticateProxy( - _i17.Future Function( + _i16.Future Function( String, int, String, @@ -5995,7 +5990,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ); @override - _i17.Future<_i11.HttpClientRequest> open( + _i16.Future<_i11.HttpClientRequest> open( String? method, String? host, int? port, @@ -6012,7 +6007,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), returnValue: - _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( + _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #open, @@ -6025,7 +6020,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ), )), returnValueForMissingStub: - _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( + _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #open, @@ -6037,10 +6032,10 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), )), - ) as _i17.Future<_i11.HttpClientRequest>); + ) as _i16.Future<_i11.HttpClientRequest>); @override - _i17.Future<_i11.HttpClientRequest> openUrl( + _i16.Future<_i11.HttpClientRequest> openUrl( String? method, Uri? url, ) => @@ -6053,7 +6048,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), returnValue: - _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( + _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #openUrl, @@ -6064,7 +6059,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ), )), returnValueForMissingStub: - _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( + _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #openUrl, @@ -6074,10 +6069,10 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), )), - ) as _i17.Future<_i11.HttpClientRequest>); + ) as _i16.Future<_i11.HttpClientRequest>); @override - _i17.Future<_i11.HttpClientRequest> get( + _i16.Future<_i11.HttpClientRequest> get( String? host, int? port, String? path, @@ -6092,7 +6087,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), returnValue: - _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( + _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #get, @@ -6104,7 +6099,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ), )), returnValueForMissingStub: - _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( + _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #get, @@ -6115,16 +6110,16 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), )), - ) as _i17.Future<_i11.HttpClientRequest>); + ) as _i16.Future<_i11.HttpClientRequest>); @override - _i17.Future<_i11.HttpClientRequest> getUrl(Uri? url) => (super.noSuchMethod( + _i16.Future<_i11.HttpClientRequest> getUrl(Uri? url) => (super.noSuchMethod( Invocation.method( #getUrl, [url], ), returnValue: - _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( + _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #getUrl, @@ -6132,17 +6127,17 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ), )), returnValueForMissingStub: - _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( + _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #getUrl, [url], ), )), - ) as _i17.Future<_i11.HttpClientRequest>); + ) as _i16.Future<_i11.HttpClientRequest>); @override - _i17.Future<_i11.HttpClientRequest> post( + _i16.Future<_i11.HttpClientRequest> post( String? host, int? port, String? path, @@ -6157,7 +6152,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), returnValue: - _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( + _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #post, @@ -6169,7 +6164,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ), )), returnValueForMissingStub: - _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( + _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #post, @@ -6180,16 +6175,16 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), )), - ) as _i17.Future<_i11.HttpClientRequest>); + ) as _i16.Future<_i11.HttpClientRequest>); @override - _i17.Future<_i11.HttpClientRequest> postUrl(Uri? url) => (super.noSuchMethod( + _i16.Future<_i11.HttpClientRequest> postUrl(Uri? url) => (super.noSuchMethod( Invocation.method( #postUrl, [url], ), returnValue: - _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( + _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #postUrl, @@ -6197,17 +6192,17 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ), )), returnValueForMissingStub: - _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( + _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #postUrl, [url], ), )), - ) as _i17.Future<_i11.HttpClientRequest>); + ) as _i16.Future<_i11.HttpClientRequest>); @override - _i17.Future<_i11.HttpClientRequest> put( + _i16.Future<_i11.HttpClientRequest> put( String? host, int? port, String? path, @@ -6222,7 +6217,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), returnValue: - _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( + _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #put, @@ -6234,7 +6229,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ), )), returnValueForMissingStub: - _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( + _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #put, @@ -6245,16 +6240,16 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), )), - ) as _i17.Future<_i11.HttpClientRequest>); + ) as _i16.Future<_i11.HttpClientRequest>); @override - _i17.Future<_i11.HttpClientRequest> putUrl(Uri? url) => (super.noSuchMethod( + _i16.Future<_i11.HttpClientRequest> putUrl(Uri? url) => (super.noSuchMethod( Invocation.method( #putUrl, [url], ), returnValue: - _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( + _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #putUrl, @@ -6262,17 +6257,17 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ), )), returnValueForMissingStub: - _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( + _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #putUrl, [url], ), )), - ) as _i17.Future<_i11.HttpClientRequest>); + ) as _i16.Future<_i11.HttpClientRequest>); @override - _i17.Future<_i11.HttpClientRequest> delete( + _i16.Future<_i11.HttpClientRequest> delete( String? host, int? port, String? path, @@ -6287,7 +6282,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), returnValue: - _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( + _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #delete, @@ -6299,7 +6294,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ), )), returnValueForMissingStub: - _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( + _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #delete, @@ -6310,17 +6305,17 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), )), - ) as _i17.Future<_i11.HttpClientRequest>); + ) as _i16.Future<_i11.HttpClientRequest>); @override - _i17.Future<_i11.HttpClientRequest> deleteUrl(Uri? url) => + _i16.Future<_i11.HttpClientRequest> deleteUrl(Uri? url) => (super.noSuchMethod( Invocation.method( #deleteUrl, [url], ), returnValue: - _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( + _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #deleteUrl, @@ -6328,17 +6323,17 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ), )), returnValueForMissingStub: - _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( + _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #deleteUrl, [url], ), )), - ) as _i17.Future<_i11.HttpClientRequest>); + ) as _i16.Future<_i11.HttpClientRequest>); @override - _i17.Future<_i11.HttpClientRequest> patch( + _i16.Future<_i11.HttpClientRequest> patch( String? host, int? port, String? path, @@ -6353,7 +6348,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), returnValue: - _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( + _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #patch, @@ -6365,7 +6360,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ), )), returnValueForMissingStub: - _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( + _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #patch, @@ -6376,16 +6371,16 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), )), - ) as _i17.Future<_i11.HttpClientRequest>); + ) as _i16.Future<_i11.HttpClientRequest>); @override - _i17.Future<_i11.HttpClientRequest> patchUrl(Uri? url) => (super.noSuchMethod( + _i16.Future<_i11.HttpClientRequest> patchUrl(Uri? url) => (super.noSuchMethod( Invocation.method( #patchUrl, [url], ), returnValue: - _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( + _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #patchUrl, @@ -6393,17 +6388,17 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ), )), returnValueForMissingStub: - _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( + _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #patchUrl, [url], ), )), - ) as _i17.Future<_i11.HttpClientRequest>); + ) as _i16.Future<_i11.HttpClientRequest>); @override - _i17.Future<_i11.HttpClientRequest> head( + _i16.Future<_i11.HttpClientRequest> head( String? host, int? port, String? path, @@ -6418,7 +6413,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), returnValue: - _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( + _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #head, @@ -6430,7 +6425,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ), )), returnValueForMissingStub: - _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( + _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #head, @@ -6441,16 +6436,16 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), )), - ) as _i17.Future<_i11.HttpClientRequest>); + ) as _i16.Future<_i11.HttpClientRequest>); @override - _i17.Future<_i11.HttpClientRequest> headUrl(Uri? url) => (super.noSuchMethod( + _i16.Future<_i11.HttpClientRequest> headUrl(Uri? url) => (super.noSuchMethod( Invocation.method( #headUrl, [url], ), returnValue: - _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( + _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #headUrl, @@ -6458,14 +6453,14 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ), )), returnValueForMissingStub: - _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( + _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #headUrl, [url], ), )), - ) as _i17.Future<_i11.HttpClientRequest>); + ) as _i16.Future<_i11.HttpClientRequest>); @override void addCredentials( @@ -6536,22 +6531,22 @@ class MockSocketController extends _i1.Mock implements _i5.SocketController { @override String get id => (super.noSuchMethod( Invocation.getter(#id), - returnValue: _i27.dummyValue( + returnValue: _i26.dummyValue( this, Invocation.getter(#id), ), - returnValueForMissingStub: _i27.dummyValue( + returnValueForMissingStub: _i26.dummyValue( this, Invocation.getter(#id), ), ) as String); @override - _i29.Channel get channel => (super.noSuchMethod( + _i28.Channel get channel => (super.noSuchMethod( Invocation.getter(#channel), - returnValue: _i29.Channel.homeTimeline, - returnValueForMissingStub: _i29.Channel.homeTimeline, - ) as _i29.Channel); + returnValue: _i28.Channel.homeTimeline, + returnValueForMissingStub: _i28.Channel.homeTimeline, + ) as _i28.Channel); @override bool get isDisconnected => (super.noSuchMethod( @@ -6569,19 +6564,6 @@ class MockSocketController extends _i1.Mock implements _i5.SocketController { returnValueForMissingStub: null, ); - @override - _i12.WebSocketChannel get webSocketChannel => (super.noSuchMethod( - Invocation.getter(#webSocketChannel), - returnValue: _FakeWebSocketChannel_60( - this, - Invocation.getter(#webSocketChannel), - ), - returnValueForMissingStub: _FakeWebSocketChannel_60( - this, - Invocation.getter(#webSocketChannel), - ), - ) as _i12.WebSocketChannel); - @override void connect() => super.noSuchMethod( Invocation.method( @@ -6610,27 +6592,27 @@ class MockSocketController extends _i1.Mock implements _i5.SocketController { ); @override - _i17.Future subNote(String? noteId) => (super.noSuchMethod( + _i16.Future subNote(String? noteId) => (super.noSuchMethod( Invocation.method( #subNote, [noteId], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future unsubNote(String? noteId) => (super.noSuchMethod( + _i16.Future unsubNote(String? noteId) => (super.noSuchMethod( Invocation.method( #unsubNote, [noteId], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future requestLog({ + _i16.Future requestLog({ String? id, int? length, }) => @@ -6643,14 +6625,14 @@ class MockSocketController extends _i1.Mock implements _i5.SocketController { #length: length, }, ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future send( + _i16.Future send( _i5.StreamingRequestType? requestType, - _i30.StreamingRequestBody? body, + _i29.StreamingRequestBody? body, ) => (super.noSuchMethod( Invocation.method( @@ -6660,9 +6642,9 @@ class MockSocketController extends _i1.Mock implements _i5.SocketController { body, ], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); } /// A class which mocks [StreamingService]. @@ -6672,34 +6654,34 @@ class MockStreamingService extends _i1.Mock implements _i5.StreamingService { @override String get host => (super.noSuchMethod( Invocation.getter(#host), - returnValue: _i27.dummyValue( + returnValue: _i26.dummyValue( this, Invocation.getter(#host), ), - returnValueForMissingStub: _i27.dummyValue( + returnValueForMissingStub: _i26.dummyValue( this, Invocation.getter(#host), ), ) as String); @override - _i31.HashMap get streamingChannelControllers => + _i30.HashMap get streamingChannelControllers => (super.noSuchMethod( Invocation.getter(#streamingChannelControllers), returnValue: - _i27.dummyValue<_i31.HashMap>( + _i26.dummyValue<_i30.HashMap>( this, Invocation.getter(#streamingChannelControllers), ), returnValueForMissingStub: - _i27.dummyValue<_i31.HashMap>( + _i26.dummyValue<_i30.HashMap>( this, Invocation.getter(#streamingChannelControllers), ), - ) as _i31.HashMap); + ) as _i30.HashMap); @override - set subscription(_i17.StreamSubscription? _subscription) => + set subscription(_i16.StreamSubscription? _subscription) => super.noSuchMethod( Invocation.setter( #subscription, @@ -6709,22 +6691,9 @@ class MockStreamingService extends _i1.Mock implements _i5.StreamingService { ); @override - _i12.WebSocketChannel get webSocketChannel => (super.noSuchMethod( - Invocation.getter(#webSocketChannel), - returnValue: _FakeWebSocketChannel_60( - this, - Invocation.getter(#webSocketChannel), - ), - returnValueForMissingStub: _FakeWebSocketChannel_60( - this, - Invocation.getter(#webSocketChannel), - ), - ) as _i12.WebSocketChannel); - - @override - _i17.Future onChannelEventReceived( + _i16.Future onChannelEventReceived( String? id, - _i32.ChannelEventType? type, + _i31.ChannelEventType? type, dynamic body, ) => (super.noSuchMethod( @@ -6736,14 +6705,14 @@ class MockStreamingService extends _i1.Mock implements _i5.StreamingService { body, ], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future onNoteUpdatedEventReceived( + _i16.Future onNoteUpdatedEventReceived( String? id, - _i33.NoteUpdatedEventType? type, + _i32.NoteUpdatedEventType? type, Map? body, ) => (super.noSuchMethod( @@ -6755,13 +6724,13 @@ class MockStreamingService extends _i1.Mock implements _i5.StreamingService { body, ], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future onBroadcastEventReceived( - _i34.BroadcastEventType? type, + _i16.Future onBroadcastEventReceived( + _i33.BroadcastEventType? type, Map? body, ) => (super.noSuchMethod( @@ -6772,35 +6741,35 @@ class MockStreamingService extends _i1.Mock implements _i5.StreamingService { body, ], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future startStreaming() => (super.noSuchMethod( + _i16.Future startStreaming() => (super.noSuchMethod( Invocation.method( #startStreaming, [], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override _i5.SocketController connect({ String? id, - required _i29.Channel? channel, - _i17.Future Function( - _i32.ChannelEventType, + required _i28.Channel? channel, + _i16.Future Function( + _i31.ChannelEventType, dynamic, )? onChannelEventReceived, - _i17.Future Function( + _i16.Future Function( String, - _i33.NoteUpdatedEventType, + _i32.NoteUpdatedEventType, Map, )? onNoteUpdatedEventReceived, - _i17.Future Function( - _i34.BroadcastEventType, + _i16.Future Function( + _i33.BroadcastEventType, Map, )? onBroadcastEventReceived, Map? parameters, @@ -6851,38 +6820,38 @@ class MockStreamingService extends _i1.Mock implements _i5.StreamingService { ) as _i5.SocketController); @override - _i17.Future close() => (super.noSuchMethod( + _i16.Future close() => (super.noSuchMethod( Invocation.method( #close, [], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future restart() => (super.noSuchMethod( + _i16.Future restart() => (super.noSuchMethod( Invocation.method( #restart, [], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); } /// A class which mocks [FakeFilePickerPlatform]. /// /// See the documentation for Mockito's code generation for more information. class MockFilePickerPlatform extends _i1.Mock - implements _i35.FakeFilePickerPlatform { + implements _i34.FakeFilePickerPlatform { @override - _i17.Future<_i36.FilePickerResult?> pickFiles({ + _i16.Future<_i35.FilePickerResult?> pickFiles({ String? dialogTitle, String? initialDirectory, - _i36.FileType? type = _i36.FileType.any, + _i35.FileType? type = _i35.FileType.any, List? allowedExtensions, - dynamic Function(_i36.FilePickerStatus)? onFileLoading, + dynamic Function(_i35.FilePickerStatus)? onFileLoading, bool? allowCompression = true, bool? allowMultiple = false, bool? withData = false, @@ -6906,22 +6875,22 @@ class MockFilePickerPlatform extends _i1.Mock #lockParentWindow: lockParentWindow, }, ), - returnValue: _i17.Future<_i36.FilePickerResult?>.value(), - returnValueForMissingStub: _i17.Future<_i36.FilePickerResult?>.value(), - ) as _i17.Future<_i36.FilePickerResult?>); + returnValue: _i16.Future<_i35.FilePickerResult?>.value(), + returnValueForMissingStub: _i16.Future<_i35.FilePickerResult?>.value(), + ) as _i16.Future<_i35.FilePickerResult?>); @override - _i17.Future clearTemporaryFiles() => (super.noSuchMethod( + _i16.Future clearTemporaryFiles() => (super.noSuchMethod( Invocation.method( #clearTemporaryFiles, [], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future getDirectoryPath({ + _i16.Future getDirectoryPath({ String? dialogTitle, bool? lockParentWindow = false, String? initialDirectory, @@ -6936,16 +6905,16 @@ class MockFilePickerPlatform extends _i1.Mock #initialDirectory: initialDirectory, }, ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future saveFile({ + _i16.Future saveFile({ String? dialogTitle, String? fileName, String? initialDirectory, - _i36.FileType? type = _i36.FileType.any, + _i35.FileType? type = _i35.FileType.any, List? allowedExtensions, bool? lockParentWindow = false, }) => @@ -6962,18 +6931,18 @@ class MockFilePickerPlatform extends _i1.Mock #lockParentWindow: lockParentWindow, }, ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); } /// A class which mocks [$MockBaseCacheManager]. /// /// See the documentation for Mockito's code generation for more information. class MockBaseCacheManager extends _i1.Mock - implements _i35.$MockBaseCacheManager { + implements _i34.$MockBaseCacheManager { @override - _i17.Future<_i13.File> getSingleFile( + _i16.Future<_i12.File> getSingleFile( String? url, { String? key, Map? headers, @@ -6987,7 +6956,7 @@ class MockBaseCacheManager extends _i1.Mock #headers: headers, }, ), - returnValue: _i17.Future<_i13.File>.value(_FakeFile_61( + returnValue: _i16.Future<_i12.File>.value(_FakeFile_60( this, Invocation.method( #getSingleFile, @@ -6998,7 +6967,7 @@ class MockBaseCacheManager extends _i1.Mock }, ), )), - returnValueForMissingStub: _i17.Future<_i13.File>.value(_FakeFile_61( + returnValueForMissingStub: _i16.Future<_i12.File>.value(_FakeFile_60( this, Invocation.method( #getSingleFile, @@ -7009,10 +6978,10 @@ class MockBaseCacheManager extends _i1.Mock }, ), )), - ) as _i17.Future<_i13.File>); + ) as _i16.Future<_i12.File>); @override - _i17.Stream<_i14.FileInfo> getFile( + _i16.Stream<_i13.FileInfo> getFile( String? url, { String? key, Map? headers, @@ -7026,12 +6995,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: _i16.Stream<_i13.FileInfo>.empty(), + returnValueForMissingStub: _i16.Stream<_i13.FileInfo>.empty(), + ) as _i16.Stream<_i13.FileInfo>); @override - _i17.Stream<_i14.FileResponse> getFileStream( + _i16.Stream<_i13.FileResponse> getFileStream( String? url, { String? key, Map? headers, @@ -7047,12 +7016,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: _i16.Stream<_i13.FileResponse>.empty(), + returnValueForMissingStub: _i16.Stream<_i13.FileResponse>.empty(), + ) as _i16.Stream<_i13.FileResponse>); @override - _i17.Future<_i14.FileInfo> downloadFile( + _i16.Future<_i13.FileInfo> downloadFile( String? url, { String? key, Map? authHeaders, @@ -7068,7 +7037,7 @@ class MockBaseCacheManager extends _i1.Mock #force: force, }, ), - returnValue: _i17.Future<_i14.FileInfo>.value(_FakeFileInfo_62( + returnValue: _i16.Future<_i13.FileInfo>.value(_FakeFileInfo_61( this, Invocation.method( #downloadFile, @@ -7081,7 +7050,7 @@ class MockBaseCacheManager extends _i1.Mock ), )), returnValueForMissingStub: - _i17.Future<_i14.FileInfo>.value(_FakeFileInfo_62( + _i16.Future<_i13.FileInfo>.value(_FakeFileInfo_61( this, Invocation.method( #downloadFile, @@ -7093,10 +7062,10 @@ class MockBaseCacheManager extends _i1.Mock }, ), )), - ) as _i17.Future<_i14.FileInfo>); + ) as _i16.Future<_i13.FileInfo>); @override - _i17.Future<_i14.FileInfo?> getFileFromCache( + _i16.Future<_i13.FileInfo?> getFileFromCache( String? key, { bool? ignoreMemCache = false, }) => @@ -7106,25 +7075,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: _i16.Future<_i13.FileInfo?>.value(), + returnValueForMissingStub: _i16.Future<_i13.FileInfo?>.value(), + ) as _i16.Future<_i13.FileInfo?>); @override - _i17.Future<_i14.FileInfo?> getFileFromMemory(String? key) => + _i16.Future<_i13.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: _i16.Future<_i13.FileInfo?>.value(), + returnValueForMissingStub: _i16.Future<_i13.FileInfo?>.value(), + ) as _i16.Future<_i13.FileInfo?>); @override - _i17.Future<_i13.File> putFile( + _i16.Future<_i12.File> putFile( String? url, - _i28.Uint8List? fileBytes, { + _i27.Uint8List? fileBytes, { String? key, String? eTag, Duration? maxAge = const Duration(days: 30), @@ -7144,7 +7113,7 @@ class MockBaseCacheManager extends _i1.Mock #fileExtension: fileExtension, }, ), - returnValue: _i17.Future<_i13.File>.value(_FakeFile_61( + returnValue: _i16.Future<_i12.File>.value(_FakeFile_60( this, Invocation.method( #putFile, @@ -7160,7 +7129,7 @@ class MockBaseCacheManager extends _i1.Mock }, ), )), - returnValueForMissingStub: _i17.Future<_i13.File>.value(_FakeFile_61( + returnValueForMissingStub: _i16.Future<_i12.File>.value(_FakeFile_60( this, Invocation.method( #putFile, @@ -7176,12 +7145,12 @@ class MockBaseCacheManager extends _i1.Mock }, ), )), - ) as _i17.Future<_i13.File>); + ) as _i16.Future<_i12.File>); @override - _i17.Future<_i13.File> putFileStream( + _i16.Future<_i12.File> putFileStream( String? url, - _i17.Stream>? source, { + _i16.Stream>? source, { String? key, String? eTag, Duration? maxAge = const Duration(days: 30), @@ -7201,7 +7170,7 @@ class MockBaseCacheManager extends _i1.Mock #fileExtension: fileExtension, }, ), - returnValue: _i17.Future<_i13.File>.value(_FakeFile_61( + returnValue: _i16.Future<_i12.File>.value(_FakeFile_60( this, Invocation.method( #putFileStream, @@ -7217,7 +7186,7 @@ class MockBaseCacheManager extends _i1.Mock }, ), )), - returnValueForMissingStub: _i17.Future<_i13.File>.value(_FakeFile_61( + returnValueForMissingStub: _i16.Future<_i12.File>.value(_FakeFile_60( this, Invocation.method( #putFileStream, @@ -7233,56 +7202,56 @@ class MockBaseCacheManager extends _i1.Mock }, ), )), - ) as _i17.Future<_i13.File>); + ) as _i16.Future<_i12.File>); @override - _i17.Future removeFile(String? key) => (super.noSuchMethod( + _i16.Future removeFile(String? key) => (super.noSuchMethod( Invocation.method( #removeFile, [key], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future emptyCache() => (super.noSuchMethod( + _i16.Future emptyCache() => (super.noSuchMethod( Invocation.method( #emptyCache, [], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future dispose() => (super.noSuchMethod( + _i16.Future dispose() => (super.noSuchMethod( Invocation.method( #dispose, [], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); } /// A class which mocks [$MockUrlLauncherPlatform]. /// /// See the documentation for Mockito's code generation for more information. class MockUrlLauncherPlatform extends _i1.Mock - implements _i35.$MockUrlLauncherPlatform { + implements _i34.$MockUrlLauncherPlatform { @override - _i17.Future canLaunch(String? url) => (super.noSuchMethod( + _i16.Future canLaunch(String? url) => (super.noSuchMethod( Invocation.method( #canLaunch, [url], ), - returnValue: _i17.Future.value(false), - returnValueForMissingStub: _i17.Future.value(false), - ) as _i17.Future); + returnValue: _i16.Future.value(false), + returnValueForMissingStub: _i16.Future.value(false), + ) as _i16.Future); @override - _i17.Future launch( + _i16.Future launch( String? url, { required bool? useSafariVC, required bool? useWebView, @@ -7306,14 +7275,14 @@ class MockUrlLauncherPlatform extends _i1.Mock #webOnlyWindowName: webOnlyWindowName, }, ), - returnValue: _i17.Future.value(false), - returnValueForMissingStub: _i17.Future.value(false), - ) as _i17.Future); + returnValue: _i16.Future.value(false), + returnValueForMissingStub: _i16.Future.value(false), + ) as _i16.Future); @override - _i17.Future launchUrl( + _i16.Future launchUrl( String? url, - _i37.LaunchOptions? options, + _i36.LaunchOptions? options, ) => (super.noSuchMethod( Invocation.method( @@ -7323,39 +7292,39 @@ class MockUrlLauncherPlatform extends _i1.Mock options, ], ), - returnValue: _i17.Future.value(false), - returnValueForMissingStub: _i17.Future.value(false), - ) as _i17.Future); + returnValue: _i16.Future.value(false), + returnValueForMissingStub: _i16.Future.value(false), + ) as _i16.Future); @override - _i17.Future closeWebView() => (super.noSuchMethod( + _i16.Future closeWebView() => (super.noSuchMethod( Invocation.method( #closeWebView, [], ), - returnValue: _i17.Future.value(), - returnValueForMissingStub: _i17.Future.value(), - ) as _i17.Future); + returnValue: _i16.Future.value(), + returnValueForMissingStub: _i16.Future.value(), + ) as _i16.Future); @override - _i17.Future supportsMode(_i37.PreferredLaunchMode? mode) => + _i16.Future supportsMode(_i36.PreferredLaunchMode? mode) => (super.noSuchMethod( Invocation.method( #supportsMode, [mode], ), - returnValue: _i17.Future.value(false), - returnValueForMissingStub: _i17.Future.value(false), - ) as _i17.Future); + returnValue: _i16.Future.value(false), + returnValueForMissingStub: _i16.Future.value(false), + ) as _i16.Future); @override - _i17.Future supportsCloseForMode(_i37.PreferredLaunchMode? mode) => + _i16.Future supportsCloseForMode(_i36.PreferredLaunchMode? mode) => (super.noSuchMethod( Invocation.method( #supportsCloseForMode, [mode], ), - returnValue: _i17.Future.value(false), - returnValueForMissingStub: _i17.Future.value(false), - ) as _i17.Future); + returnValue: _i16.Future.value(false), + returnValueForMissingStub: _i16.Future.value(false), + ) as _i16.Future); } diff --git a/test/test_util/test_datas.dart b/test/test_util/test_datas.dart index c53826662..30fb45a87 100644 --- a/test/test_util/test_datas.dart +++ b/test/test_util/test_datas.dart @@ -11,7 +11,7 @@ class TestData { Account(host: "example.miria.shiosyakeyakini.info", userId: "ai", i: i1); // i - static IResponse i1 = IResponse.fromJson(JSON5.parse(r""" + static MeDetailed i1 = MeDetailed.fromJson(JSON5.parse(r""" { id: '7rkr3b1c1c', name: '藍', @@ -376,8 +376,8 @@ class TestData { files: [], replyId: null, renoteId: null, -} - +} + ''')); static Note note2 = Note.fromJson(JSON5.parse(r''' @@ -415,7 +415,7 @@ class TestData { files: [], replyId: null, renoteId: null, -} +} ''')); /// 自身でないノート１ @@ -460,7 +460,7 @@ class TestData { files: [], replyId: null, renoteId: null, -} +} ''')); /// 自身のノート（投票込みのノート） @@ -641,7 +641,7 @@ class TestData { replyId: null, renoteId: null, myReaction: ':ultra_igyo@.:', -} +} ''')); /// Renote @@ -776,7 +776,7 @@ class TestData { folder: null, userId: null, user: null, - } + } ''')); static DriveFile drive2AsVideo = DriveFile.fromJson(JSON5.parse(r''' @@ -809,7 +809,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: '藍', @@ -825,7 +825,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', @@ -994,7 +995,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', @@ -1106,8 +1108,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: '藍', @@ -1214,12 +1216,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', @@ -1388,12 +1390,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: 'あけおめらんか～', @@ -1473,8 +1475,8 @@ class TestData { } ''')); - static UsersShowResponse usersShowResponse3AsLocalUser = - UsersShowResponse.fromJson(JSON5.parse(''' + static UserDetailedNotMeWithRelations usersShowResponse3AsLocalUser = + UserDetailedNotMeWithRelations.fromJson(JSON5.parse(''' { id: '9i07ia9bf0', name: 'あけおめらんか～', @@ -1673,7 +1675,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 179efe071..ab2fe8d5c 100644 --- a/test/view/user_page/user_page_test.dart +++ b/test/view/user_page/user_page_test.dart @@ -136,11 +136,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: [ @@ -161,13 +162,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: [ @@ -517,7 +519,6 @@ void main() { followeeId: TestData.usersShowResponse2.id, followerId: TestData.account.i.id, followee: TestData.detailedUser2, - follower: TestData.user1, ) ]); @@ -555,7 +556,6 @@ void main() { createdAt: DateTime.now(), followeeId: TestData.account.i.id, followerId: TestData.usersShowResponse2.id, - followee: TestData.user1, follower: TestData.detailedUser2, ) ]);