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/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 50d821a43..5feca9b86 100644 --- a/test/test_util/mock.mocks.dart +++ b/test/test_util/mock.mocks.dart @@ -3,45 +3,46 @@ // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes -import 'dart:async' as _i16; -import 'dart:collection' as _i29; +import 'dart:async' as _i17; +import 'dart:collection' as _i30; import 'dart:io' as _i11; -import 'dart:typed_data' as _i26; -import 'dart:ui' as _i19; +import 'dart:typed_data' as _i27; +import 'dart:ui' as _i20; import 'package:dio/dio.dart' as _i10; -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: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:flutter_riverpod/flutter_riverpod.dart' as _i4; -import 'package:miria/model/account.dart' as _i17; +import 'package:miria/model/account.dart' as _i18; import 'package:miria/model/account_settings.dart' as _i2; -import 'package:miria/model/acct.dart' as _i18; +import 'package:miria/model/acct.dart' as _i19; import 'package:miria/model/general_settings.dart' as _i3; -import 'package:miria/model/misskey_emoji_data.dart' as _i22; -import 'package:miria/model/tab_setting.dart' as _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: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: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 _i28; -import 'package:misskey_dart/src/enums/broadcast_event_type.dart' as _i33; -import 'package:misskey_dart/src/enums/channel.dart' as _i27; -import 'package:misskey_dart/src/enums/channel_event_type.dart' as _i31; -import 'package:misskey_dart/src/enums/note_updated_event_type.dart' as _i32; +import 'package:misskey_dart/src/data/streaming/streaming_request.dart' as _i29; +import 'package:misskey_dart/src/enums/broadcast_event_type.dart' as _i34; +import 'package:misskey_dart/src/enums/channel.dart' as _i28; +import 'package:misskey_dart/src/enums/channel_event_type.dart' as _i32; +import 'package:misskey_dart/src/enums/note_updated_event_type.dart' as _i33; import 'package:misskey_dart/src/misskey_flash.dart' as _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 _i30; +import 'package:mockito/src/dummies.dart' as _i31; import 'package:url_launcher_platform_interface/url_launcher_platform_interface.dart' - as _i36; + as _i37; +import 'package:web_socket_channel/web_socket_channel.dart' as _i12; -import 'mock.dart' as _i34; +import 'mock.dart' as _i35; // ignore_for_file: type=lint // ignore_for_file: avoid_redundant_argument_values @@ -443,8 +444,8 @@ class _FakeMisskeyDriveFolders_36 extends _i1.SmartFake ); } -class _FakeDriveFile_37 extends _i1.SmartFake implements _i5.DriveFile { - _FakeDriveFile_37( +class _FakeDriveFolder_37 extends _i1.SmartFake implements _i5.DriveFolder { + _FakeDriveFolder_37( Object parent, Invocation parentInvocation, ) : super( @@ -453,9 +454,19 @@ class _FakeDriveFile_37 extends _i1.SmartFake implements _i5.DriveFile { ); } -class _FakeFederationShowInstanceResponse_38 extends _i1.SmartFake +class _FakeDriveFile_38 extends _i1.SmartFake implements _i5.DriveFile { + _FakeDriveFile_38( + Object parent, + Invocation parentInvocation, + ) : super( + parent, + parentInvocation, + ); +} + +class _FakeFederationShowInstanceResponse_39 extends _i1.SmartFake implements _i5.FederationShowInstanceResponse { - _FakeFederationShowInstanceResponse_38( + _FakeFederationShowInstanceResponse_39( Object parent, Invocation parentInvocation, ) : super( @@ -464,9 +475,9 @@ class _FakeFederationShowInstanceResponse_38 extends _i1.SmartFake ); } -class _FakeMisskeyFollowingRequests_39 extends _i1.SmartFake +class _FakeMisskeyFollowingRequests_40 extends _i1.SmartFake implements _i5.MisskeyFollowingRequests { - _FakeMisskeyFollowingRequests_39( + _FakeMisskeyFollowingRequests_40( Object parent, Invocation parentInvocation, ) : super( @@ -475,8 +486,8 @@ class _FakeMisskeyFollowingRequests_39 extends _i1.SmartFake ); } -class _FakeUser_40 extends _i1.SmartFake implements _i5.User { - _FakeUser_40( +class _FakeUserLite_41 extends _i1.SmartFake implements _i5.UserLite { + _FakeUserLite_41( Object parent, Invocation parentInvocation, ) : super( @@ -485,8 +496,8 @@ class _FakeUser_40 extends _i1.SmartFake implements _i5.User { ); } -class _FakeHashtag_41 extends _i1.SmartFake implements _i5.Hashtag { - _FakeHashtag_41( +class _FakeHashtag_42 extends _i1.SmartFake implements _i5.Hashtag { + _FakeHashtag_42( Object parent, Invocation parentInvocation, ) : super( @@ -495,8 +506,8 @@ class _FakeHashtag_41 extends _i1.SmartFake implements _i5.Hashtag { ); } -class _FakeIResponse_42 extends _i1.SmartFake implements _i5.IResponse { - _FakeIResponse_42( +class _FakeMeDetailed_43 extends _i1.SmartFake implements _i5.MeDetailed { + _FakeMeDetailed_43( Object parent, Invocation parentInvocation, ) : super( @@ -505,9 +516,9 @@ class _FakeIResponse_42 extends _i1.SmartFake implements _i5.IResponse { ); } -class _FakeMisskeyNotesReactions_43 extends _i1.SmartFake +class _FakeMisskeyNotesReactions_44 extends _i1.SmartFake implements _i5.MisskeyNotesReactions { - _FakeMisskeyNotesReactions_43( + _FakeMisskeyNotesReactions_44( Object parent, Invocation parentInvocation, ) : super( @@ -516,9 +527,9 @@ class _FakeMisskeyNotesReactions_43 extends _i1.SmartFake ); } -class _FakeMisskeyNotesFavorites_44 extends _i1.SmartFake +class _FakeMisskeyNotesFavorites_45 extends _i1.SmartFake implements _i5.MisskeyNotesFavorites { - _FakeMisskeyNotesFavorites_44( + _FakeMisskeyNotesFavorites_45( Object parent, Invocation parentInvocation, ) : super( @@ -527,9 +538,9 @@ class _FakeMisskeyNotesFavorites_44 extends _i1.SmartFake ); } -class _FakeMisskeyNotesPolls_45 extends _i1.SmartFake +class _FakeMisskeyNotesPolls_46 extends _i1.SmartFake implements _i5.MisskeyNotesPolls { - _FakeMisskeyNotesPolls_45( + _FakeMisskeyNotesPolls_46( Object parent, Invocation parentInvocation, ) : super( @@ -538,9 +549,9 @@ class _FakeMisskeyNotesPolls_45 extends _i1.SmartFake ); } -class _FakeMisskeyNotesThreadMuting_46 extends _i1.SmartFake +class _FakeMisskeyNotesThreadMuting_47 extends _i1.SmartFake implements _i5.MisskeyNotesThreadMuting { - _FakeMisskeyNotesThreadMuting_46( + _FakeMisskeyNotesThreadMuting_47( Object parent, Invocation parentInvocation, ) : super( @@ -549,8 +560,8 @@ class _FakeMisskeyNotesThreadMuting_46 extends _i1.SmartFake ); } -class _FakeNote_47 extends _i1.SmartFake implements _i5.Note { - _FakeNote_47( +class _FakeNote_48 extends _i1.SmartFake implements _i5.Note { + _FakeNote_48( Object parent, Invocation parentInvocation, ) : super( @@ -559,9 +570,9 @@ class _FakeNote_47 extends _i1.SmartFake implements _i5.Note { ); } -class _FakeNotesStateResponse_48 extends _i1.SmartFake +class _FakeNotesStateResponse_49 extends _i1.SmartFake implements _i5.NotesStateResponse { - _FakeNotesStateResponse_48( + _FakeNotesStateResponse_49( Object parent, Invocation parentInvocation, ) : super( @@ -570,9 +581,9 @@ class _FakeNotesStateResponse_48 extends _i1.SmartFake ); } -class _FakeRolesListResponse_49 extends _i1.SmartFake +class _FakeRolesListResponse_50 extends _i1.SmartFake implements _i5.RolesListResponse { - _FakeRolesListResponse_49( + _FakeRolesListResponse_50( Object parent, Invocation parentInvocation, ) : super( @@ -581,9 +592,9 @@ class _FakeRolesListResponse_49 extends _i1.SmartFake ); } -class _FakeMisskeyUsersLists_50 extends _i1.SmartFake +class _FakeMisskeyUsersLists_51 extends _i1.SmartFake implements _i5.MisskeyUsersLists { - _FakeMisskeyUsersLists_50( + _FakeMisskeyUsersLists_51( Object parent, Invocation parentInvocation, ) : super( @@ -592,9 +603,8 @@ class _FakeMisskeyUsersLists_50 extends _i1.SmartFake ); } -class _FakeUsersShowResponse_51 extends _i1.SmartFake - implements _i5.UsersShowResponse { - _FakeUsersShowResponse_51( +class _FakeUserDetailed_52 extends _i1.SmartFake implements _i5.UserDetailed { + _FakeUserDetailed_52( Object parent, Invocation parentInvocation, ) : super( @@ -603,8 +613,8 @@ class _FakeUsersShowResponse_51 extends _i1.SmartFake ); } -class _FakeBaseOptions_52 extends _i1.SmartFake implements _i10.BaseOptions { - _FakeBaseOptions_52( +class _FakeBaseOptions_53 extends _i1.SmartFake implements _i10.BaseOptions { + _FakeBaseOptions_53( Object parent, Invocation parentInvocation, ) : super( @@ -613,9 +623,9 @@ class _FakeBaseOptions_52 extends _i1.SmartFake implements _i10.BaseOptions { ); } -class _FakeHttpClientAdapter_53 extends _i1.SmartFake +class _FakeHttpClientAdapter_54 extends _i1.SmartFake implements _i10.HttpClientAdapter { - _FakeHttpClientAdapter_53( + _FakeHttpClientAdapter_54( Object parent, Invocation parentInvocation, ) : super( @@ -624,8 +634,8 @@ class _FakeHttpClientAdapter_53 extends _i1.SmartFake ); } -class _FakeTransformer_54 extends _i1.SmartFake implements _i10.Transformer { - _FakeTransformer_54( +class _FakeTransformer_55 extends _i1.SmartFake implements _i10.Transformer { + _FakeTransformer_55( Object parent, Invocation parentInvocation, ) : super( @@ -634,8 +644,8 @@ class _FakeTransformer_54 extends _i1.SmartFake implements _i10.Transformer { ); } -class _FakeInterceptors_55 extends _i1.SmartFake implements _i10.Interceptors { - _FakeInterceptors_55( +class _FakeInterceptors_56 extends _i1.SmartFake implements _i10.Interceptors { + _FakeInterceptors_56( Object parent, Invocation parentInvocation, ) : super( @@ -644,8 +654,8 @@ class _FakeInterceptors_55 extends _i1.SmartFake implements _i10.Interceptors { ); } -class _FakeResponse_56 extends _i1.SmartFake implements _i10.Response { - _FakeResponse_56( +class _FakeResponse_57 extends _i1.SmartFake implements _i10.Response { + _FakeResponse_57( Object parent, Invocation parentInvocation, ) : super( @@ -654,8 +664,8 @@ class _FakeResponse_56 extends _i1.SmartFake implements _i10.Response { ); } -class _FakeDuration_57 extends _i1.SmartFake implements Duration { - _FakeDuration_57( +class _FakeDuration_58 extends _i1.SmartFake implements Duration { + _FakeDuration_58( Object parent, Invocation parentInvocation, ) : super( @@ -664,9 +674,9 @@ class _FakeDuration_57 extends _i1.SmartFake implements Duration { ); } -class _FakeHttpClientRequest_58 extends _i1.SmartFake +class _FakeHttpClientRequest_59 extends _i1.SmartFake implements _i11.HttpClientRequest { - _FakeHttpClientRequest_58( + _FakeHttpClientRequest_59( Object parent, Invocation parentInvocation, ) : super( @@ -675,8 +685,9 @@ class _FakeHttpClientRequest_58 extends _i1.SmartFake ); } -class _FakeFile_59 extends _i1.SmartFake implements _i12.File { - _FakeFile_59( +class _FakeWebSocketChannel_60 extends _i1.SmartFake + implements _i12.WebSocketChannel { + _FakeWebSocketChannel_60( Object parent, Invocation parentInvocation, ) : super( @@ -685,8 +696,18 @@ class _FakeFile_59 extends _i1.SmartFake implements _i12.File { ); } -class _FakeFileInfo_60 extends _i1.SmartFake implements _i13.FileInfo { - _FakeFileInfo_60( +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( Object parent, Invocation parentInvocation, ) : super( @@ -699,13 +720,13 @@ class _FakeFileInfo_60 extends _i1.SmartFake implements _i13.FileInfo { /// /// See the documentation for Mockito's code generation for more information. class MockTabSettingsRepository extends _i1.Mock - implements _i14.TabSettingsRepository { + implements _i15.TabSettingsRepository { @override - Iterable<_i15.TabSetting> get tabSettings => (super.noSuchMethod( + Iterable<_i16.TabSetting> get tabSettings => (super.noSuchMethod( Invocation.getter(#tabSettings), - returnValue: <_i15.TabSetting>[], - returnValueForMissingStub: <_i15.TabSetting>[], - ) as Iterable<_i15.TabSetting>); + returnValue: <_i16.TabSetting>[], + returnValueForMissingStub: <_i16.TabSetting>[], + ) as Iterable<_i16.TabSetting>); @override bool get hasListeners => (super.noSuchMethod( @@ -715,49 +736,49 @@ class MockTabSettingsRepository extends _i1.Mock ) as bool); @override - _i16.Future load() => (super.noSuchMethod( + _i17.Future load() => (super.noSuchMethod( Invocation.method( #load, [], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future save(List<_i15.TabSetting>? tabSettings) => + _i17.Future save(List<_i16.TabSetting>? tabSettings) => (super.noSuchMethod( Invocation.method( #save, [tabSettings], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future removeAccount(_i17.Account? account) => (super.noSuchMethod( + _i17.Future removeAccount(_i18.Account? account) => (super.noSuchMethod( Invocation.method( #removeAccount, [account], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future initializeTabSettings(_i18.Acct? acct) => + _i17.Future initializeTabSettings(_i19.Acct? acct) => (super.noSuchMethod( Invocation.method( #initializeTabSettings, [acct], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - void addListener(_i19.VoidCallback? listener) => super.noSuchMethod( + void addListener(_i20.VoidCallback? listener) => super.noSuchMethod( Invocation.method( #addListener, [listener], @@ -766,7 +787,7 @@ class MockTabSettingsRepository extends _i1.Mock ); @override - void removeListener(_i19.VoidCallback? listener) => super.noSuchMethod( + void removeListener(_i20.VoidCallback? listener) => super.noSuchMethod( Invocation.method( #removeListener, [listener], @@ -797,7 +818,7 @@ class MockTabSettingsRepository extends _i1.Mock /// /// See the documentation for Mockito's code generation for more information. class MockAccountSettingsRepository extends _i1.Mock - implements _i20.AccountSettingsRepository { + implements _i21.AccountSettingsRepository { @override Iterable<_i2.AccountSettings> get accountSettings => (super.noSuchMethod( Invocation.getter(#accountSettings), @@ -813,37 +834,37 @@ class MockAccountSettingsRepository extends _i1.Mock ) as bool); @override - _i16.Future load() => (super.noSuchMethod( + _i17.Future load() => (super.noSuchMethod( Invocation.method( #load, [], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future save(_i2.AccountSettings? settings) => (super.noSuchMethod( + _i17.Future save(_i2.AccountSettings? settings) => (super.noSuchMethod( Invocation.method( #save, [settings], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future removeAccount(_i17.Account? account) => (super.noSuchMethod( + _i17.Future removeAccount(_i18.Account? account) => (super.noSuchMethod( Invocation.method( #removeAccount, [account], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i2.AccountSettings fromAcct(_i18.Acct? acct) => (super.noSuchMethod( + _i2.AccountSettings fromAcct(_i19.Acct? acct) => (super.noSuchMethod( Invocation.method( #fromAcct, [acct], @@ -865,7 +886,7 @@ class MockAccountSettingsRepository extends _i1.Mock ) as _i2.AccountSettings); @override - _i2.AccountSettings fromAccount(_i17.Account? account) => (super.noSuchMethod( + _i2.AccountSettings fromAccount(_i18.Account? account) => (super.noSuchMethod( Invocation.method( #fromAccount, [account], @@ -887,7 +908,7 @@ class MockAccountSettingsRepository extends _i1.Mock ) as _i2.AccountSettings); @override - void addListener(_i19.VoidCallback? listener) => super.noSuchMethod( + void addListener(_i20.VoidCallback? listener) => super.noSuchMethod( Invocation.method( #addListener, [listener], @@ -896,7 +917,7 @@ class MockAccountSettingsRepository extends _i1.Mock ); @override - void removeListener(_i19.VoidCallback? listener) => super.noSuchMethod( + void removeListener(_i20.VoidCallback? listener) => super.noSuchMethod( Invocation.method( #removeListener, [listener], @@ -926,9 +947,9 @@ class MockAccountSettingsRepository extends _i1.Mock /// A class which mocks [EmojiRepository]. /// /// See the documentation for Mockito's code generation for more information. -class MockEmojiRepository extends _i1.Mock implements _i21.EmojiRepository { +class MockEmojiRepository extends _i1.Mock implements _i22.EmojiRepository { @override - set emoji(List<_i21.EmojiRepositoryData>? _emoji) => super.noSuchMethod( + set emoji(List<_i22.EmojiRepositoryData>? _emoji) => super.noSuchMethod( Invocation.setter( #emoji, _emoji, @@ -937,37 +958,37 @@ class MockEmojiRepository extends _i1.Mock implements _i21.EmojiRepository { ); @override - _i16.Future loadFromSourceIfNeed() => (super.noSuchMethod( + _i17.Future loadFromSourceIfNeed() => (super.noSuchMethod( Invocation.method( #loadFromSourceIfNeed, [], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future loadFromSource() => (super.noSuchMethod( + _i17.Future loadFromSource() => (super.noSuchMethod( Invocation.method( #loadFromSource, [], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future loadFromLocalCache() => (super.noSuchMethod( + _i17.Future loadFromLocalCache() => (super.noSuchMethod( Invocation.method( #loadFromLocalCache, [], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future> searchEmojis( + _i17.Future> searchEmojis( String? name, { int? limit = 30, }) => @@ -977,31 +998,31 @@ class MockEmojiRepository extends _i1.Mock implements _i21.EmojiRepository { [name], {#limit: limit}, ), - returnValue: _i16.Future>.value( - <_i22.MisskeyEmojiData>[]), + returnValue: _i17.Future>.value( + <_i23.MisskeyEmojiData>[]), returnValueForMissingStub: - _i16.Future>.value( - <_i22.MisskeyEmojiData>[]), - ) as _i16.Future>); + _i17.Future>.value( + <_i23.MisskeyEmojiData>[]), + ) as _i17.Future>); @override - List<_i22.MisskeyEmojiData> defaultEmojis({int? limit}) => + List<_i23.MisskeyEmojiData> defaultEmojis({int? limit}) => (super.noSuchMethod( Invocation.method( #defaultEmojis, [], {#limit: limit}, ), - returnValue: <_i22.MisskeyEmojiData>[], - returnValueForMissingStub: <_i22.MisskeyEmojiData>[], - ) as List<_i22.MisskeyEmojiData>); + returnValue: <_i23.MisskeyEmojiData>[], + returnValueForMissingStub: <_i23.MisskeyEmojiData>[], + ) as List<_i23.MisskeyEmojiData>); } /// A class which mocks [GeneralSettingsRepository]. /// /// See the documentation for Mockito's code generation for more information. class MockGeneralSettingsRepository extends _i1.Mock - implements _i23.GeneralSettingsRepository { + implements _i24.GeneralSettingsRepository { @override _i3.GeneralSettings get settings => (super.noSuchMethod( Invocation.getter(#settings), @@ -1023,28 +1044,28 @@ class MockGeneralSettingsRepository extends _i1.Mock ) as bool); @override - _i16.Future load() => (super.noSuchMethod( + _i17.Future load() => (super.noSuchMethod( Invocation.method( #load, [], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future update(_i3.GeneralSettings? settings) => + _i17.Future update(_i3.GeneralSettings? settings) => (super.noSuchMethod( Invocation.method( #update, [settings], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - void addListener(_i19.VoidCallback? listener) => super.noSuchMethod( + void addListener(_i20.VoidCallback? listener) => super.noSuchMethod( Invocation.method( #addListener, [listener], @@ -1053,7 +1074,7 @@ class MockGeneralSettingsRepository extends _i1.Mock ); @override - void removeListener(_i19.VoidCallback? listener) => super.noSuchMethod( + void removeListener(_i20.VoidCallback? listener) => super.noSuchMethod( Invocation.method( #removeListener, [listener], @@ -1083,30 +1104,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 _i24.AccountRepository { +class MockAccountRepository extends _i1.Mock implements _i25.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<_i17.Account> get state => (super.noSuchMethod( + List<_i18.Account> get state => (super.noSuchMethod( Invocation.getter(#state), - returnValue: <_i17.Account>[], - returnValueForMissingStub: <_i17.Account>[], - ) as List<_i17.Account>); + returnValue: <_i18.Account>[], + returnValueForMissingStub: <_i18.Account>[], + ) as List<_i18.Account>); @override - set state(List<_i17.Account>? value) => super.noSuchMethod( + set state(List<_i18.Account>? value) => super.noSuchMethod( Invocation.setter( #state, value, @@ -1115,39 +1136,39 @@ class MockAccountRepository extends _i1.Mock implements _i24.AccountRepository { ); @override - List<_i17.Account> build() => (super.noSuchMethod( + List<_i18.Account> build() => (super.noSuchMethod( Invocation.method( #build, [], ), - returnValue: <_i17.Account>[], - returnValueForMissingStub: <_i17.Account>[], - ) as List<_i17.Account>); + returnValue: <_i18.Account>[], + returnValueForMissingStub: <_i18.Account>[], + ) as List<_i18.Account>); @override - _i16.Future load() => (super.noSuchMethod( + _i17.Future load() => (super.noSuchMethod( Invocation.method( #load, [], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future loadFromSourceIfNeed(_i18.Acct? acct) => + _i17.Future loadFromSourceIfNeed(_i19.Acct? acct) => (super.noSuchMethod( Invocation.method( #loadFromSourceIfNeed, [acct], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future createUnreadAnnouncement( - _i17.Account? account, + _i17.Future createUnreadAnnouncement( + _i18.Account? account, _i5.AnnouncementsResponse? announcement, ) => (super.noSuchMethod( @@ -1158,33 +1179,33 @@ class MockAccountRepository extends _i1.Mock implements _i24.AccountRepository { announcement, ], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future removeUnreadAnnouncement(_i17.Account? account) => + _i17.Future removeUnreadAnnouncement(_i18.Account? account) => (super.noSuchMethod( Invocation.method( #removeUnreadAnnouncement, [account], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future remove(_i17.Account? account) => (super.noSuchMethod( + _i17.Future remove(_i18.Account? account) => (super.noSuchMethod( Invocation.method( #remove, [account], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future loginAsPassword( + _i17.Future loginAsPassword( String? server, String? userId, String? password, @@ -1198,12 +1219,12 @@ class MockAccountRepository extends _i1.Mock implements _i24.AccountRepository { password, ], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future loginAsToken( + _i17.Future loginAsToken( String? server, String? token, ) => @@ -1215,34 +1236,51 @@ class MockAccountRepository extends _i1.Mock implements _i24.AccountRepository { token, ], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future openMiAuth(String? server) => (super.noSuchMethod( + _i17.Future openMiAuth(String? server) => (super.noSuchMethod( Invocation.method( #openMiAuth, [server], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future validateMiAuth(String? server) => (super.noSuchMethod( + _i17.Future validateMiAuth(String? server) => (super.noSuchMethod( Invocation.method( #validateMiAuth, [server], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); + + @override + _i17.Future reorder( + int? oldIndex, + int? newIndex, + ) => + (super.noSuchMethod( + Invocation.method( + #reorder, + [ + oldIndex, + newIndex, + ], + ), + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override bool updateShouldNotify( - List<_i17.Account>? previous, - List<_i17.Account>? next, + List<_i18.Account>? previous, + List<_i18.Account>? next, ) => (super.noSuchMethod( Invocation.method( @@ -1260,7 +1298,7 @@ class MockAccountRepository extends _i1.Mock implements _i24.AccountRepository { /// A class which mocks [NoteRepository]. /// /// See the documentation for Mockito's code generation for more information. -class MockNoteRepository extends _i1.Mock implements _i25.NoteRepository { +class MockNoteRepository extends _i1.Mock implements _i26.NoteRepository { @override _i5.Misskey get misskey => (super.noSuchMethod( Invocation.getter(#misskey), @@ -1296,11 +1334,11 @@ class MockNoteRepository extends _i1.Mock implements _i25.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( @@ -1321,7 +1359,7 @@ class MockNoteRepository extends _i1.Mock implements _i25.NoteRepository { @override void updateNoteStatus( String? id, - _i25.NoteStatus Function(_i25.NoteStatus)? statusPredicate, { + _i26.NoteStatus Function(_i26.NoteStatus)? statusPredicate, { bool? isNotify = true, }) => super.noSuchMethod( @@ -1355,14 +1393,14 @@ class MockNoteRepository extends _i1.Mock implements _i25.NoteRepository { ); @override - _i16.Future refresh(String? noteId) => (super.noSuchMethod( + _i17.Future refresh(String? noteId) => (super.noSuchMethod( Invocation.method( #refresh, [noteId], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override void delete(String? noteId) => super.noSuchMethod( @@ -1374,7 +1412,7 @@ class MockNoteRepository extends _i1.Mock implements _i25.NoteRepository { ); @override - void addListener(_i19.VoidCallback? listener) => super.noSuchMethod( + void addListener(_i20.VoidCallback? listener) => super.noSuchMethod( Invocation.method( #addListener, [listener], @@ -1383,7 +1421,7 @@ class MockNoteRepository extends _i1.Mock implements _i25.NoteRepository { ); @override - void removeListener(_i19.VoidCallback? listener) => super.noSuchMethod( + void removeListener(_i20.VoidCallback? listener) => super.noSuchMethod( Invocation.method( #removeListener, [listener], @@ -1841,38 +1879,38 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { ); @override - _i16.Future> announcements( + _i17.Future> announcements( _i5.AnnouncementsRequest? request) => (super.noSuchMethod( Invocation.method( #announcements, [request], ), - returnValue: _i16.Future>.value( + returnValue: _i17.Future>.value( <_i5.AnnouncementsResponse>[]), returnValueForMissingStub: - _i16.Future>.value( + _i17.Future>.value( <_i5.AnnouncementsResponse>[]), - ) as _i16.Future>); + ) as _i17.Future>); @override - _i16.Future> endpoints() => (super.noSuchMethod( + _i17.Future> endpoints() => (super.noSuchMethod( Invocation.method( #endpoints, [], ), - returnValue: _i16.Future>.value([]), - returnValueForMissingStub: _i16.Future>.value([]), - ) as _i16.Future>); + returnValue: _i17.Future>.value([]), + returnValueForMissingStub: _i17.Future>.value([]), + ) as _i17.Future>); @override - _i16.Future<_i5.EmojisResponse> emojis() => (super.noSuchMethod( + _i17.Future<_i5.EmojisResponse> emojis() => (super.noSuchMethod( Invocation.method( #emojis, [], ), returnValue: - _i16.Future<_i5.EmojisResponse>.value(_FakeEmojisResponse_23( + _i17.Future<_i5.EmojisResponse>.value(_FakeEmojisResponse_23( this, Invocation.method( #emojis, @@ -1880,23 +1918,23 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { ), )), returnValueForMissingStub: - _i16.Future<_i5.EmojisResponse>.value(_FakeEmojisResponse_23( + _i17.Future<_i5.EmojisResponse>.value(_FakeEmojisResponse_23( this, Invocation.method( #emojis, [], ), )), - ) as _i16.Future<_i5.EmojisResponse>); + ) as _i17.Future<_i5.EmojisResponse>); @override - _i16.Future<_i5.EmojiResponse> emoji(_i5.EmojiRequest? request) => + _i17.Future<_i5.EmojiResponse> emoji(_i5.EmojiRequest? request) => (super.noSuchMethod( Invocation.method( #emoji, [request], ), - returnValue: _i16.Future<_i5.EmojiResponse>.value(_FakeEmojiResponse_24( + returnValue: _i17.Future<_i5.EmojiResponse>.value(_FakeEmojiResponse_24( this, Invocation.method( #emoji, @@ -1904,22 +1942,22 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { ), )), returnValueForMissingStub: - _i16.Future<_i5.EmojiResponse>.value(_FakeEmojiResponse_24( + _i17.Future<_i5.EmojiResponse>.value(_FakeEmojiResponse_24( this, Invocation.method( #emoji, [request], ), )), - ) as _i16.Future<_i5.EmojiResponse>); + ) as _i17.Future<_i5.EmojiResponse>); @override - _i16.Future<_i5.MetaResponse> meta() => (super.noSuchMethod( + _i17.Future<_i5.MetaResponse> meta() => (super.noSuchMethod( Invocation.method( #meta, [], ), - returnValue: _i16.Future<_i5.MetaResponse>.value(_FakeMetaResponse_25( + returnValue: _i17.Future<_i5.MetaResponse>.value(_FakeMetaResponse_25( this, Invocation.method( #meta, @@ -1927,22 +1965,22 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { ), )), returnValueForMissingStub: - _i16.Future<_i5.MetaResponse>.value(_FakeMetaResponse_25( + _i17.Future<_i5.MetaResponse>.value(_FakeMetaResponse_25( this, Invocation.method( #meta, [], ), )), - ) as _i16.Future<_i5.MetaResponse>); + ) as _i17.Future<_i5.MetaResponse>); @override - _i16.Future<_i8.StatsResponse> stats() => (super.noSuchMethod( + _i17.Future<_i8.StatsResponse> stats() => (super.noSuchMethod( Invocation.method( #stats, [], ), - returnValue: _i16.Future<_i8.StatsResponse>.value(_FakeStatsResponse_26( + returnValue: _i17.Future<_i8.StatsResponse>.value(_FakeStatsResponse_26( this, Invocation.method( #stats, @@ -1950,22 +1988,22 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { ), )), returnValueForMissingStub: - _i16.Future<_i8.StatsResponse>.value(_FakeStatsResponse_26( + _i17.Future<_i8.StatsResponse>.value(_FakeStatsResponse_26( this, Invocation.method( #stats, [], ), )), - ) as _i16.Future<_i8.StatsResponse>); + ) as _i17.Future<_i8.StatsResponse>); @override - _i16.Future<_i9.PingResponse> ping() => (super.noSuchMethod( + _i17.Future<_i9.PingResponse> ping() => (super.noSuchMethod( Invocation.method( #ping, [], ), - returnValue: _i16.Future<_i9.PingResponse>.value(_FakePingResponse_27( + returnValue: _i17.Future<_i9.PingResponse>.value(_FakePingResponse_27( this, Invocation.method( #ping, @@ -1973,22 +2011,22 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { ), )), returnValueForMissingStub: - _i16.Future<_i9.PingResponse>.value(_FakePingResponse_27( + _i17.Future<_i9.PingResponse>.value(_FakePingResponse_27( this, Invocation.method( #ping, [], ), )), - ) as _i16.Future<_i9.PingResponse>); + ) as _i17.Future<_i9.PingResponse>); @override - _i16.Future<_i5.ServerInfoResponse> serverInfo() => (super.noSuchMethod( + _i17.Future<_i5.ServerInfoResponse> serverInfo() => (super.noSuchMethod( Invocation.method( #serverInfo, [], ), - returnValue: _i16.Future<_i5.ServerInfoResponse>.value( + returnValue: _i17.Future<_i5.ServerInfoResponse>.value( _FakeServerInfoResponse_28( this, Invocation.method( @@ -1996,7 +2034,7 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { [], ), )), - returnValueForMissingStub: _i16.Future<_i5.ServerInfoResponse>.value( + returnValueForMissingStub: _i17.Future<_i5.ServerInfoResponse>.value( _FakeServerInfoResponse_28( this, Invocation.method( @@ -2004,16 +2042,16 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { [], ), )), - ) as _i16.Future<_i5.ServerInfoResponse>); + ) as _i17.Future<_i5.ServerInfoResponse>); @override - _i16.Future<_i5.GetOnlineUsersCountResponse> getOnlineUsersCount() => + _i17.Future<_i5.GetOnlineUsersCountResponse> getOnlineUsersCount() => (super.noSuchMethod( Invocation.method( #getOnlineUsersCount, [], ), - returnValue: _i16.Future<_i5.GetOnlineUsersCountResponse>.value( + returnValue: _i17.Future<_i5.GetOnlineUsersCountResponse>.value( _FakeGetOnlineUsersCountResponse_29( this, Invocation.method( @@ -2022,7 +2060,7 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { ), )), returnValueForMissingStub: - _i16.Future<_i5.GetOnlineUsersCountResponse>.value( + _i17.Future<_i5.GetOnlineUsersCountResponse>.value( _FakeGetOnlineUsersCountResponse_29( this, Invocation.method( @@ -2030,55 +2068,56 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { [], ), )), - ) as _i16.Future<_i5.GetOnlineUsersCountResponse>); + ) as _i17.Future<_i5.GetOnlineUsersCountResponse>); @override - _i16.Future> + _i17.Future> getAvatarDecorations() => (super.noSuchMethod( Invocation.method( #getAvatarDecorations, [], ), returnValue: - _i16.Future>.value( + _i17.Future>.value( <_i5.GetAvatarDecorationsResponse>[]), returnValueForMissingStub: - _i16.Future>.value( + _i17.Future>.value( <_i5.GetAvatarDecorationsResponse>[]), - ) as _i16.Future>); + ) as _i17.Future>); @override - _i16.Future> pinnedUsers() => (super.noSuchMethod( + _i17.Future> pinnedUsers() => (super.noSuchMethod( Invocation.method( #pinnedUsers, [], ), - returnValue: _i16.Future>.value(<_i5.User>[]), + returnValue: + _i17.Future>.value(<_i5.UserDetailed>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.User>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.UserDetailed>[]), + ) as _i17.Future>); @override _i5.SocketController homeTimelineStream({ required _i5.HomeTimelineParameter? parameter, - _i16.FutureOr Function(_i5.Note)? onNoteReceived, - _i16.FutureOr Function( + _i17.FutureOr Function(_i5.Note)? onNoteReceived, + _i17.FutureOr Function( String, _i5.TimelineReacted, )? onReacted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, _i5.TimelineReacted, )? onUnreacted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, DateTime, )? onDeleted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, _i5.TimelineVoted, )? onVoted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, _i5.NoteEdited, )? onUpdated, @@ -2134,24 +2173,24 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { @override _i5.SocketController localTimelineStream({ required _i5.LocalTimelineParameter? parameter, - _i16.FutureOr Function(_i5.Note)? onNoteReceived, - _i16.FutureOr Function( + _i17.FutureOr Function(_i5.Note)? onNoteReceived, + _i17.FutureOr Function( String, _i5.TimelineReacted, )? onReacted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, _i5.TimelineReacted, )? onUnreacted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, DateTime, )? onDeleted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, _i5.TimelineVoted, )? onVoted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, _i5.NoteEdited, )? onUpdated, @@ -2207,24 +2246,24 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { @override _i5.SocketController globalTimelineStream({ required _i5.GlobalTimelineParameter? parameter, - _i16.FutureOr Function(_i5.Note)? onNoteReceived, - _i16.FutureOr Function( + _i17.FutureOr Function(_i5.Note)? onNoteReceived, + _i17.FutureOr Function( String, _i5.TimelineReacted, )? onReacted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, _i5.TimelineReacted, )? onUnreacted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, DateTime, )? onDeleted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, _i5.TimelineVoted, )? onVoted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, _i5.NoteEdited, )? onUpdated, @@ -2280,24 +2319,24 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { @override _i5.SocketController hybridTimelineStream({ required _i5.HybridTimelineParameter? parameter, - _i16.FutureOr Function(_i5.Note)? onNoteReceived, - _i16.FutureOr Function( + _i17.FutureOr Function(_i5.Note)? onNoteReceived, + _i17.FutureOr Function( String, _i5.TimelineReacted, )? onReacted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, _i5.TimelineReacted, )? onUnreacted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, DateTime, )? onDeleted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, _i5.TimelineVoted, )? onVoted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, _i5.NoteEdited, )? onUpdated, @@ -2353,23 +2392,27 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { @override _i5.SocketController roleTimelineStream({ required String? roleId, - _i16.FutureOr Function(_i5.Note)? onNoteReceived, - _i16.FutureOr Function( + _i17.FutureOr Function(_i5.Note)? onNoteReceived, + _i17.FutureOr Function( String, _i5.TimelineReacted, )? onReacted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, _i5.TimelineReacted, )? onUnreacted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, DateTime, )? onDeleted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, _i5.TimelineVoted, )? onVoted, + _i17.FutureOr Function( + String, + _i5.NoteEdited, + )? onUpdated, }) => (super.noSuchMethod( Invocation.method( @@ -2382,6 +2425,7 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { #onUnreacted: onUnreacted, #onDeleted: onDeleted, #onVoted: onVoted, + #onUpdated: onUpdated, }, ), returnValue: _FakeSocketController_30( @@ -2396,6 +2440,7 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { #onUnreacted: onUnreacted, #onDeleted: onDeleted, #onVoted: onVoted, + #onUpdated: onUpdated, }, ), ), @@ -2411,6 +2456,7 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { #onUnreacted: onUnreacted, #onDeleted: onDeleted, #onVoted: onVoted, + #onUpdated: onUpdated, }, ), ), @@ -2419,24 +2465,24 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { @override _i5.SocketController channelStream({ required String? channelId, - _i16.FutureOr Function(_i5.Note)? onNoteReceived, - _i16.FutureOr Function( + _i17.FutureOr Function(_i5.Note)? onNoteReceived, + _i17.FutureOr Function( String, _i5.TimelineReacted, )? onReacted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, _i5.TimelineReacted, )? onUnreacted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, DateTime, )? onDeleted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, _i5.TimelineVoted, )? onVoted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, _i5.NoteEdited, )? onUpdated, @@ -2492,23 +2538,23 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { @override _i5.SocketController userListStream({ required String? listId, - _i16.FutureOr Function(_i5.Note)? onNoteReceived, - _i16.FutureOr Function(_i5.User)? onUserAdded, - _i16.FutureOr Function(_i5.User)? onUserRemoved, - _i16.FutureOr Function( + _i17.FutureOr Function(_i5.Note)? onNoteReceived, + _i17.FutureOr Function(_i5.UserLite)? onUserAdded, + _i17.FutureOr Function(_i5.UserLite)? onUserRemoved, + _i17.FutureOr Function( String, _i5.TimelineReacted, )? onReacted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, _i5.TimelineReacted, )? onUnreacted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, _i5.NoteEdited, )? onUpdated, - _i16.FutureOr Function(DateTime)? onDeleted, - _i16.FutureOr Function( + _i17.FutureOr Function(DateTime)? onDeleted, + _i17.FutureOr Function( String, _i5.TimelineVoted, )? onVoted, @@ -2570,24 +2616,24 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { @override _i5.SocketController antennaStream({ required String? antennaId, - _i16.FutureOr Function(_i5.Note)? onNoteReceived, - _i16.FutureOr Function( + _i17.FutureOr Function(_i5.Note)? onNoteReceived, + _i17.FutureOr Function( String, _i5.TimelineReacted, )? onReacted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, _i5.TimelineReacted, )? onUnreacted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, DateTime, )? onDeleted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, _i5.TimelineVoted, )? onVoted, - _i16.FutureOr Function( + _i17.FutureOr Function( String, _i5.NoteEdited, )? onUpdated, @@ -2642,8 +2688,8 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { @override _i5.SocketController serverStatsLogStream( - _i16.FutureOr Function(List<_i5.StatsLogResponse>)? onLogReceived, - _i16.FutureOr Function(_i5.StatsLogResponse)? onEventReceived, + _i17.FutureOr Function(List<_i5.StatsLogResponse>)? onLogReceived, + _i17.FutureOr Function(_i5.StatsLogResponse)? onEventReceived, ) => (super.noSuchMethod( Invocation.method( @@ -2677,9 +2723,9 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { @override _i5.SocketController queueStatsLogStream( - _i16.FutureOr Function(List<_i5.QueueStatsLogResponse>)? + _i17.FutureOr Function(List<_i5.QueueStatsLogResponse>)? onLogReceived, - _i16.FutureOr Function(_i5.QueueStatsLogResponse)? onEventReceived, + _i17.FutureOr Function(_i5.QueueStatsLogResponse)? onEventReceived, ) => (super.noSuchMethod( Invocation.method( @@ -2713,28 +2759,28 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { @override _i5.SocketController mainStream({ - _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)? + _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)? onAnnouncementCreated, - _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.User)? onFollow, - _i16.FutureOr Function(_i5.User)? onFollowed, - _i16.FutureOr Function(_i5.User)? onUnfollow, - _i16.FutureOr Function(_i5.User)? onMeUpdated, - _i16.FutureOr Function()? onReadAllNotifications, - _i16.FutureOr Function(_i5.INotificationsResponse)? + _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.UserDetailedNotMe)? onFollow, + _i17.FutureOr Function(_i5.UserLite)? onFollowed, + _i17.FutureOr Function(_i5.UserDetailedNotMe)? onUnfollow, + _i17.FutureOr Function(_i5.MeDetailed)? onMeUpdated, + _i17.FutureOr Function()? onReadAllNotifications, + _i17.FutureOr Function(_i5.INotificationsResponse)? onUnreadNotification, - _i16.FutureOr Function(String)? onUnreadMention, - _i16.FutureOr Function()? onReadAllUnreadMentions, - _i16.FutureOr Function(String)? onUnreadSpecifiedNote, - _i16.FutureOr Function()? onReadAllUnreadSpecifiedNotes, - _i16.FutureOr Function(_i5.User)? onReceiveFollowRequest, - _i16.FutureOr Function()? onReadAllAnnouncements, + _i17.FutureOr Function(String)? onUnreadMention, + _i17.FutureOr Function()? onReadAllUnreadMentions, + _i17.FutureOr Function(String)? onUnreadSpecifiedNote, + _i17.FutureOr Function()? onReadAllUnreadSpecifiedNotes, + _i17.FutureOr Function(_i5.UserLite)? onReceiveFollowRequest, + _i17.FutureOr Function()? onReadAllAnnouncements, }) => (super.noSuchMethod( Invocation.method( @@ -2824,14 +2870,14 @@ class MockMisskey extends _i1.Mock implements _i5.Misskey { ) as _i5.SocketController); @override - _i16.Future startStreaming() => (super.noSuchMethod( + _i17.Future startStreaming() => (super.noSuchMethod( Invocation.method( #startStreaming, [], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); } /// A class which mocks [MisskeyAntenna]. @@ -2839,13 +2885,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 - _i16.Future<_i5.Antenna> create(_i5.AntennasCreateRequest? request) => + _i17.Future<_i5.Antenna> create(_i5.AntennasCreateRequest? request) => (super.noSuchMethod( Invocation.method( #create, [request], ), - returnValue: _i16.Future<_i5.Antenna>.value(_FakeAntenna_31( + returnValue: _i17.Future<_i5.Antenna>.value(_FakeAntenna_31( this, Invocation.method( #create, @@ -2853,57 +2899,57 @@ class MockMisskeyAntenna extends _i1.Mock implements _i5.MisskeyAntenna { ), )), returnValueForMissingStub: - _i16.Future<_i5.Antenna>.value(_FakeAntenna_31( + _i17.Future<_i5.Antenna>.value(_FakeAntenna_31( this, Invocation.method( #create, [request], ), )), - ) as _i16.Future<_i5.Antenna>); + ) as _i17.Future<_i5.Antenna>); @override - _i16.Future delete(_i5.AntennasDeleteRequest? request) => + _i17.Future delete(_i5.AntennasDeleteRequest? request) => (super.noSuchMethod( Invocation.method( #delete, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future> list() => (super.noSuchMethod( + _i17.Future> list() => (super.noSuchMethod( Invocation.method( #list, [], ), - returnValue: _i16.Future>.value(<_i5.Antenna>[]), + returnValue: _i17.Future>.value(<_i5.Antenna>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Antenna>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Antenna>[]), + ) as _i17.Future>); @override - _i16.Future> notes(_i5.AntennasNotesRequest? request) => + _i17.Future> notes(_i5.AntennasNotesRequest? request) => (super.noSuchMethod( Invocation.method( #notes, [request], ), - returnValue: _i16.Future>.value(<_i5.Note>[]), + returnValue: _i17.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Note>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Note>[]), + ) as _i17.Future>); @override - _i16.Future<_i5.Antenna> show(_i5.AntennasShowRequest? request) => + _i17.Future<_i5.Antenna> show(_i5.AntennasShowRequest? request) => (super.noSuchMethod( Invocation.method( #show, [request], ), - returnValue: _i16.Future<_i5.Antenna>.value(_FakeAntenna_31( + returnValue: _i17.Future<_i5.Antenna>.value(_FakeAntenna_31( this, Invocation.method( #show, @@ -2911,25 +2957,25 @@ class MockMisskeyAntenna extends _i1.Mock implements _i5.MisskeyAntenna { ), )), returnValueForMissingStub: - _i16.Future<_i5.Antenna>.value(_FakeAntenna_31( + _i17.Future<_i5.Antenna>.value(_FakeAntenna_31( this, Invocation.method( #show, [request], ), )), - ) as _i16.Future<_i5.Antenna>); + ) as _i17.Future<_i5.Antenna>); @override - _i16.Future update(_i5.AntennasUpdateRequest? request) => + _i17.Future update(_i5.AntennasUpdateRequest? request) => (super.noSuchMethod( Invocation.method( #update, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); } /// A class which mocks [MisskeyAp]. @@ -2937,14 +2983,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 - _i16.Future<_i5.ApShowResponse> show(_i5.ApShowRequest? request) => + _i17.Future<_i5.ApShowResponse> show(_i5.ApShowRequest? request) => (super.noSuchMethod( Invocation.method( #show, [request], ), returnValue: - _i16.Future<_i5.ApShowResponse>.value(_FakeApShowResponse_32( + _i17.Future<_i5.ApShowResponse>.value(_FakeApShowResponse_32( this, Invocation.method( #show, @@ -2952,14 +2998,14 @@ class MockMisskeyAp extends _i1.Mock implements _i5.MisskeyAp { ), )), returnValueForMissingStub: - _i16.Future<_i5.ApShowResponse>.value(_FakeApShowResponse_32( + _i17.Future<_i5.ApShowResponse>.value(_FakeApShowResponse_32( this, Invocation.method( #show, [request], ), )), - ) as _i16.Future<_i5.ApShowResponse>); + ) as _i17.Future<_i5.ApShowResponse>); } /// A class which mocks [MisskeyBlocking]. @@ -2967,26 +3013,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 - _i16.Future create(_i5.BlockCreateRequest? request) => + _i17.Future create(_i5.BlockCreateRequest? request) => (super.noSuchMethod( Invocation.method( #create, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future delete(_i5.BlockDeleteRequest? request) => + _i17.Future delete(_i5.BlockDeleteRequest? request) => (super.noSuchMethod( Invocation.method( #delete, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); } /// A class which mocks [MisskeyChannels]. @@ -2994,27 +3040,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 - _i16.Future> timeline( + _i17.Future> timeline( _i5.ChannelsTimelineRequest? request) => (super.noSuchMethod( Invocation.method( #timeline, [request], ), - returnValue: _i16.Future>.value(<_i5.Note>[]), + returnValue: _i17.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Note>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Note>[]), + ) as _i17.Future>); @override - _i16.Future<_i5.CommunityChannel> show(_i5.ChannelsShowRequest? request) => + _i17.Future<_i5.CommunityChannel> show(_i5.ChannelsShowRequest? request) => (super.noSuchMethod( Invocation.method( #show, [request], ), returnValue: - _i16.Future<_i5.CommunityChannel>.value(_FakeCommunityChannel_33( + _i17.Future<_i5.CommunityChannel>.value(_FakeCommunityChannel_33( this, Invocation.method( #show, @@ -3022,90 +3068,90 @@ class MockMisskeyChannels extends _i1.Mock implements _i5.MisskeyChannels { ), )), returnValueForMissingStub: - _i16.Future<_i5.CommunityChannel>.value(_FakeCommunityChannel_33( + _i17.Future<_i5.CommunityChannel>.value(_FakeCommunityChannel_33( this, Invocation.method( #show, [request], ), )), - ) as _i16.Future<_i5.CommunityChannel>); + ) as _i17.Future<_i5.CommunityChannel>); @override - _i16.Future> followed( + _i17.Future> followed( _i5.ChannelsFollowedRequest? request) => (super.noSuchMethod( Invocation.method( #followed, [request], ), - returnValue: _i16.Future>.value( + returnValue: _i17.Future>.value( <_i5.CommunityChannel>[]), returnValueForMissingStub: - _i16.Future>.value( + _i17.Future>.value( <_i5.CommunityChannel>[]), - ) as _i16.Future>); + ) as _i17.Future>); @override - _i16.Future> myFavorite( + _i17.Future> myFavorite( _i5.ChannelsMyFavoriteRequest? request) => (super.noSuchMethod( Invocation.method( #myFavorite, [request], ), - returnValue: _i16.Future>.value( + returnValue: _i17.Future>.value( <_i5.CommunityChannel>[]), returnValueForMissingStub: - _i16.Future>.value( + _i17.Future>.value( <_i5.CommunityChannel>[]), - ) as _i16.Future>); + ) as _i17.Future>); @override - _i16.Future> featured() => (super.noSuchMethod( + _i17.Future> featured() => (super.noSuchMethod( Invocation.method( #featured, [], ), - returnValue: _i16.Future>.value( + returnValue: _i17.Future>.value( <_i5.CommunityChannel>[]), returnValueForMissingStub: - _i16.Future>.value( + _i17.Future>.value( <_i5.CommunityChannel>[]), - ) as _i16.Future>); + ) as _i17.Future>); @override - _i16.Future> owned( + _i17.Future> owned( _i5.ChannelsOwnedRequest? request) => (super.noSuchMethod( Invocation.method( #owned, [request], ), - returnValue: _i16.Future>.value( + returnValue: _i17.Future>.value( <_i5.CommunityChannel>[]), returnValueForMissingStub: - _i16.Future>.value( + _i17.Future>.value( <_i5.CommunityChannel>[]), - ) as _i16.Future>); + ) as _i17.Future>); @override - _i16.Future> search( + _i17.Future> search( _i5.ChannelsSearchRequest? request) => (super.noSuchMethod( Invocation.method( #search, [request], ), - returnValue: _i16.Future>.value( + returnValue: _i17.Future>.value( <_i5.CommunityChannel>[]), returnValueForMissingStub: - _i16.Future>.value( + _i17.Future>.value( <_i5.CommunityChannel>[]), - ) as _i16.Future>); + ) as _i17.Future>); @override - _i16.Future<_i5.CommunityChannel> create( + _i17.Future<_i5.CommunityChannel> create( _i5.ChannelsCreateRequest? request) => (super.noSuchMethod( Invocation.method( @@ -3113,7 +3159,7 @@ class MockMisskeyChannels extends _i1.Mock implements _i5.MisskeyChannels { [request], ), returnValue: - _i16.Future<_i5.CommunityChannel>.value(_FakeCommunityChannel_33( + _i17.Future<_i5.CommunityChannel>.value(_FakeCommunityChannel_33( this, Invocation.method( #create, @@ -3121,69 +3167,69 @@ class MockMisskeyChannels extends _i1.Mock implements _i5.MisskeyChannels { ), )), returnValueForMissingStub: - _i16.Future<_i5.CommunityChannel>.value(_FakeCommunityChannel_33( + _i17.Future<_i5.CommunityChannel>.value(_FakeCommunityChannel_33( this, Invocation.method( #create, [request], ), )), - ) as _i16.Future<_i5.CommunityChannel>); + ) as _i17.Future<_i5.CommunityChannel>); @override - _i16.Future update(_i5.ChannelsUpdateRequest? request) => + _i17.Future update(_i5.ChannelsUpdateRequest? request) => (super.noSuchMethod( Invocation.method( #update, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future favorite(_i5.ChannelsFavoriteRequest? request) => + _i17.Future favorite(_i5.ChannelsFavoriteRequest? request) => (super.noSuchMethod( Invocation.method( #favorite, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future unfavorite(_i5.ChannelsUnfavoriteRequest? request) => + _i17.Future unfavorite(_i5.ChannelsUnfavoriteRequest? request) => (super.noSuchMethod( Invocation.method( #unfavorite, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future follow(_i5.ChannelsFollowRequest? request) => + _i17.Future follow(_i5.ChannelsFollowRequest? request) => (super.noSuchMethod( Invocation.method( #follow, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future unfollow(_i5.ChannelsUnfollowRequest? request) => + _i17.Future unfollow(_i5.ChannelsUnfollowRequest? request) => (super.noSuchMethod( Invocation.method( #unfollow, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); } /// A class which mocks [MisskeyClips]. @@ -3191,162 +3237,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 - _i16.Future> list() => (super.noSuchMethod( + _i17.Future> list() => (super.noSuchMethod( Invocation.method( #list, [], ), - returnValue: _i16.Future>.value(<_i5.Clip>[]), + returnValue: _i17.Future>.value(<_i5.Clip>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Clip>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Clip>[]), + ) as _i17.Future>); @override - _i16.Future> myFavorites() => (super.noSuchMethod( + _i17.Future> myFavorites() => (super.noSuchMethod( Invocation.method( #myFavorites, [], ), - returnValue: _i16.Future>.value(<_i5.Clip>[]), + returnValue: _i17.Future>.value(<_i5.Clip>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Clip>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Clip>[]), + ) as _i17.Future>); @override - _i16.Future> notes(_i5.ClipsNotesRequest? request) => + _i17.Future> notes(_i5.ClipsNotesRequest? request) => (super.noSuchMethod( Invocation.method( #notes, [request], ), - returnValue: _i16.Future>.value(<_i5.Note>[]), + returnValue: _i17.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Note>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Note>[]), + ) as _i17.Future>); @override - _i16.Future addNote(_i5.ClipsAddNoteRequest? request) => + _i17.Future addNote(_i5.ClipsAddNoteRequest? request) => (super.noSuchMethod( Invocation.method( #addNote, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future removeNote(_i5.ClipsRemoveNoteRequest? request) => + _i17.Future removeNote(_i5.ClipsRemoveNoteRequest? request) => (super.noSuchMethod( Invocation.method( #removeNote, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future<_i5.Clip> create(_i5.ClipsCreateRequest? request) => + _i17.Future<_i5.Clip> create(_i5.ClipsCreateRequest? request) => (super.noSuchMethod( Invocation.method( #create, [request], ), - returnValue: _i16.Future<_i5.Clip>.value(_FakeClip_34( + returnValue: _i17.Future<_i5.Clip>.value(_FakeClip_34( this, Invocation.method( #create, [request], ), )), - returnValueForMissingStub: _i16.Future<_i5.Clip>.value(_FakeClip_34( + returnValueForMissingStub: _i17.Future<_i5.Clip>.value(_FakeClip_34( this, Invocation.method( #create, [request], ), )), - ) as _i16.Future<_i5.Clip>); + ) as _i17.Future<_i5.Clip>); @override - _i16.Future delete(_i5.ClipsDeleteRequest? request) => + _i17.Future delete(_i5.ClipsDeleteRequest? request) => (super.noSuchMethod( Invocation.method( #delete, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future<_i5.Clip> update(_i5.ClipsUpdateRequest? request) => + _i17.Future<_i5.Clip> update(_i5.ClipsUpdateRequest? request) => (super.noSuchMethod( Invocation.method( #update, [request], ), - returnValue: _i16.Future<_i5.Clip>.value(_FakeClip_34( + returnValue: _i17.Future<_i5.Clip>.value(_FakeClip_34( this, Invocation.method( #update, [request], ), )), - returnValueForMissingStub: _i16.Future<_i5.Clip>.value(_FakeClip_34( + returnValueForMissingStub: _i17.Future<_i5.Clip>.value(_FakeClip_34( this, Invocation.method( #update, [request], ), )), - ) as _i16.Future<_i5.Clip>); + ) as _i17.Future<_i5.Clip>); @override - _i16.Future<_i5.Clip> show(_i5.ClipsShowRequest? request) => + _i17.Future<_i5.Clip> show(_i5.ClipsShowRequest? request) => (super.noSuchMethod( Invocation.method( #show, [request], ), - returnValue: _i16.Future<_i5.Clip>.value(_FakeClip_34( + returnValue: _i17.Future<_i5.Clip>.value(_FakeClip_34( this, Invocation.method( #show, [request], ), )), - returnValueForMissingStub: _i16.Future<_i5.Clip>.value(_FakeClip_34( + returnValueForMissingStub: _i17.Future<_i5.Clip>.value(_FakeClip_34( this, Invocation.method( #show, [request], ), )), - ) as _i16.Future<_i5.Clip>); + ) as _i17.Future<_i5.Clip>); @override - _i16.Future favorite(_i5.ClipsFavoriteRequest? request) => + _i17.Future favorite(_i5.ClipsFavoriteRequest? request) => (super.noSuchMethod( Invocation.method( #favorite, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future unfavorite(_i5.ClipsUnfavoriteRequest? request) => + _i17.Future unfavorite(_i5.ClipsUnfavoriteRequest? request) => (super.noSuchMethod( Invocation.method( #unfavorite, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); } /// A class which mocks [MisskeyDrive]. @@ -3378,6 +3424,20 @@ class MockMisskeyDrive extends _i1.Mock implements _i5.MisskeyDrive { Invocation.getter(#folders), ), ) as _i5.MisskeyDriveFolders); + + @override + _i17.Future> stream( + _i5.DriveStreamRequest? request) => + (super.noSuchMethod( + Invocation.method( + #stream, + [request], + ), + returnValue: + _i17.Future>.value(<_i5.DriveFile>[]), + returnValueForMissingStub: + _i17.Future>.value(<_i5.DriveFile>[]), + ) as _i17.Future>); } /// A class which mocks [MisskeyDriveFolders]. @@ -3386,7 +3446,7 @@ class MockMisskeyDrive extends _i1.Mock implements _i5.MisskeyDrive { class MockMisskeyDriveFolders extends _i1.Mock implements _i5.MisskeyDriveFolders { @override - _i16.Future> folders( + _i17.Future> folders( _i5.DriveFoldersRequest? request) => (super.noSuchMethod( Invocation.method( @@ -3394,10 +3454,107 @@ class MockMisskeyDriveFolders extends _i1.Mock [request], ), returnValue: - _i16.Future>.value(<_i5.DriveFolder>[]), + _i17.Future>.value(<_i5.DriveFolder>[]), + returnValueForMissingStub: + _i17.Future>.value(<_i5.DriveFolder>[]), + ) as _i17.Future>); + + @override + _i17.Future<_i5.DriveFolder> create(_i5.DriveFoldersCreateRequest? request) => + (super.noSuchMethod( + Invocation.method( + #create, + [request], + ), + returnValue: _i17.Future<_i5.DriveFolder>.value(_FakeDriveFolder_37( + this, + Invocation.method( + #create, + [request], + ), + )), + returnValueForMissingStub: + _i17.Future<_i5.DriveFolder>.value(_FakeDriveFolder_37( + this, + Invocation.method( + #create, + [request], + ), + )), + ) as _i17.Future<_i5.DriveFolder>); + + @override + _i17.Future delete(_i5.DriveFoldersDeleteRequest? request) => + (super.noSuchMethod( + Invocation.method( + #delete, + [request], + ), + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); + + @override + _i17.Future> find( + _i5.DriveFoldersFindRequest? request) => + (super.noSuchMethod( + Invocation.method( + #find, + [request], + ), + returnValue: + _i17.Future>.value(<_i5.DriveFolder>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.DriveFolder>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.DriveFolder>[]), + ) as _i17.Future>); + + @override + _i17.Future<_i5.DriveFolder> show(_i5.DriveFoldersShowRequest? request) => + (super.noSuchMethod( + Invocation.method( + #show, + [request], + ), + returnValue: _i17.Future<_i5.DriveFolder>.value(_FakeDriveFolder_37( + this, + Invocation.method( + #show, + [request], + ), + )), + returnValueForMissingStub: + _i17.Future<_i5.DriveFolder>.value(_FakeDriveFolder_37( + this, + Invocation.method( + #show, + [request], + ), + )), + ) as _i17.Future<_i5.DriveFolder>); + + @override + _i17.Future<_i5.DriveFolder> update(_i5.DriveFoldersUpdateRequest? request) => + (super.noSuchMethod( + Invocation.method( + #update, + [request], + ), + returnValue: _i17.Future<_i5.DriveFolder>.value(_FakeDriveFolder_37( + this, + Invocation.method( + #update, + [request], + ), + )), + returnValueForMissingStub: + _i17.Future<_i5.DriveFolder>.value(_FakeDriveFolder_37( + this, + Invocation.method( + #update, + [request], + ), + )), + ) as _i17.Future<_i5.DriveFolder>); } /// A class which mocks [MisskeyDriveFiles]. @@ -3405,7 +3562,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 - _i16.Future<_i5.DriveFile> create( + _i17.Future<_i5.DriveFile> create( _i5.DriveFilesCreateRequest? request, _i11.File? fileContent, ) => @@ -3417,7 +3574,7 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles { fileContent, ], ), - returnValue: _i16.Future<_i5.DriveFile>.value(_FakeDriveFile_37( + returnValue: _i17.Future<_i5.DriveFile>.value(_FakeDriveFile_38( this, Invocation.method( #create, @@ -3428,7 +3585,7 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles { ), )), returnValueForMissingStub: - _i16.Future<_i5.DriveFile>.value(_FakeDriveFile_37( + _i17.Future<_i5.DriveFile>.value(_FakeDriveFile_38( this, Invocation.method( #create, @@ -3438,12 +3595,12 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles { ], ), )), - ) as _i16.Future<_i5.DriveFile>); + ) as _i17.Future<_i5.DriveFile>); @override - _i16.Future<_i5.DriveFile> createAsBinary( + _i17.Future<_i5.DriveFile> createAsBinary( _i5.DriveFilesCreateRequest? request, - _i26.Uint8List? fileContent, + _i27.Uint8List? fileContent, ) => (super.noSuchMethod( Invocation.method( @@ -3453,7 +3610,7 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles { fileContent, ], ), - returnValue: _i16.Future<_i5.DriveFile>.value(_FakeDriveFile_37( + returnValue: _i17.Future<_i5.DriveFile>.value(_FakeDriveFile_38( this, Invocation.method( #createAsBinary, @@ -3464,7 +3621,7 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles { ), )), returnValueForMissingStub: - _i16.Future<_i5.DriveFile>.value(_FakeDriveFile_37( + _i17.Future<_i5.DriveFile>.value(_FakeDriveFile_38( this, Invocation.method( #createAsBinary, @@ -3474,16 +3631,16 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles { ], ), )), - ) as _i16.Future<_i5.DriveFile>); + ) as _i17.Future<_i5.DriveFile>); @override - _i16.Future<_i5.DriveFile> update(_i5.DriveFilesUpdateRequest? request) => + _i17.Future<_i5.DriveFile> update(_i5.DriveFilesUpdateRequest? request) => (super.noSuchMethod( Invocation.method( #update, [request], ), - returnValue: _i16.Future<_i5.DriveFile>.value(_FakeDriveFile_37( + returnValue: _i17.Future<_i5.DriveFile>.value(_FakeDriveFile_38( this, Invocation.method( #update, @@ -3491,41 +3648,41 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles { ), )), returnValueForMissingStub: - _i16.Future<_i5.DriveFile>.value(_FakeDriveFile_37( + _i17.Future<_i5.DriveFile>.value(_FakeDriveFile_38( this, Invocation.method( #update, [request], ), )), - ) as _i16.Future<_i5.DriveFile>); + ) as _i17.Future<_i5.DriveFile>); @override - _i16.Future delete(_i5.DriveFilesDeleteRequest? request) => + _i17.Future delete(_i5.DriveFilesDeleteRequest? request) => (super.noSuchMethod( Invocation.method( #delete, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future> files(_i5.DriveFilesRequest? request) => + _i17.Future> files(_i5.DriveFilesRequest? request) => (super.noSuchMethod( Invocation.method( #files, [request], ), returnValue: - _i16.Future>.value(<_i5.DriveFile>[]), + _i17.Future>.value(<_i5.DriveFile>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.DriveFile>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.DriveFile>[]), + ) as _i17.Future>); @override - _i16.Future> find( + _i17.Future> find( _i5.DriveFilesFindRequest? request) => (super.noSuchMethod( Invocation.method( @@ -3533,10 +3690,85 @@ class MockMisskeyDriveFiles extends _i1.Mock implements _i5.MisskeyDriveFiles { [request], ), returnValue: - _i16.Future>.value(<_i5.DriveFile>[]), + _i17.Future>.value(<_i5.DriveFile>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.DriveFile>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.DriveFile>[]), + ) as _i17.Future>); + + @override + _i17.Future> attachedNotes( + _i5.DriveFilesAttachedNotesRequest? request) => + (super.noSuchMethod( + Invocation.method( + #attachedNotes, + [request], + ), + returnValue: _i17.Future>.value(<_i5.Note>[]), + returnValueForMissingStub: + _i17.Future>.value(<_i5.Note>[]), + ) as _i17.Future>); + + @override + _i17.Future checkExistence( + _i5.DriveFilesCheckExistenceRequest? request) => + (super.noSuchMethod( + Invocation.method( + #checkExistence, + [request], + ), + returnValue: _i17.Future.value(false), + returnValueForMissingStub: _i17.Future.value(false), + ) as _i17.Future); + + @override + _i17.Future> findByHash( + _i5.DriveFilesFindByHashRequest? request) => + (super.noSuchMethod( + Invocation.method( + #findByHash, + [request], + ), + returnValue: + _i17.Future>.value(<_i5.DriveFile>[]), + returnValueForMissingStub: + _i17.Future>.value(<_i5.DriveFile>[]), + ) as _i17.Future>); + + @override + _i17.Future<_i5.DriveFile> show(_i5.DriveFilesShowRequest? request) => + (super.noSuchMethod( + Invocation.method( + #show, + [request], + ), + returnValue: _i17.Future<_i5.DriveFile>.value(_FakeDriveFile_38( + this, + Invocation.method( + #show, + [request], + ), + )), + returnValueForMissingStub: + _i17.Future<_i5.DriveFile>.value(_FakeDriveFile_38( + this, + Invocation.method( + #show, + [request], + ), + )), + ) as _i17.Future<_i5.DriveFile>); + + @override + _i17.Future uploadFromUrl( + _i5.DriveFilesUploadFromUrlRequest? request) => + (super.noSuchMethod( + Invocation.method( + #uploadFromUrl, + [request], + ), + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); } /// A class which mocks [MisskeyFederation]. @@ -3544,15 +3776,15 @@ 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 - _i16.Future<_i5.FederationShowInstanceResponse> showInstance( + _i17.Future<_i5.FederationShowInstanceResponse> showInstance( _i5.FederationShowInstanceRequest? request) => (super.noSuchMethod( Invocation.method( #showInstance, [request], ), - returnValue: _i16.Future<_i5.FederationShowInstanceResponse>.value( - _FakeFederationShowInstanceResponse_38( + returnValue: _i17.Future<_i5.FederationShowInstanceResponse>.value( + _FakeFederationShowInstanceResponse_39( this, Invocation.method( #showInstance, @@ -3560,27 +3792,29 @@ class MockMisskeyFederation extends _i1.Mock implements _i5.MisskeyFederation { ), )), returnValueForMissingStub: - _i16.Future<_i5.FederationShowInstanceResponse>.value( - _FakeFederationShowInstanceResponse_38( + _i17.Future<_i5.FederationShowInstanceResponse>.value( + _FakeFederationShowInstanceResponse_39( this, Invocation.method( #showInstance, [request], ), )), - ) as _i16.Future<_i5.FederationShowInstanceResponse>); + ) as _i17.Future<_i5.FederationShowInstanceResponse>); @override - _i16.Future> users(_i5.FederationUsersRequest? request) => + _i17.Future> users( + _i5.FederationUsersRequest? request) => (super.noSuchMethod( Invocation.method( #users, [request], ), - returnValue: _i16.Future>.value(<_i5.User>[]), + returnValue: + _i17.Future>.value(<_i5.UserDetailed>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.User>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.UserDetailed>[]), + ) as _i17.Future>); } /// A class which mocks [MisskeyFollowing]. @@ -3590,95 +3824,99 @@ class MockMisskeyFollowing extends _i1.Mock implements _i5.MisskeyFollowing { @override _i5.MisskeyFollowingRequests get requests => (super.noSuchMethod( Invocation.getter(#requests), - returnValue: _FakeMisskeyFollowingRequests_39( + returnValue: _FakeMisskeyFollowingRequests_40( this, Invocation.getter(#requests), ), - returnValueForMissingStub: _FakeMisskeyFollowingRequests_39( + returnValueForMissingStub: _FakeMisskeyFollowingRequests_40( this, Invocation.getter(#requests), ), ) as _i5.MisskeyFollowingRequests); @override - _i16.Future<_i5.User> create(_i5.FollowingCreateRequest? request) => + _i17.Future<_i5.UserLite> create(_i5.FollowingCreateRequest? request) => (super.noSuchMethod( Invocation.method( #create, [request], ), - returnValue: _i16.Future<_i5.User>.value(_FakeUser_40( + returnValue: _i17.Future<_i5.UserLite>.value(_FakeUserLite_41( this, Invocation.method( #create, [request], ), )), - returnValueForMissingStub: _i16.Future<_i5.User>.value(_FakeUser_40( + returnValueForMissingStub: + _i17.Future<_i5.UserLite>.value(_FakeUserLite_41( this, Invocation.method( #create, [request], ), )), - ) as _i16.Future<_i5.User>); + ) as _i17.Future<_i5.UserLite>); @override - _i16.Future<_i5.User> delete(_i5.FollowingDeleteRequest? request) => + _i17.Future<_i5.UserLite> delete(_i5.FollowingDeleteRequest? request) => (super.noSuchMethod( Invocation.method( #delete, [request], ), - returnValue: _i16.Future<_i5.User>.value(_FakeUser_40( + returnValue: _i17.Future<_i5.UserLite>.value(_FakeUserLite_41( this, Invocation.method( #delete, [request], ), )), - returnValueForMissingStub: _i16.Future<_i5.User>.value(_FakeUser_40( + returnValueForMissingStub: + _i17.Future<_i5.UserLite>.value(_FakeUserLite_41( this, Invocation.method( #delete, [request], ), )), - ) as _i16.Future<_i5.User>); + ) as _i17.Future<_i5.UserLite>); @override - _i16.Future<_i5.User> invalidate(_i5.FollowingInvalidateRequest? request) => + _i17.Future<_i5.UserLite> invalidate( + _i5.FollowingInvalidateRequest? request) => (super.noSuchMethod( Invocation.method( #invalidate, [request], ), - returnValue: _i16.Future<_i5.User>.value(_FakeUser_40( + returnValue: _i17.Future<_i5.UserLite>.value(_FakeUserLite_41( this, Invocation.method( #invalidate, [request], ), )), - returnValueForMissingStub: _i16.Future<_i5.User>.value(_FakeUser_40( + returnValueForMissingStub: + _i17.Future<_i5.UserLite>.value(_FakeUserLite_41( this, Invocation.method( #invalidate, [request], ), )), - ) as _i16.Future<_i5.User>); + ) as _i17.Future<_i5.UserLite>); @override - _i16.Future updateAll(_i5.FollowingUpdateAllRequest? request) => + _i17.Future updateAll(_i5.FollowingUpdateAllRequest? request) => (super.noSuchMethod( Invocation.method( #updateAll, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); } /// A class which mocks [MisskeyHashtags]. @@ -3686,37 +3924,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 - _i16.Future> list(_i5.HashtagsListRequest? request) => + _i17.Future> list(_i5.HashtagsListRequest? request) => (super.noSuchMethod( Invocation.method( #list, [request], ), - returnValue: _i16.Future>.value(<_i5.Hashtag>[]), + returnValue: _i17.Future>.value(<_i5.Hashtag>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Hashtag>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Hashtag>[]), + ) as _i17.Future>); @override - _i16.Future> search(_i5.HashtagsSearchRequest? request) => + _i17.Future> search(_i5.HashtagsSearchRequest? request) => (super.noSuchMethod( Invocation.method( #search, [request], ), - returnValue: _i16.Future>.value([]), + returnValue: _i17.Future>.value([]), returnValueForMissingStub: - _i16.Future>.value([]), - ) as _i16.Future>); + _i17.Future>.value([]), + ) as _i17.Future>); @override - _i16.Future<_i5.Hashtag> show(_i5.HashtagsShowRequest? request) => + _i17.Future<_i5.Hashtag> show(_i5.HashtagsShowRequest? request) => (super.noSuchMethod( Invocation.method( #show, [request], ), - returnValue: _i16.Future<_i5.Hashtag>.value(_FakeHashtag_41( + returnValue: _i17.Future<_i5.Hashtag>.value(_FakeHashtag_42( this, Invocation.method( #show, @@ -3724,40 +3962,42 @@ class MockMisskeyHashtags extends _i1.Mock implements _i5.MisskeyHashtags { ), )), returnValueForMissingStub: - _i16.Future<_i5.Hashtag>.value(_FakeHashtag_41( + _i17.Future<_i5.Hashtag>.value(_FakeHashtag_42( this, Invocation.method( #show, [request], ), )), - ) as _i16.Future<_i5.Hashtag>); + ) as _i17.Future<_i5.Hashtag>); @override - _i16.Future> trend() => + _i17.Future> trend() => (super.noSuchMethod( Invocation.method( #trend, [], ), - returnValue: _i16.Future>.value( + returnValue: _i17.Future>.value( <_i5.HashtagsTrendResponse>[]), returnValueForMissingStub: - _i16.Future>.value( + _i17.Future>.value( <_i5.HashtagsTrendResponse>[]), - ) as _i16.Future>); + ) as _i17.Future>); @override - _i16.Future> users(_i5.HashtagsUsersRequest? request) => + _i17.Future> users( + _i5.HashtagsUsersRequest? request) => (super.noSuchMethod( Invocation.method( #users, [request], ), - returnValue: _i16.Future>.value(<_i5.User>[]), + returnValue: + _i17.Future>.value(<_i5.UserDetailed>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.User>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.UserDetailed>[]), + ) as _i17.Future>); } /// A class which mocks [MisskeyI]. @@ -3765,12 +4005,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 - _i16.Future<_i5.IResponse> i() => (super.noSuchMethod( + _i17.Future<_i5.MeDetailed> i() => (super.noSuchMethod( Invocation.method( #i, [], ), - returnValue: _i16.Future<_i5.IResponse>.value(_FakeIResponse_42( + returnValue: _i17.Future<_i5.MeDetailed>.value(_FakeMeDetailed_43( this, Invocation.method( #i, @@ -3778,64 +4018,64 @@ class MockMisskeyI extends _i1.Mock implements _i5.MisskeyI { ), )), returnValueForMissingStub: - _i16.Future<_i5.IResponse>.value(_FakeIResponse_42( + _i17.Future<_i5.MeDetailed>.value(_FakeMeDetailed_43( this, Invocation.method( #i, [], ), )), - ) as _i16.Future<_i5.IResponse>); + ) as _i17.Future<_i5.MeDetailed>); @override - _i16.Future> notifications( + _i17.Future> notifications( _i5.INotificationsRequest? request) => (super.noSuchMethod( Invocation.method( #notifications, [request], ), - returnValue: _i16.Future>.value( + returnValue: _i17.Future>.value( <_i5.INotificationsResponse>[]), returnValueForMissingStub: - _i16.Future>.value( + _i17.Future>.value( <_i5.INotificationsResponse>[]), - ) as _i16.Future>); + ) as _i17.Future>); @override - _i16.Future readAnnouncement(_i5.IReadAnnouncementRequest? request) => + _i17.Future readAnnouncement(_i5.IReadAnnouncementRequest? request) => (super.noSuchMethod( Invocation.method( #readAnnouncement, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future> favorites( + _i17.Future> favorites( _i5.IFavoritesRequest? request) => (super.noSuchMethod( Invocation.method( #favorites, [request], ), - returnValue: _i16.Future>.value( + returnValue: _i17.Future>.value( <_i5.IFavoritesResponse>[]), returnValueForMissingStub: - _i16.Future>.value( + _i17.Future>.value( <_i5.IFavoritesResponse>[]), - ) as _i16.Future>); + ) as _i17.Future>); @override - _i16.Future<_i5.IResponse> update(_i5.IUpdateRequest? request) => + _i17.Future<_i5.MeDetailed> update(_i5.IUpdateRequest? request) => (super.noSuchMethod( Invocation.method( #update, [request], ), - returnValue: _i16.Future<_i5.IResponse>.value(_FakeIResponse_42( + returnValue: _i17.Future<_i5.MeDetailed>.value(_FakeMeDetailed_43( this, Invocation.method( #update, @@ -3843,14 +4083,14 @@ class MockMisskeyI extends _i1.Mock implements _i5.MisskeyI { ), )), returnValueForMissingStub: - _i16.Future<_i5.IResponse>.value(_FakeIResponse_42( + _i17.Future<_i5.MeDetailed>.value(_FakeMeDetailed_43( this, Invocation.method( #update, [request], ), )), - ) as _i16.Future<_i5.IResponse>); + ) as _i17.Future<_i5.MeDetailed>); } /// A class which mocks [MisskeyNotes]. @@ -3860,11 +4100,11 @@ class MockMisskeyNotes extends _i1.Mock implements _i5.MisskeyNotes { @override _i5.MisskeyNotesReactions get reactions => (super.noSuchMethod( Invocation.getter(#reactions), - returnValue: _FakeMisskeyNotesReactions_43( + returnValue: _FakeMisskeyNotesReactions_44( this, Invocation.getter(#reactions), ), - returnValueForMissingStub: _FakeMisskeyNotesReactions_43( + returnValueForMissingStub: _FakeMisskeyNotesReactions_44( this, Invocation.getter(#reactions), ), @@ -3873,11 +4113,11 @@ class MockMisskeyNotes extends _i1.Mock implements _i5.MisskeyNotes { @override _i5.MisskeyNotesFavorites get favorites => (super.noSuchMethod( Invocation.getter(#favorites), - returnValue: _FakeMisskeyNotesFavorites_44( + returnValue: _FakeMisskeyNotesFavorites_45( this, Invocation.getter(#favorites), ), - returnValueForMissingStub: _FakeMisskeyNotesFavorites_44( + returnValueForMissingStub: _FakeMisskeyNotesFavorites_45( this, Invocation.getter(#favorites), ), @@ -3886,11 +4126,11 @@ class MockMisskeyNotes extends _i1.Mock implements _i5.MisskeyNotes { @override _i5.MisskeyNotesPolls get polls => (super.noSuchMethod( Invocation.getter(#polls), - returnValue: _FakeMisskeyNotesPolls_45( + returnValue: _FakeMisskeyNotesPolls_46( this, Invocation.getter(#polls), ), - returnValueForMissingStub: _FakeMisskeyNotesPolls_45( + returnValueForMissingStub: _FakeMisskeyNotesPolls_46( this, Invocation.getter(#polls), ), @@ -3899,294 +4139,294 @@ class MockMisskeyNotes extends _i1.Mock implements _i5.MisskeyNotes { @override _i5.MisskeyNotesThreadMuting get threadMuting => (super.noSuchMethod( Invocation.getter(#threadMuting), - returnValue: _FakeMisskeyNotesThreadMuting_46( + returnValue: _FakeMisskeyNotesThreadMuting_47( this, Invocation.getter(#threadMuting), ), - returnValueForMissingStub: _FakeMisskeyNotesThreadMuting_46( + returnValueForMissingStub: _FakeMisskeyNotesThreadMuting_47( this, Invocation.getter(#threadMuting), ), ) as _i5.MisskeyNotesThreadMuting); @override - _i16.Future create(_i5.NotesCreateRequest? request) => + _i17.Future create(_i5.NotesCreateRequest? request) => (super.noSuchMethod( Invocation.method( #create, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future update(_i5.NotesUpdateRequest? request) => + _i17.Future update(_i5.NotesUpdateRequest? request) => (super.noSuchMethod( Invocation.method( #update, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future delete(_i5.NotesDeleteRequest? request) => + _i17.Future delete(_i5.NotesDeleteRequest? request) => (super.noSuchMethod( Invocation.method( #delete, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future> notes(_i5.NotesRequest? request) => + _i17.Future> notes(_i5.NotesRequest? request) => (super.noSuchMethod( Invocation.method( #notes, [request], ), - returnValue: _i16.Future>.value(<_i5.Note>[]), + returnValue: _i17.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Note>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Note>[]), + ) as _i17.Future>); @override - _i16.Future<_i5.Note> show(_i5.NotesShowRequest? request) => + _i17.Future<_i5.Note> show(_i5.NotesShowRequest? request) => (super.noSuchMethod( Invocation.method( #show, [request], ), - returnValue: _i16.Future<_i5.Note>.value(_FakeNote_47( + returnValue: _i17.Future<_i5.Note>.value(_FakeNote_48( this, Invocation.method( #show, [request], ), )), - returnValueForMissingStub: _i16.Future<_i5.Note>.value(_FakeNote_47( + returnValueForMissingStub: _i17.Future<_i5.Note>.value(_FakeNote_48( this, Invocation.method( #show, [request], ), )), - ) as _i16.Future<_i5.Note>); + ) as _i17.Future<_i5.Note>); @override - _i16.Future> homeTimeline( + _i17.Future> homeTimeline( _i5.NotesTimelineRequest? request) => (super.noSuchMethod( Invocation.method( #homeTimeline, [request], ), - returnValue: _i16.Future>.value(<_i5.Note>[]), + returnValue: _i17.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Note>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Note>[]), + ) as _i17.Future>); @override - _i16.Future> localTimeline( + _i17.Future> localTimeline( _i5.NotesLocalTimelineRequest? request) => (super.noSuchMethod( Invocation.method( #localTimeline, [request], ), - returnValue: _i16.Future>.value(<_i5.Note>[]), + returnValue: _i17.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Note>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Note>[]), + ) as _i17.Future>); @override - _i16.Future> hybridTimeline( + _i17.Future> hybridTimeline( _i5.NotesHybridTimelineRequest? request) => (super.noSuchMethod( Invocation.method( #hybridTimeline, [request], ), - returnValue: _i16.Future>.value(<_i5.Note>[]), + returnValue: _i17.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Note>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Note>[]), + ) as _i17.Future>); @override - _i16.Future> globalTimeline( + _i17.Future> globalTimeline( _i5.NotesGlobalTimelineRequest? request) => (super.noSuchMethod( Invocation.method( #globalTimeline, [request], ), - returnValue: _i16.Future>.value(<_i5.Note>[]), + returnValue: _i17.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Note>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Note>[]), + ) as _i17.Future>); @override - _i16.Future> userListTimeline( + _i17.Future> userListTimeline( _i5.UserListTimelineRequest? request) => (super.noSuchMethod( Invocation.method( #userListTimeline, [request], ), - returnValue: _i16.Future>.value(<_i5.Note>[]), + returnValue: _i17.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Note>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Note>[]), + ) as _i17.Future>); @override - _i16.Future<_i5.NotesStateResponse> state(_i5.NotesStateRequest? request) => + _i17.Future<_i5.NotesStateResponse> state(_i5.NotesStateRequest? request) => (super.noSuchMethod( Invocation.method( #state, [request], ), - returnValue: _i16.Future<_i5.NotesStateResponse>.value( - _FakeNotesStateResponse_48( + returnValue: _i17.Future<_i5.NotesStateResponse>.value( + _FakeNotesStateResponse_49( this, Invocation.method( #state, [request], ), )), - returnValueForMissingStub: _i16.Future<_i5.NotesStateResponse>.value( - _FakeNotesStateResponse_48( + returnValueForMissingStub: _i17.Future<_i5.NotesStateResponse>.value( + _FakeNotesStateResponse_49( this, Invocation.method( #state, [request], ), )), - ) as _i16.Future<_i5.NotesStateResponse>); + ) as _i17.Future<_i5.NotesStateResponse>); @override - _i16.Future> search(_i5.NotesSearchRequest? request) => + _i17.Future> search(_i5.NotesSearchRequest? request) => (super.noSuchMethod( Invocation.method( #search, [request], ), - returnValue: _i16.Future>.value(<_i5.Note>[]), + returnValue: _i17.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Note>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Note>[]), + ) as _i17.Future>); @override - _i16.Future> searchByTag( + _i17.Future> searchByTag( _i5.NotesSearchByTagRequest? request) => (super.noSuchMethod( Invocation.method( #searchByTag, [request], ), - returnValue: _i16.Future>.value(<_i5.Note>[]), + returnValue: _i17.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Note>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Note>[]), + ) as _i17.Future>); @override - _i16.Future> renotes(_i5.NotesRenoteRequest? request) => + _i17.Future> renotes(_i5.NotesRenoteRequest? request) => (super.noSuchMethod( Invocation.method( #renotes, [request], ), - returnValue: _i16.Future>.value(<_i5.Note>[]), + returnValue: _i17.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Note>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Note>[]), + ) as _i17.Future>); @override - _i16.Future> replies(_i5.NotesRepliesRequest? request) => + _i17.Future> replies(_i5.NotesRepliesRequest? request) => (super.noSuchMethod( Invocation.method( #replies, [request], ), - returnValue: _i16.Future>.value(<_i5.Note>[]), + returnValue: _i17.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Note>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Note>[]), + ) as _i17.Future>); @override - _i16.Future> children(_i5.NotesChildrenRequest? request) => + _i17.Future> children(_i5.NotesChildrenRequest? request) => (super.noSuchMethod( Invocation.method( #children, [request], ), - returnValue: _i16.Future>.value(<_i5.Note>[]), + returnValue: _i17.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Note>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Note>[]), + ) as _i17.Future>); @override - _i16.Future> conversation( + _i17.Future> conversation( _i5.NotesConversationRequest? request) => (super.noSuchMethod( Invocation.method( #conversation, [request], ), - returnValue: _i16.Future>.value(<_i5.Note>[]), + returnValue: _i17.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Note>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Note>[]), + ) as _i17.Future>); @override - _i16.Future> featured(_i5.NotesFeaturedRequest? request) => + _i17.Future> featured(_i5.NotesFeaturedRequest? request) => (super.noSuchMethod( Invocation.method( #featured, [request], ), - returnValue: _i16.Future>.value(<_i5.Note>[]), + returnValue: _i17.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Note>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Note>[]), + ) as _i17.Future>); @override - _i16.Future> mentions(_i5.NotesMentionsRequest? request) => + _i17.Future> mentions(_i5.NotesMentionsRequest? request) => (super.noSuchMethod( Invocation.method( #mentions, [request], ), - returnValue: _i16.Future>.value(<_i5.Note>[]), + returnValue: _i17.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Note>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Note>[]), + ) as _i17.Future>); @override - _i16.Future> clips(_i5.NotesClipsRequest? request) => + _i17.Future> clips(_i5.NotesClipsRequest? request) => (super.noSuchMethod( Invocation.method( #clips, [request], ), - returnValue: _i16.Future>.value(<_i5.Clip>[]), + returnValue: _i17.Future>.value(<_i5.Clip>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Clip>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Clip>[]), + ) as _i17.Future>); @override - _i16.Future unrenote(_i5.NotesUnrenoteRequest? request) => + _i17.Future unrenote(_i5.NotesUnrenoteRequest? request) => (super.noSuchMethod( Invocation.method( #unrenote, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); } /// A class which mocks [MisskeyNotesFavorites]. @@ -4195,26 +4435,26 @@ class MockMisskeyNotes extends _i1.Mock implements _i5.MisskeyNotes { class MockMisskeyNotesFavorites extends _i1.Mock implements _i5.MisskeyNotesFavorites { @override - _i16.Future create(_i5.NotesFavoritesCreateRequest? request) => + _i17.Future create(_i5.NotesFavoritesCreateRequest? request) => (super.noSuchMethod( Invocation.method( #create, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future delete(_i5.NotesFavoritesDeleteRequest? request) => + _i17.Future delete(_i5.NotesFavoritesDeleteRequest? request) => (super.noSuchMethod( Invocation.method( #delete, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); } /// A class which mocks [MisskeyNotesReactions]. @@ -4223,41 +4463,41 @@ class MockMisskeyNotesFavorites extends _i1.Mock class MockMisskeyNotesReactions extends _i1.Mock implements _i5.MisskeyNotesReactions { @override - _i16.Future create(_i5.NotesReactionsCreateRequest? request) => + _i17.Future create(_i5.NotesReactionsCreateRequest? request) => (super.noSuchMethod( Invocation.method( #create, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future delete(_i5.NotesReactionsDeleteRequest? request) => + _i17.Future delete(_i5.NotesReactionsDeleteRequest? request) => (super.noSuchMethod( Invocation.method( #delete, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future> reactions( + _i17.Future> reactions( _i5.NotesReactionsRequest? request) => (super.noSuchMethod( Invocation.method( #reactions, [request], ), - returnValue: _i16.Future>.value( + returnValue: _i17.Future>.value( <_i5.NotesReactionsResponse>[]), returnValueForMissingStub: - _i16.Future>.value( + _i17.Future>.value( <_i5.NotesReactionsResponse>[]), - ) as _i16.Future>); + ) as _i17.Future>); } /// A class which mocks [MisskeyNotesPolls]. @@ -4265,28 +4505,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 - _i16.Future vote(_i5.NotesPollsVoteRequest? request) => + _i17.Future vote(_i5.NotesPollsVoteRequest? request) => (super.noSuchMethod( Invocation.method( #vote, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future> recommendation( + _i17.Future> recommendation( _i5.NotesPollsRecommendationRequest? request) => (super.noSuchMethod( Invocation.method( #recommendation, [request], ), - returnValue: _i16.Future>.value(<_i5.Note>[]), + returnValue: _i17.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Note>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Note>[]), + ) as _i17.Future>); } /// A class which mocks [MisskeyRenoteMute]. @@ -4294,26 +4534,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 - _i16.Future create(_i5.RenoteMuteCreateRequest? request) => + _i17.Future create(_i5.RenoteMuteCreateRequest? request) => (super.noSuchMethod( Invocation.method( #create, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future delete(_i5.RenoteMuteDeleteRequest? request) => + _i17.Future delete(_i5.RenoteMuteDeleteRequest? request) => (super.noSuchMethod( Invocation.method( #delete, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); } /// A class which mocks [MisskeyRoles]. @@ -4321,42 +4561,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 - _i16.Future> list() => (super.noSuchMethod( + _i17.Future> list() => (super.noSuchMethod( Invocation.method( #list, [], ), - returnValue: _i16.Future>.value( + returnValue: _i17.Future>.value( <_i5.RolesListResponse>[]), returnValueForMissingStub: - _i16.Future>.value( + _i17.Future>.value( <_i5.RolesListResponse>[]), - ) as _i16.Future>); + ) as _i17.Future>); @override - _i16.Future> users( + _i17.Future> users( _i5.RolesUsersRequest? request) => (super.noSuchMethod( Invocation.method( #users, [request], ), - returnValue: _i16.Future>.value( + returnValue: _i17.Future>.value( <_i5.RolesUsersResponse>[]), returnValueForMissingStub: - _i16.Future>.value( + _i17.Future>.value( <_i5.RolesUsersResponse>[]), - ) as _i16.Future>); + ) as _i17.Future>); @override - _i16.Future<_i5.RolesListResponse> show(_i5.RolesShowRequest? request) => + _i17.Future<_i5.RolesListResponse> show(_i5.RolesShowRequest? request) => (super.noSuchMethod( Invocation.method( #show, [request], ), returnValue: - _i16.Future<_i5.RolesListResponse>.value(_FakeRolesListResponse_49( + _i17.Future<_i5.RolesListResponse>.value(_FakeRolesListResponse_50( this, Invocation.method( #show, @@ -4364,26 +4604,26 @@ class MockMisskeyRoles extends _i1.Mock implements _i5.MisskeyRoles { ), )), returnValueForMissingStub: - _i16.Future<_i5.RolesListResponse>.value(_FakeRolesListResponse_49( + _i17.Future<_i5.RolesListResponse>.value(_FakeRolesListResponse_50( this, Invocation.method( #show, [request], ), )), - ) as _i16.Future<_i5.RolesListResponse>); + ) as _i17.Future<_i5.RolesListResponse>); @override - _i16.Future> notes(_i5.RolesNotesRequest? request) => + _i17.Future> notes(_i5.RolesNotesRequest? request) => (super.noSuchMethod( Invocation.method( #notes, [request], ), - returnValue: _i16.Future>.value(<_i5.Note>[]), + returnValue: _i17.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Note>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Note>[]), + ) as _i17.Future>); } /// A class which mocks [MisskeyUsers]. @@ -4393,25 +4633,24 @@ class MockMisskeyUsers extends _i1.Mock implements _i5.MisskeyUsers { @override _i5.MisskeyUsersLists get list => (super.noSuchMethod( Invocation.getter(#list), - returnValue: _FakeMisskeyUsersLists_50( + returnValue: _FakeMisskeyUsersLists_51( this, Invocation.getter(#list), ), - returnValueForMissingStub: _FakeMisskeyUsersLists_50( + returnValueForMissingStub: _FakeMisskeyUsersLists_51( this, Invocation.getter(#list), ), ) as _i5.MisskeyUsersLists); @override - _i16.Future<_i5.UsersShowResponse> show(_i5.UsersShowRequest? request) => + _i17.Future<_i5.UserDetailed> show(_i5.UsersShowRequest? request) => (super.noSuchMethod( Invocation.method( #show, [request], ), - returnValue: - _i16.Future<_i5.UsersShowResponse>.value(_FakeUsersShowResponse_51( + returnValue: _i17.Future<_i5.UserDetailed>.value(_FakeUserDetailed_52( this, Invocation.method( #show, @@ -4419,40 +4658,38 @@ class MockMisskeyUsers extends _i1.Mock implements _i5.MisskeyUsers { ), )), returnValueForMissingStub: - _i16.Future<_i5.UsersShowResponse>.value(_FakeUsersShowResponse_51( + _i17.Future<_i5.UserDetailed>.value(_FakeUserDetailed_52( this, Invocation.method( #show, [request], ), )), - ) as _i16.Future<_i5.UsersShowResponse>); + ) as _i17.Future<_i5.UserDetailed>); @override - _i16.Future> showByIds( + _i17.Future> showByIds( _i5.UsersShowByIdsRequest? request) => (super.noSuchMethod( Invocation.method( #showByIds, [request], ), - returnValue: _i16.Future>.value( - <_i5.UsersShowResponse>[]), + returnValue: + _i17.Future>.value(<_i5.UserDetailed>[]), returnValueForMissingStub: - _i16.Future>.value( - <_i5.UsersShowResponse>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.UserDetailed>[]), + ) as _i17.Future>); @override - _i16.Future<_i5.UsersShowResponse> showByName( + _i17.Future<_i5.UserDetailed> showByName( _i5.UsersShowByUserNameRequest? request) => (super.noSuchMethod( Invocation.method( #showByName, [request], ), - returnValue: - _i16.Future<_i5.UsersShowResponse>.value(_FakeUsersShowResponse_51( + returnValue: _i17.Future<_i5.UserDetailed>.value(_FakeUserDetailed_52( this, Invocation.method( #showByName, @@ -4460,41 +4697,41 @@ class MockMisskeyUsers extends _i1.Mock implements _i5.MisskeyUsers { ), )), returnValueForMissingStub: - _i16.Future<_i5.UsersShowResponse>.value(_FakeUsersShowResponse_51( + _i17.Future<_i5.UserDetailed>.value(_FakeUserDetailed_52( this, Invocation.method( #showByName, [request], ), )), - ) as _i16.Future<_i5.UsersShowResponse>); + ) as _i17.Future<_i5.UserDetailed>); @override - _i16.Future> notes(_i5.UsersNotesRequest? request) => + _i17.Future> notes(_i5.UsersNotesRequest? request) => (super.noSuchMethod( Invocation.method( #notes, [request], ), - returnValue: _i16.Future>.value(<_i5.Note>[]), + returnValue: _i17.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Note>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Note>[]), + ) as _i17.Future>); @override - _i16.Future> clips(_i5.UsersClipsRequest? request) => + _i17.Future> clips(_i5.UsersClipsRequest? request) => (super.noSuchMethod( Invocation.method( #clips, [request], ), - returnValue: _i16.Future>.value(<_i5.Clip>[]), + returnValue: _i17.Future>.value(<_i5.Clip>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Clip>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Clip>[]), + ) as _i17.Future>); @override - _i16.Future> followers( + _i17.Future> followers( _i5.UsersFollowersRequest? request) => (super.noSuchMethod( Invocation.method( @@ -4502,13 +4739,13 @@ class MockMisskeyUsers extends _i1.Mock implements _i5.MisskeyUsers { [request], ), returnValue: - _i16.Future>.value(<_i5.Following>[]), + _i17.Future>.value(<_i5.Following>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Following>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Following>[]), + ) as _i17.Future>); @override - _i16.Future> following( + _i17.Future> following( _i5.UsersFollowingRequest? request) => (super.noSuchMethod( Invocation.method( @@ -4516,121 +4753,123 @@ class MockMisskeyUsers extends _i1.Mock implements _i5.MisskeyUsers { [request], ), returnValue: - _i16.Future>.value(<_i5.Following>[]), + _i17.Future>.value(<_i5.Following>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Following>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Following>[]), + ) as _i17.Future>); @override - _i16.Future reportAbuse(_i5.UsersReportAbuseRequest? request) => + _i17.Future reportAbuse(_i5.UsersReportAbuseRequest? request) => (super.noSuchMethod( Invocation.method( #reportAbuse, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future> reactions( + _i17.Future> reactions( _i5.UsersReactionsRequest? request) => (super.noSuchMethod( Invocation.method( #reactions, [request], ), - returnValue: _i16.Future>.value( + returnValue: _i17.Future>.value( <_i5.UsersReactionsResponse>[]), returnValueForMissingStub: - _i16.Future>.value( + _i17.Future>.value( <_i5.UsersReactionsResponse>[]), - ) as _i16.Future>); + ) as _i17.Future>); @override - _i16.Future> search(_i5.UsersSearchRequest? request) => + _i17.Future> search(_i5.UsersSearchRequest? request) => (super.noSuchMethod( Invocation.method( #search, [request], ), - returnValue: _i16.Future>.value(<_i5.User>[]), + returnValue: _i17.Future>.value(<_i5.User>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.User>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.User>[]), + ) as _i17.Future>); @override - _i16.Future> recommendation( + _i17.Future> recommendation( _i5.UsersRecommendationRequest? request) => (super.noSuchMethod( Invocation.method( #recommendation, [request], ), - returnValue: _i16.Future>.value(<_i5.User>[]), + returnValue: _i17.Future>.value(<_i5.User>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.User>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.User>[]), + ) as _i17.Future>); @override - _i16.Future> users(_i5.UsersUsersRequest? request) => + _i17.Future> users( + _i5.UsersUsersRequest? request) => (super.noSuchMethod( Invocation.method( #users, [request], ), - returnValue: _i16.Future>.value(<_i5.User>[]), + returnValue: + _i17.Future>.value(<_i5.UserDetailed>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.User>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.UserDetailed>[]), + ) as _i17.Future>); @override - _i16.Future updateMemo(_i5.UsersUpdateMemoRequest? request) => + _i17.Future updateMemo(_i5.UsersUpdateMemoRequest? request) => (super.noSuchMethod( Invocation.method( #updateMemo, [request], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future> flashs(_i5.UsersFlashsRequest? request) => + _i17.Future> flashs(_i5.UsersFlashsRequest? request) => (super.noSuchMethod( Invocation.method( #flashs, [request], ), - returnValue: _i16.Future>.value(<_i5.Flash>[]), + returnValue: _i17.Future>.value(<_i5.Flash>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Flash>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Flash>[]), + ) as _i17.Future>); @override - _i16.Future> featuredNotes( + _i17.Future> featuredNotes( _i5.UsersFeaturedNotesRequest? request) => (super.noSuchMethod( Invocation.method( #featuredNotes, [request], ), - returnValue: _i16.Future>.value(<_i5.Note>[]), + returnValue: _i17.Future>.value(<_i5.Note>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Note>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Note>[]), + ) as _i17.Future>); @override - _i16.Future> pages(_i5.UsersPagesRequest? request) => + _i17.Future> pages(_i5.UsersPagesRequest? request) => (super.noSuchMethod( Invocation.method( #pages, [request], ), - returnValue: _i16.Future>.value(<_i5.Page>[]), + returnValue: _i17.Future>.value(<_i5.Page>[]), returnValueForMissingStub: - _i16.Future>.value(<_i5.Page>[]), - ) as _i16.Future>); + _i17.Future>.value(<_i5.Page>[]), + ) as _i17.Future>); } /// A class which mocks [Dio]. @@ -4640,11 +4879,11 @@ class MockDio extends _i1.Mock implements _i10.Dio { @override _i10.BaseOptions get options => (super.noSuchMethod( Invocation.getter(#options), - returnValue: _FakeBaseOptions_52( + returnValue: _FakeBaseOptions_53( this, Invocation.getter(#options), ), - returnValueForMissingStub: _FakeBaseOptions_52( + returnValueForMissingStub: _FakeBaseOptions_53( this, Invocation.getter(#options), ), @@ -4662,11 +4901,11 @@ class MockDio extends _i1.Mock implements _i10.Dio { @override _i10.HttpClientAdapter get httpClientAdapter => (super.noSuchMethod( Invocation.getter(#httpClientAdapter), - returnValue: _FakeHttpClientAdapter_53( + returnValue: _FakeHttpClientAdapter_54( this, Invocation.getter(#httpClientAdapter), ), - returnValueForMissingStub: _FakeHttpClientAdapter_53( + returnValueForMissingStub: _FakeHttpClientAdapter_54( this, Invocation.getter(#httpClientAdapter), ), @@ -4685,11 +4924,11 @@ class MockDio extends _i1.Mock implements _i10.Dio { @override _i10.Transformer get transformer => (super.noSuchMethod( Invocation.getter(#transformer), - returnValue: _FakeTransformer_54( + returnValue: _FakeTransformer_55( this, Invocation.getter(#transformer), ), - returnValueForMissingStub: _FakeTransformer_54( + returnValueForMissingStub: _FakeTransformer_55( this, Invocation.getter(#transformer), ), @@ -4707,11 +4946,11 @@ class MockDio extends _i1.Mock implements _i10.Dio { @override _i10.Interceptors get interceptors => (super.noSuchMethod( Invocation.getter(#interceptors), - returnValue: _FakeInterceptors_55( + returnValue: _FakeInterceptors_56( this, Invocation.getter(#interceptors), ), - returnValueForMissingStub: _FakeInterceptors_55( + returnValueForMissingStub: _FakeInterceptors_56( this, Invocation.getter(#interceptors), ), @@ -4728,7 +4967,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ); @override - _i16.Future<_i10.Response> head( + _i17.Future<_i10.Response> head( String? path, { Object? data, Map? queryParameters, @@ -4746,7 +4985,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { #cancelToken: cancelToken, }, ), - returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_56( + returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #head, @@ -4760,7 +4999,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i16.Future<_i10.Response>.value(_FakeResponse_56( + _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #head, @@ -4773,10 +5012,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i16.Future<_i10.Response>); + ) as _i17.Future<_i10.Response>); @override - _i16.Future<_i10.Response> headUri( + _i17.Future<_i10.Response> headUri( Uri? uri, { Object? data, _i10.Options? options, @@ -4792,7 +5031,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { #cancelToken: cancelToken, }, ), - returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_56( + returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #headUri, @@ -4805,7 +5044,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i16.Future<_i10.Response>.value(_FakeResponse_56( + _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #headUri, @@ -4817,10 +5056,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i16.Future<_i10.Response>); + ) as _i17.Future<_i10.Response>); @override - _i16.Future<_i10.Response> get( + _i17.Future<_i10.Response> get( String? path, { Object? data, Map? queryParameters, @@ -4840,7 +5079,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { #onReceiveProgress: onReceiveProgress, }, ), - returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_56( + returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #get, @@ -4855,7 +5094,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i16.Future<_i10.Response>.value(_FakeResponse_56( + _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #get, @@ -4869,10 +5108,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i16.Future<_i10.Response>); + ) as _i17.Future<_i10.Response>); @override - _i16.Future<_i10.Response> getUri( + _i17.Future<_i10.Response> getUri( Uri? uri, { Object? data, _i10.Options? options, @@ -4890,7 +5129,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { #onReceiveProgress: onReceiveProgress, }, ), - returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_56( + returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #getUri, @@ -4904,7 +5143,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i16.Future<_i10.Response>.value(_FakeResponse_56( + _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #getUri, @@ -4917,10 +5156,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i16.Future<_i10.Response>); + ) as _i17.Future<_i10.Response>); @override - _i16.Future<_i10.Response> post( + _i17.Future<_i10.Response> post( String? path, { Object? data, Map? queryParameters, @@ -4942,7 +5181,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { #onReceiveProgress: onReceiveProgress, }, ), - returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_56( + returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #post, @@ -4958,7 +5197,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i16.Future<_i10.Response>.value(_FakeResponse_56( + _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #post, @@ -4973,10 +5212,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i16.Future<_i10.Response>); + ) as _i17.Future<_i10.Response>); @override - _i16.Future<_i10.Response> postUri( + _i17.Future<_i10.Response> postUri( Uri? uri, { Object? data, _i10.Options? options, @@ -4996,7 +5235,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { #onReceiveProgress: onReceiveProgress, }, ), - returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_56( + returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #postUri, @@ -5011,7 +5250,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i16.Future<_i10.Response>.value(_FakeResponse_56( + _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #postUri, @@ -5025,10 +5264,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i16.Future<_i10.Response>); + ) as _i17.Future<_i10.Response>); @override - _i16.Future<_i10.Response> put( + _i17.Future<_i10.Response> put( String? path, { Object? data, Map? queryParameters, @@ -5050,7 +5289,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { #onReceiveProgress: onReceiveProgress, }, ), - returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_56( + returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #put, @@ -5066,7 +5305,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i16.Future<_i10.Response>.value(_FakeResponse_56( + _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #put, @@ -5081,10 +5320,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i16.Future<_i10.Response>); + ) as _i17.Future<_i10.Response>); @override - _i16.Future<_i10.Response> putUri( + _i17.Future<_i10.Response> putUri( Uri? uri, { Object? data, _i10.Options? options, @@ -5104,7 +5343,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { #onReceiveProgress: onReceiveProgress, }, ), - returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_56( + returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #putUri, @@ -5119,7 +5358,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i16.Future<_i10.Response>.value(_FakeResponse_56( + _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #putUri, @@ -5133,10 +5372,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i16.Future<_i10.Response>); + ) as _i17.Future<_i10.Response>); @override - _i16.Future<_i10.Response> patch( + _i17.Future<_i10.Response> patch( String? path, { Object? data, Map? queryParameters, @@ -5158,7 +5397,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { #onReceiveProgress: onReceiveProgress, }, ), - returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_56( + returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #patch, @@ -5174,7 +5413,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i16.Future<_i10.Response>.value(_FakeResponse_56( + _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #patch, @@ -5189,10 +5428,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i16.Future<_i10.Response>); + ) as _i17.Future<_i10.Response>); @override - _i16.Future<_i10.Response> patchUri( + _i17.Future<_i10.Response> patchUri( Uri? uri, { Object? data, _i10.Options? options, @@ -5212,7 +5451,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { #onReceiveProgress: onReceiveProgress, }, ), - returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_56( + returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #patchUri, @@ -5227,7 +5466,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i16.Future<_i10.Response>.value(_FakeResponse_56( + _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #patchUri, @@ -5241,10 +5480,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i16.Future<_i10.Response>); + ) as _i17.Future<_i10.Response>); @override - _i16.Future<_i10.Response> delete( + _i17.Future<_i10.Response> delete( String? path, { Object? data, Map? queryParameters, @@ -5262,7 +5501,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { #cancelToken: cancelToken, }, ), - returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_56( + returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #delete, @@ -5276,7 +5515,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i16.Future<_i10.Response>.value(_FakeResponse_56( + _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #delete, @@ -5289,10 +5528,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i16.Future<_i10.Response>); + ) as _i17.Future<_i10.Response>); @override - _i16.Future<_i10.Response> deleteUri( + _i17.Future<_i10.Response> deleteUri( Uri? uri, { Object? data, _i10.Options? options, @@ -5308,7 +5547,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { #cancelToken: cancelToken, }, ), - returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_56( + returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #deleteUri, @@ -5321,7 +5560,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i16.Future<_i10.Response>.value(_FakeResponse_56( + _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #deleteUri, @@ -5333,10 +5572,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i16.Future<_i10.Response>); + ) as _i17.Future<_i10.Response>); @override - _i16.Future<_i10.Response> download( + _i17.Future<_i10.Response> download( String? urlPath, dynamic savePath, { _i10.ProgressCallback? onReceiveProgress, @@ -5365,7 +5604,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), returnValue: - _i16.Future<_i10.Response>.value(_FakeResponse_56( + _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #download, @@ -5385,7 +5624,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i16.Future<_i10.Response>.value(_FakeResponse_56( + _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #download, @@ -5404,10 +5643,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i16.Future<_i10.Response>); + ) as _i17.Future<_i10.Response>); @override - _i16.Future<_i10.Response> downloadUri( + _i17.Future<_i10.Response> downloadUri( Uri? uri, dynamic savePath, { _i10.ProgressCallback? onReceiveProgress, @@ -5434,7 +5673,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), returnValue: - _i16.Future<_i10.Response>.value(_FakeResponse_56( + _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #downloadUri, @@ -5453,7 +5692,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i16.Future<_i10.Response>.value(_FakeResponse_56( + _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #downloadUri, @@ -5471,10 +5710,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i16.Future<_i10.Response>); + ) as _i17.Future<_i10.Response>); @override - _i16.Future<_i10.Response> request( + _i17.Future<_i10.Response> request( String? url, { Object? data, Map? queryParameters, @@ -5496,7 +5735,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { #onReceiveProgress: onReceiveProgress, }, ), - returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_56( + returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #request, @@ -5512,7 +5751,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i16.Future<_i10.Response>.value(_FakeResponse_56( + _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #request, @@ -5527,10 +5766,10 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i16.Future<_i10.Response>); + ) as _i17.Future<_i10.Response>); @override - _i16.Future<_i10.Response> requestUri( + _i17.Future<_i10.Response> requestUri( Uri? uri, { Object? data, _i10.CancelToken? cancelToken, @@ -5550,7 +5789,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { #onReceiveProgress: onReceiveProgress, }, ), - returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_56( + returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #requestUri, @@ -5565,7 +5804,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i16.Future<_i10.Response>.value(_FakeResponse_56( + _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #requestUri, @@ -5579,16 +5818,16 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), - ) as _i16.Future<_i10.Response>); + ) as _i17.Future<_i10.Response>); @override - _i16.Future<_i10.Response> fetch(_i10.RequestOptions? requestOptions) => + _i17.Future<_i10.Response> fetch(_i10.RequestOptions? requestOptions) => (super.noSuchMethod( Invocation.method( #fetch, [requestOptions], ), - returnValue: _i16.Future<_i10.Response>.value(_FakeResponse_56( + returnValue: _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #fetch, @@ -5596,14 +5835,14 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), returnValueForMissingStub: - _i16.Future<_i10.Response>.value(_FakeResponse_56( + _i17.Future<_i10.Response>.value(_FakeResponse_57( this, Invocation.method( #fetch, [requestOptions], ), )), - ) as _i16.Future<_i10.Response>); + ) as _i17.Future<_i10.Response>); } /// A class which mocks [HttpClient]. @@ -5613,11 +5852,11 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { @override Duration get idleTimeout => (super.noSuchMethod( Invocation.getter(#idleTimeout), - returnValue: _FakeDuration_57( + returnValue: _FakeDuration_58( this, Invocation.getter(#idleTimeout), ), - returnValueForMissingStub: _FakeDuration_57( + returnValueForMissingStub: _FakeDuration_58( this, Invocation.getter(#idleTimeout), ), @@ -5677,7 +5916,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { @override set authenticate( - _i16.Future Function( + _i17.Future Function( Uri, String, String?, @@ -5692,7 +5931,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { @override set connectionFactory( - _i16.Future<_i11.ConnectionTask<_i11.Socket>> Function( + _i17.Future<_i11.ConnectionTask<_i11.Socket>> Function( Uri, String?, int?, @@ -5716,7 +5955,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { @override set authenticateProxy( - _i16.Future Function( + _i17.Future Function( String, int, String, @@ -5755,7 +5994,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ); @override - _i16.Future<_i11.HttpClientRequest> open( + _i17.Future<_i11.HttpClientRequest> open( String? method, String? host, int? port, @@ -5772,7 +6011,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), returnValue: - _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_58( + _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #open, @@ -5785,7 +6024,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ), )), returnValueForMissingStub: - _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_58( + _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #open, @@ -5797,10 +6036,10 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), )), - ) as _i16.Future<_i11.HttpClientRequest>); + ) as _i17.Future<_i11.HttpClientRequest>); @override - _i16.Future<_i11.HttpClientRequest> openUrl( + _i17.Future<_i11.HttpClientRequest> openUrl( String? method, Uri? url, ) => @@ -5813,7 +6052,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), returnValue: - _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_58( + _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #openUrl, @@ -5824,7 +6063,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ), )), returnValueForMissingStub: - _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_58( + _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #openUrl, @@ -5834,10 +6073,10 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), )), - ) as _i16.Future<_i11.HttpClientRequest>); + ) as _i17.Future<_i11.HttpClientRequest>); @override - _i16.Future<_i11.HttpClientRequest> get( + _i17.Future<_i11.HttpClientRequest> get( String? host, int? port, String? path, @@ -5852,7 +6091,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), returnValue: - _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_58( + _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #get, @@ -5864,7 +6103,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ), )), returnValueForMissingStub: - _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_58( + _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #get, @@ -5875,16 +6114,16 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), )), - ) as _i16.Future<_i11.HttpClientRequest>); + ) as _i17.Future<_i11.HttpClientRequest>); @override - _i16.Future<_i11.HttpClientRequest> getUrl(Uri? url) => (super.noSuchMethod( + _i17.Future<_i11.HttpClientRequest> getUrl(Uri? url) => (super.noSuchMethod( Invocation.method( #getUrl, [url], ), returnValue: - _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_58( + _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #getUrl, @@ -5892,17 +6131,17 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ), )), returnValueForMissingStub: - _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_58( + _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #getUrl, [url], ), )), - ) as _i16.Future<_i11.HttpClientRequest>); + ) as _i17.Future<_i11.HttpClientRequest>); @override - _i16.Future<_i11.HttpClientRequest> post( + _i17.Future<_i11.HttpClientRequest> post( String? host, int? port, String? path, @@ -5917,7 +6156,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), returnValue: - _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_58( + _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #post, @@ -5929,7 +6168,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ), )), returnValueForMissingStub: - _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_58( + _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #post, @@ -5940,16 +6179,16 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), )), - ) as _i16.Future<_i11.HttpClientRequest>); + ) as _i17.Future<_i11.HttpClientRequest>); @override - _i16.Future<_i11.HttpClientRequest> postUrl(Uri? url) => (super.noSuchMethod( + _i17.Future<_i11.HttpClientRequest> postUrl(Uri? url) => (super.noSuchMethod( Invocation.method( #postUrl, [url], ), returnValue: - _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_58( + _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #postUrl, @@ -5957,17 +6196,17 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ), )), returnValueForMissingStub: - _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_58( + _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #postUrl, [url], ), )), - ) as _i16.Future<_i11.HttpClientRequest>); + ) as _i17.Future<_i11.HttpClientRequest>); @override - _i16.Future<_i11.HttpClientRequest> put( + _i17.Future<_i11.HttpClientRequest> put( String? host, int? port, String? path, @@ -5982,7 +6221,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), returnValue: - _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_58( + _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #put, @@ -5994,7 +6233,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ), )), returnValueForMissingStub: - _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_58( + _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #put, @@ -6005,16 +6244,16 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), )), - ) as _i16.Future<_i11.HttpClientRequest>); + ) as _i17.Future<_i11.HttpClientRequest>); @override - _i16.Future<_i11.HttpClientRequest> putUrl(Uri? url) => (super.noSuchMethod( + _i17.Future<_i11.HttpClientRequest> putUrl(Uri? url) => (super.noSuchMethod( Invocation.method( #putUrl, [url], ), returnValue: - _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_58( + _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #putUrl, @@ -6022,17 +6261,17 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ), )), returnValueForMissingStub: - _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_58( + _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #putUrl, [url], ), )), - ) as _i16.Future<_i11.HttpClientRequest>); + ) as _i17.Future<_i11.HttpClientRequest>); @override - _i16.Future<_i11.HttpClientRequest> delete( + _i17.Future<_i11.HttpClientRequest> delete( String? host, int? port, String? path, @@ -6047,7 +6286,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), returnValue: - _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_58( + _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #delete, @@ -6059,7 +6298,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ), )), returnValueForMissingStub: - _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_58( + _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #delete, @@ -6070,17 +6309,17 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), )), - ) as _i16.Future<_i11.HttpClientRequest>); + ) as _i17.Future<_i11.HttpClientRequest>); @override - _i16.Future<_i11.HttpClientRequest> deleteUrl(Uri? url) => + _i17.Future<_i11.HttpClientRequest> deleteUrl(Uri? url) => (super.noSuchMethod( Invocation.method( #deleteUrl, [url], ), returnValue: - _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_58( + _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #deleteUrl, @@ -6088,17 +6327,17 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ), )), returnValueForMissingStub: - _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_58( + _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #deleteUrl, [url], ), )), - ) as _i16.Future<_i11.HttpClientRequest>); + ) as _i17.Future<_i11.HttpClientRequest>); @override - _i16.Future<_i11.HttpClientRequest> patch( + _i17.Future<_i11.HttpClientRequest> patch( String? host, int? port, String? path, @@ -6113,7 +6352,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), returnValue: - _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_58( + _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #patch, @@ -6125,7 +6364,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ), )), returnValueForMissingStub: - _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_58( + _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #patch, @@ -6136,16 +6375,16 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), )), - ) as _i16.Future<_i11.HttpClientRequest>); + ) as _i17.Future<_i11.HttpClientRequest>); @override - _i16.Future<_i11.HttpClientRequest> patchUrl(Uri? url) => (super.noSuchMethod( + _i17.Future<_i11.HttpClientRequest> patchUrl(Uri? url) => (super.noSuchMethod( Invocation.method( #patchUrl, [url], ), returnValue: - _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_58( + _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #patchUrl, @@ -6153,17 +6392,17 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ), )), returnValueForMissingStub: - _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_58( + _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #patchUrl, [url], ), )), - ) as _i16.Future<_i11.HttpClientRequest>); + ) as _i17.Future<_i11.HttpClientRequest>); @override - _i16.Future<_i11.HttpClientRequest> head( + _i17.Future<_i11.HttpClientRequest> head( String? host, int? port, String? path, @@ -6178,7 +6417,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), returnValue: - _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_58( + _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #head, @@ -6190,7 +6429,7 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ), )), returnValueForMissingStub: - _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_58( + _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #head, @@ -6201,16 +6440,16 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ], ), )), - ) as _i16.Future<_i11.HttpClientRequest>); + ) as _i17.Future<_i11.HttpClientRequest>); @override - _i16.Future<_i11.HttpClientRequest> headUrl(Uri? url) => (super.noSuchMethod( + _i17.Future<_i11.HttpClientRequest> headUrl(Uri? url) => (super.noSuchMethod( Invocation.method( #headUrl, [url], ), returnValue: - _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_58( + _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #headUrl, @@ -6218,14 +6457,14 @@ class MockHttpClient extends _i1.Mock implements _i11.HttpClient { ), )), returnValueForMissingStub: - _i16.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_58( + _i17.Future<_i11.HttpClientRequest>.value(_FakeHttpClientRequest_59( this, Invocation.method( #headUrl, [url], ), )), - ) as _i16.Future<_i11.HttpClientRequest>); + ) as _i17.Future<_i11.HttpClientRequest>); @override void addCredentials( @@ -6301,11 +6540,11 @@ class MockSocketController extends _i1.Mock implements _i5.SocketController { ) as String); @override - _i27.Channel get channel => (super.noSuchMethod( + _i28.Channel get channel => (super.noSuchMethod( Invocation.getter(#channel), - returnValue: _i27.Channel.homeTimeline, - returnValueForMissingStub: _i27.Channel.homeTimeline, - ) as _i27.Channel); + returnValue: _i28.Channel.homeTimeline, + returnValueForMissingStub: _i28.Channel.homeTimeline, + ) as _i28.Channel); @override bool get isDisconnected => (super.noSuchMethod( @@ -6323,6 +6562,19 @@ 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( @@ -6351,27 +6603,27 @@ class MockSocketController extends _i1.Mock implements _i5.SocketController { ); @override - _i16.Future subNote(String? noteId) => (super.noSuchMethod( + _i17.Future subNote(String? noteId) => (super.noSuchMethod( Invocation.method( #subNote, [noteId], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future unsubNote(String? noteId) => (super.noSuchMethod( + _i17.Future unsubNote(String? noteId) => (super.noSuchMethod( Invocation.method( #unsubNote, [noteId], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future requestLog({ + _i17.Future requestLog({ String? id, int? length, }) => @@ -6384,14 +6636,14 @@ class MockSocketController extends _i1.Mock implements _i5.SocketController { #length: length, }, ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future send( + _i17.Future send( _i5.StreamingRequestType? requestType, - _i28.StreamingRequestBody? body, + _i29.StreamingRequestBody? body, ) => (super.noSuchMethod( Invocation.method( @@ -6401,9 +6653,9 @@ class MockSocketController extends _i1.Mock implements _i5.SocketController { body, ], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); } /// A class which mocks [StreamingService]. @@ -6418,23 +6670,23 @@ class MockStreamingService extends _i1.Mock implements _i5.StreamingService { ) as String); @override - _i29.HashMap get streamingChannelControllers => + _i30.HashMap get streamingChannelControllers => (super.noSuchMethod( Invocation.getter(#streamingChannelControllers), returnValue: - _i30.dummyValue<_i29.HashMap>( + _i31.dummyValue<_i30.HashMap>( this, Invocation.getter(#streamingChannelControllers), ), returnValueForMissingStub: - _i30.dummyValue<_i29.HashMap>( + _i31.dummyValue<_i30.HashMap>( this, Invocation.getter(#streamingChannelControllers), ), - ) as _i29.HashMap); + ) as _i30.HashMap); @override - set subscription(_i16.StreamSubscription? _subscription) => + set subscription(_i17.StreamSubscription? _subscription) => super.noSuchMethod( Invocation.setter( #subscription, @@ -6444,9 +6696,22 @@ class MockStreamingService extends _i1.Mock implements _i5.StreamingService { ); @override - _i16.Future onChannelEventReceived( + _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( String? id, - _i31.ChannelEventType? type, + _i32.ChannelEventType? type, dynamic body, ) => (super.noSuchMethod( @@ -6458,14 +6723,14 @@ class MockStreamingService extends _i1.Mock implements _i5.StreamingService { body, ], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future onNoteUpdatedEventReceived( + _i17.Future onNoteUpdatedEventReceived( String? id, - _i32.NoteUpdatedEventType? type, + _i33.NoteUpdatedEventType? type, Map? body, ) => (super.noSuchMethod( @@ -6477,13 +6742,13 @@ class MockStreamingService extends _i1.Mock implements _i5.StreamingService { body, ], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future onBroadcastEventReceived( - _i33.BroadcastEventType? type, + _i17.Future onBroadcastEventReceived( + _i34.BroadcastEventType? type, Map? body, ) => (super.noSuchMethod( @@ -6494,35 +6759,35 @@ class MockStreamingService extends _i1.Mock implements _i5.StreamingService { body, ], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future startStreaming() => (super.noSuchMethod( + _i17.Future startStreaming() => (super.noSuchMethod( Invocation.method( #startStreaming, [], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override _i5.SocketController connect({ String? id, - required _i27.Channel? channel, - _i16.Future Function( - _i31.ChannelEventType, + required _i28.Channel? channel, + _i17.Future Function( + _i32.ChannelEventType, dynamic, )? onChannelEventReceived, - _i16.Future Function( + _i17.Future Function( String, - _i32.NoteUpdatedEventType, + _i33.NoteUpdatedEventType, Map, )? onNoteUpdatedEventReceived, - _i16.Future Function( - _i33.BroadcastEventType, + _i17.Future Function( + _i34.BroadcastEventType, Map, )? onBroadcastEventReceived, Map? parameters, @@ -6573,38 +6838,38 @@ class MockStreamingService extends _i1.Mock implements _i5.StreamingService { ) as _i5.SocketController); @override - _i16.Future close() => (super.noSuchMethod( + _i17.Future close() => (super.noSuchMethod( Invocation.method( #close, [], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future restart() => (super.noSuchMethod( + _i17.Future restart() => (super.noSuchMethod( Invocation.method( #restart, [], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); } /// A class which mocks [FakeFilePickerPlatform]. /// /// See the documentation for Mockito's code generation for more information. class MockFilePickerPlatform extends _i1.Mock - implements _i34.FakeFilePickerPlatform { + implements _i35.FakeFilePickerPlatform { @override - _i16.Future<_i35.FilePickerResult?> pickFiles({ + _i17.Future<_i36.FilePickerResult?> pickFiles({ String? dialogTitle, String? initialDirectory, - _i35.FileType? type = _i35.FileType.any, + _i36.FileType? type = _i36.FileType.any, List? allowedExtensions, - dynamic Function(_i35.FilePickerStatus)? onFileLoading, + dynamic Function(_i36.FilePickerStatus)? onFileLoading, bool? allowCompression = true, bool? allowMultiple = false, bool? withData = false, @@ -6628,22 +6893,22 @@ class MockFilePickerPlatform extends _i1.Mock #lockParentWindow: lockParentWindow, }, ), - returnValue: _i16.Future<_i35.FilePickerResult?>.value(), - returnValueForMissingStub: _i16.Future<_i35.FilePickerResult?>.value(), - ) as _i16.Future<_i35.FilePickerResult?>); + returnValue: _i17.Future<_i36.FilePickerResult?>.value(), + returnValueForMissingStub: _i17.Future<_i36.FilePickerResult?>.value(), + ) as _i17.Future<_i36.FilePickerResult?>); @override - _i16.Future clearTemporaryFiles() => (super.noSuchMethod( + _i17.Future clearTemporaryFiles() => (super.noSuchMethod( Invocation.method( #clearTemporaryFiles, [], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future getDirectoryPath({ + _i17.Future getDirectoryPath({ String? dialogTitle, bool? lockParentWindow = false, String? initialDirectory, @@ -6658,16 +6923,16 @@ class MockFilePickerPlatform extends _i1.Mock #initialDirectory: initialDirectory, }, ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future saveFile({ + _i17.Future saveFile({ String? dialogTitle, String? fileName, String? initialDirectory, - _i35.FileType? type = _i35.FileType.any, + _i36.FileType? type = _i36.FileType.any, List? allowedExtensions, bool? lockParentWindow = false, }) => @@ -6684,18 +6949,18 @@ class MockFilePickerPlatform extends _i1.Mock #lockParentWindow: lockParentWindow, }, ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); } /// A class which mocks [$MockBaseCacheManager]. /// /// See the documentation for Mockito's code generation for more information. class MockBaseCacheManager extends _i1.Mock - implements _i34.$MockBaseCacheManager { + implements _i35.$MockBaseCacheManager { @override - _i16.Future<_i12.File> getSingleFile( + _i17.Future<_i13.File> getSingleFile( String? url, { String? key, Map? headers, @@ -6709,7 +6974,7 @@ class MockBaseCacheManager extends _i1.Mock #headers: headers, }, ), - returnValue: _i16.Future<_i12.File>.value(_FakeFile_59( + returnValue: _i17.Future<_i13.File>.value(_FakeFile_61( this, Invocation.method( #getSingleFile, @@ -6720,7 +6985,7 @@ class MockBaseCacheManager extends _i1.Mock }, ), )), - returnValueForMissingStub: _i16.Future<_i12.File>.value(_FakeFile_59( + returnValueForMissingStub: _i17.Future<_i13.File>.value(_FakeFile_61( this, Invocation.method( #getSingleFile, @@ -6731,10 +6996,10 @@ class MockBaseCacheManager extends _i1.Mock }, ), )), - ) as _i16.Future<_i12.File>); + ) as _i17.Future<_i13.File>); @override - _i16.Stream<_i13.FileInfo> getFile( + _i17.Stream<_i14.FileInfo> getFile( String? url, { String? key, Map? headers, @@ -6748,12 +7013,12 @@ class MockBaseCacheManager extends _i1.Mock #headers: headers, }, ), - returnValue: _i16.Stream<_i13.FileInfo>.empty(), - returnValueForMissingStub: _i16.Stream<_i13.FileInfo>.empty(), - ) as _i16.Stream<_i13.FileInfo>); + returnValue: _i17.Stream<_i14.FileInfo>.empty(), + returnValueForMissingStub: _i17.Stream<_i14.FileInfo>.empty(), + ) as _i17.Stream<_i14.FileInfo>); @override - _i16.Stream<_i13.FileResponse> getFileStream( + _i17.Stream<_i14.FileResponse> getFileStream( String? url, { String? key, Map? headers, @@ -6769,12 +7034,12 @@ class MockBaseCacheManager extends _i1.Mock #withProgress: withProgress, }, ), - returnValue: _i16.Stream<_i13.FileResponse>.empty(), - returnValueForMissingStub: _i16.Stream<_i13.FileResponse>.empty(), - ) as _i16.Stream<_i13.FileResponse>); + returnValue: _i17.Stream<_i14.FileResponse>.empty(), + returnValueForMissingStub: _i17.Stream<_i14.FileResponse>.empty(), + ) as _i17.Stream<_i14.FileResponse>); @override - _i16.Future<_i13.FileInfo> downloadFile( + _i17.Future<_i14.FileInfo> downloadFile( String? url, { String? key, Map? authHeaders, @@ -6790,7 +7055,7 @@ class MockBaseCacheManager extends _i1.Mock #force: force, }, ), - returnValue: _i16.Future<_i13.FileInfo>.value(_FakeFileInfo_60( + returnValue: _i17.Future<_i14.FileInfo>.value(_FakeFileInfo_62( this, Invocation.method( #downloadFile, @@ -6803,7 +7068,7 @@ class MockBaseCacheManager extends _i1.Mock ), )), returnValueForMissingStub: - _i16.Future<_i13.FileInfo>.value(_FakeFileInfo_60( + _i17.Future<_i14.FileInfo>.value(_FakeFileInfo_62( this, Invocation.method( #downloadFile, @@ -6815,10 +7080,10 @@ class MockBaseCacheManager extends _i1.Mock }, ), )), - ) as _i16.Future<_i13.FileInfo>); + ) as _i17.Future<_i14.FileInfo>); @override - _i16.Future<_i13.FileInfo?> getFileFromCache( + _i17.Future<_i14.FileInfo?> getFileFromCache( String? key, { bool? ignoreMemCache = false, }) => @@ -6828,25 +7093,25 @@ class MockBaseCacheManager extends _i1.Mock [key], {#ignoreMemCache: ignoreMemCache}, ), - returnValue: _i16.Future<_i13.FileInfo?>.value(), - returnValueForMissingStub: _i16.Future<_i13.FileInfo?>.value(), - ) as _i16.Future<_i13.FileInfo?>); + returnValue: _i17.Future<_i14.FileInfo?>.value(), + returnValueForMissingStub: _i17.Future<_i14.FileInfo?>.value(), + ) as _i17.Future<_i14.FileInfo?>); @override - _i16.Future<_i13.FileInfo?> getFileFromMemory(String? key) => + _i17.Future<_i14.FileInfo?> getFileFromMemory(String? key) => (super.noSuchMethod( Invocation.method( #getFileFromMemory, [key], ), - returnValue: _i16.Future<_i13.FileInfo?>.value(), - returnValueForMissingStub: _i16.Future<_i13.FileInfo?>.value(), - ) as _i16.Future<_i13.FileInfo?>); + returnValue: _i17.Future<_i14.FileInfo?>.value(), + returnValueForMissingStub: _i17.Future<_i14.FileInfo?>.value(), + ) as _i17.Future<_i14.FileInfo?>); @override - _i16.Future<_i12.File> putFile( + _i17.Future<_i13.File> putFile( String? url, - _i26.Uint8List? fileBytes, { + _i27.Uint8List? fileBytes, { String? key, String? eTag, Duration? maxAge = const Duration(days: 30), @@ -6866,7 +7131,7 @@ class MockBaseCacheManager extends _i1.Mock #fileExtension: fileExtension, }, ), - returnValue: _i16.Future<_i12.File>.value(_FakeFile_59( + returnValue: _i17.Future<_i13.File>.value(_FakeFile_61( this, Invocation.method( #putFile, @@ -6882,7 +7147,7 @@ class MockBaseCacheManager extends _i1.Mock }, ), )), - returnValueForMissingStub: _i16.Future<_i12.File>.value(_FakeFile_59( + returnValueForMissingStub: _i17.Future<_i13.File>.value(_FakeFile_61( this, Invocation.method( #putFile, @@ -6898,12 +7163,12 @@ class MockBaseCacheManager extends _i1.Mock }, ), )), - ) as _i16.Future<_i12.File>); + ) as _i17.Future<_i13.File>); @override - _i16.Future<_i12.File> putFileStream( + _i17.Future<_i13.File> putFileStream( String? url, - _i16.Stream>? source, { + _i17.Stream>? source, { String? key, String? eTag, Duration? maxAge = const Duration(days: 30), @@ -6923,7 +7188,7 @@ class MockBaseCacheManager extends _i1.Mock #fileExtension: fileExtension, }, ), - returnValue: _i16.Future<_i12.File>.value(_FakeFile_59( + returnValue: _i17.Future<_i13.File>.value(_FakeFile_61( this, Invocation.method( #putFileStream, @@ -6939,7 +7204,7 @@ class MockBaseCacheManager extends _i1.Mock }, ), )), - returnValueForMissingStub: _i16.Future<_i12.File>.value(_FakeFile_59( + returnValueForMissingStub: _i17.Future<_i13.File>.value(_FakeFile_61( this, Invocation.method( #putFileStream, @@ -6955,56 +7220,56 @@ class MockBaseCacheManager extends _i1.Mock }, ), )), - ) as _i16.Future<_i12.File>); + ) as _i17.Future<_i13.File>); @override - _i16.Future removeFile(String? key) => (super.noSuchMethod( + _i17.Future removeFile(String? key) => (super.noSuchMethod( Invocation.method( #removeFile, [key], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future emptyCache() => (super.noSuchMethod( + _i17.Future emptyCache() => (super.noSuchMethod( Invocation.method( #emptyCache, [], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future dispose() => (super.noSuchMethod( + _i17.Future dispose() => (super.noSuchMethod( Invocation.method( #dispose, [], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); } /// A class which mocks [$MockUrlLauncherPlatform]. /// /// See the documentation for Mockito's code generation for more information. class MockUrlLauncherPlatform extends _i1.Mock - implements _i34.$MockUrlLauncherPlatform { + implements _i35.$MockUrlLauncherPlatform { @override - _i16.Future canLaunch(String? url) => (super.noSuchMethod( + _i17.Future canLaunch(String? url) => (super.noSuchMethod( Invocation.method( #canLaunch, [url], ), - returnValue: _i16.Future.value(false), - returnValueForMissingStub: _i16.Future.value(false), - ) as _i16.Future); + returnValue: _i17.Future.value(false), + returnValueForMissingStub: _i17.Future.value(false), + ) as _i17.Future); @override - _i16.Future launch( + _i17.Future launch( String? url, { required bool? useSafariVC, required bool? useWebView, @@ -7028,14 +7293,14 @@ class MockUrlLauncherPlatform extends _i1.Mock #webOnlyWindowName: webOnlyWindowName, }, ), - returnValue: _i16.Future.value(false), - returnValueForMissingStub: _i16.Future.value(false), - ) as _i16.Future); + returnValue: _i17.Future.value(false), + returnValueForMissingStub: _i17.Future.value(false), + ) as _i17.Future); @override - _i16.Future launchUrl( + _i17.Future launchUrl( String? url, - _i36.LaunchOptions? options, + _i37.LaunchOptions? options, ) => (super.noSuchMethod( Invocation.method( @@ -7045,39 +7310,39 @@ class MockUrlLauncherPlatform extends _i1.Mock options, ], ), - returnValue: _i16.Future.value(false), - returnValueForMissingStub: _i16.Future.value(false), - ) as _i16.Future); + returnValue: _i17.Future.value(false), + returnValueForMissingStub: _i17.Future.value(false), + ) as _i17.Future); @override - _i16.Future closeWebView() => (super.noSuchMethod( + _i17.Future closeWebView() => (super.noSuchMethod( Invocation.method( #closeWebView, [], ), - returnValue: _i16.Future.value(), - returnValueForMissingStub: _i16.Future.value(), - ) as _i16.Future); + returnValue: _i17.Future.value(), + returnValueForMissingStub: _i17.Future.value(), + ) as _i17.Future); @override - _i16.Future supportsMode(_i36.PreferredLaunchMode? mode) => + _i17.Future supportsMode(_i37.PreferredLaunchMode? mode) => (super.noSuchMethod( Invocation.method( #supportsMode, [mode], ), - returnValue: _i16.Future.value(false), - returnValueForMissingStub: _i16.Future.value(false), - ) as _i16.Future); + returnValue: _i17.Future.value(false), + returnValueForMissingStub: _i17.Future.value(false), + ) as _i17.Future); @override - _i16.Future supportsCloseForMode(_i36.PreferredLaunchMode? mode) => + _i17.Future supportsCloseForMode(_i37.PreferredLaunchMode? mode) => (super.noSuchMethod( Invocation.method( #supportsCloseForMode, [mode], ), - returnValue: _i16.Future.value(false), - returnValueForMissingStub: _i16.Future.value(false), - ) as _i16.Future); + returnValue: _i17.Future.value(false), + returnValueForMissingStub: _i17.Future.value(false), + ) as _i17.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, ) ]);