shiosyakeyakini-info/misskey_dart#25 対応

shiosyakeyakini-info · Nov 26, 2023 · 956be3c · 956be3c
1 parent e0b4b79
commit 956be3c
Show file tree

Hide file tree

Showing 24 changed files with 1,569 additions and 1,318 deletions.
diff --git a/lib/extensions/users_show_response_extension.dart b/lib/extensions/users_show_response_extension.dart
diff --git 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<String, Object?> 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
@@ -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<String, dynamic> 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<String, dynamic> 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
diff --git a/lib/state_notifier/common/misskey_notes/misskey_note_notifier.dart b/lib/state_notifier/common/misskey_notes/misskey_note_notifier.dart
@@ -77,14 +77,12 @@ class MisskeyNoteNotifier extends FamilyNotifier<void, Account> {
     final host = user.host ?? _account.host;
 
     try {
-      final response =
-          await ref.read(misskeyProvider(account)).users.showByName(
-                UsersShowByUserNameRequest(
-                  userName: user.username,
-                  host: host,
-                ),
-              );
-      return response.toUser();
+      return ref.read(misskeyProvider(account)).users.showByName(
+            UsersShowByUserNameRequest(
+              userName: user.username,
+              host: host,
+            ),
+          );
     } catch (e) {
       // 最終手段として、連合で照会する
       // `users/show` で自動的に照会されるから必要ない
@@ -97,7 +95,7 @@ class MisskeyNoteNotifier extends FamilyNotifier<void, Account> {
               ),
             ),
           );
-      return UsersShowResponse.fromJson(response.object).toUser();
+      return UserDetailed.fromJson(response.object);
     }
   }
 

diff --git a/lib/state_notifier/note_create_page/note_create_state_notifier.dart b/lib/state_notifier/note_create_page/note_create_state_notifier.dart
@@ -181,6 +181,14 @@ class NoteCreateNotifier extends StateNotifier<NoteCreate> {
       }
       final deletedNoteChannel = note.channel;
 
+      final replyTo = <User>[];
+      if (note.mentions.isNotEmpty) {
+        replyTo.addAll(
+          await misskey.users
+              .showByIds(UsersShowByIdsRequest(userIds: note.mentions)),
+        );
+      }
+
       resultState = resultState.copyWith(
         noteVisibility: note.visibility,
         localOnly: note.localOnly,
@@ -193,11 +201,7 @@ class NoteCreateNotifier extends StateNotifier<NoteCreate> {
         isCw: note.cw?.isNotEmpty == true,
         text: note.text ?? "",
         reactionAcceptance: note.reactionAcceptance,
-        replyTo: [
-          for (final userId in note.mentions)
-            (await misskey.users.show(UsersShowRequest(userId: userId)))
-                .toUser()
-        ],
+        replyTo: replyTo.toList(),
         isVote: note.poll != null,
         isVoteMultiple: note.poll?.multiple ?? false,
         voteExpireType: note.poll?.expiresAt == null
@@ -223,6 +227,14 @@ class NoteCreateNotifier extends StateNotifier<NoteCreate> {
     }
 
     if (reply != null) {
+      final replyTo = <User>[];
+      if (reply.mentions.isNotEmpty) {
+        replyTo.addAll(
+          await misskey.users
+              .showByIds(UsersShowByIdsRequest(userIds: reply.mentions)),
+        );
+      }
+
       resultState = resultState.copyWith(
         reply: reply,
         noteVisibility:
@@ -231,9 +243,7 @@ class NoteCreateNotifier extends StateNotifier<NoteCreate> {
         isCw: reply.cw?.isNotEmpty == true,
         replyTo: [
           reply.user,
-          for (final userId in reply.mentions)
-            (await misskey.users.show(UsersShowRequest(userId: userId)))
-                .toUser()
+          ...replyTo,
         ]..removeWhere((element) => element.id == state.account.i.id),
       );
     }

diff --git a/lib/view/common/account_select_dialog.dart b/lib/view/common/account_select_dialog.dart
@@ -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
@@ -19,39 +19,6 @@ class AvatarIcon extends StatefulWidget {
     this.onTap,
   });
 
-  factory AvatarIcon.fromIResponse(IResponse response, {double height = 48}) {
-    return AvatarIcon(
-      user: User(
-        id: response.id,
-        username: response.username,
-        avatarUrl: response.avatarUrl,
-        avatarBlurhash: response.avatarBlurhash,
-        avatarDecorations: response.avatarDecorations,
-        isCat: response.isCat,
-        isBot: response.isBot,
-      ),
-      height: height,
-    );
-  }
-
-  factory AvatarIcon.fromUserResponse(
-    UsersShowResponse response, {
-    double height = 48,
-  }) {
-    return AvatarIcon(
-      user: User(
-        id: response.id,
-        username: response.username,
-        avatarUrl: response.avatarUrl,
-        avatarBlurhash: response.avatarBlurhash,
-        avatarDecorations: response.avatarDecorations,
-        isCat: response.isCat,
-        isBot: response.isBot,
-      ),
-      height: height,
-    );
-  }
-
   @override
   State<StatefulWidget> createState() => AvatarIconState();
 }

diff --git a/lib/view/common/common_drawer.dart b/lib/view/common/common_drawer.dart
@@ -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
@@ -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
@@ -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
@@ -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
@@ -68,7 +68,7 @@ class HardMutePageState extends ConsumerState<HardMutePage> {
       body: SingleChildScrollView(
         child: Padding(
           padding: const EdgeInsets.all(10),
-          child: CommonFuture<IResponse>(
+          child: CommonFuture<MeDetailed>(
             future: ref.read(misskeyProvider(widget.account)).i.i(),
             futureFinished: (data) {
               controller.text = muteValueString(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
@@ -48,7 +48,7 @@ class InstanceMutePageState extends ConsumerState<InstanceMutePage> {
       body: SingleChildScrollView(
         child: Padding(
           padding: const EdgeInsets.all(10),
-          child: CommonFuture<IResponse>(
+          child: CommonFuture<MeDetailed>(
             future: ref.read(misskeyProvider(widget.account)).i.i(),
             futureFinished: (data) {
               controller.text = data.mutedInstances.join("\n");

diff --git a/lib/view/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(