リアクション後にnotes/showを呼ばない

shiosyakeyakini-info · Nov 3, 2023 · 7680029 · 7680029
1 parent bf9cab0
commit 7680029
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 41 deletions.
diff --git a/lib/const.dart b/lib/const.dart
diff --git a/lib/repository/note_repository.dart b/lib/repository/note_repository.dart
@@ -127,6 +127,17 @@ class NoteRepository extends ChangeNotifier {
     );
   }
 
+  void addMyReaction(String noteId, String reaction) {
+    addReaction(
+      noteId,
+      TimelineReacted(
+        reaction: reaction,
+        emoji: null,
+        userId: account.i.id,
+      ),
+    );
+  }
+
   void removeReaction(String noteId, TimelineReacted reaction) {
     final registeredNote = _notes[noteId];
     if (registeredNote == null) return;
@@ -155,6 +166,20 @@ class NoteRepository extends ChangeNotifier {
     );
   }
 
+  void removeMyReaction(String noteId) {
+    final myReaction = _notes[noteId]?.myReaction;
+    if (myReaction == null) return;
+
+    removeReaction(
+      noteId,
+      TimelineReacted(
+        reaction: myReaction,
+        emoji: null,
+        userId: account.i.id,
+      ),
+    );
+  }
+
   void addVote(String noteId, TimelineVoted vote) {
     final registeredNote = _notes[noteId];
     if (registeredNote == null) return;

diff --git a/lib/view/common/misskey_notes/misskey_note.dart b/lib/view/common/misskey_notes/misskey_note.dart
@@ -6,7 +6,6 @@ import 'package:collection/collection.dart';
 import 'package:dotted_border/dotted_border.dart';
 import 'package:flutter/material.dart';
 import 'package:mfm_parser/mfm_parser.dart' as parser;
-import 'package:miria/const.dart';
 import 'package:miria/extensions/date_time_extension.dart';
 import 'package:miria/extensions/note_visibility_extension.dart';
 import 'package:miria/extensions/user_extension.dart';
@@ -783,11 +782,7 @@ class MisskeyNoteState extends ConsumerState<MisskeyNote> {
           .notes
           .reactions
           .delete(NotesReactionsDeleteRequest(noteId: displayNote.id));
-      if (account.host == "misskey.io") {
-        await Future.delayed(
-            const Duration(milliseconds: misskeyIOReactionDelay));
-      }
-      await ref.read(notesProvider(account)).refresh(displayNote.id);
+      ref.read(notesProvider(account)).removeMyReaction(displayNote.id);
       return;
     }
     final misskey = ref.read(misskeyProvider(account));
@@ -797,27 +792,32 @@ class MisskeyNoteState extends ConsumerState<MisskeyNote> {
       selectedEmoji = const UnicodeEmojiData(char: '❤️');
     } else if (requestEmoji == null) {
       selectedEmoji = await showDialog<MisskeyEmojiData?>(
-          context: context,
-          builder: (context) => ReactionPickerDialog(
-                account: account,
-                isAcceptSensitive: displayNote.reactionAcceptance !=
-                        ReactionAcceptance.nonSensitiveOnly &&
-                    displayNote.reactionAcceptance !=
-                        ReactionAcceptance
-                            .nonSensitiveOnlyForLocalLikeOnlyForRemote,
-              ));
+        context: context,
+        builder: (context) => ReactionPickerDialog(
+          account: account,
+          isAcceptSensitive: displayNote.reactionAcceptance !=
+                  ReactionAcceptance.nonSensitiveOnly &&
+              displayNote.reactionAcceptance !=
+                  ReactionAcceptance.nonSensitiveOnlyForLocalLikeOnlyForRemote,
+        ),
+      );
     } else {
       selectedEmoji = requestEmoji;
     }
 
     if (selectedEmoji == null) return;
-    await misskey.notes.reactions.create(NotesReactionsCreateRequest(
-        noteId: displayNote.id, reaction: ":${selectedEmoji.baseName}:"));
-    if (account.host == "misskey.io") {
-      await Future.delayed(
-          const Duration(milliseconds: misskeyIOReactionDelay));
-    }
-    await note.refresh(displayNote.id);
+    final reactionString = switch (selectedEmoji) {
+      UnicodeEmojiData(:final char) => char,
+      CustomEmojiData(:final baseName) => ":$baseName@.:",
+      NotEmojiData(:final name) => name,
+    };
+    await misskey.notes.reactions.create(
+      NotesReactionsCreateRequest(
+        noteId: displayNote.id,
+        reaction: reactionString,
+      ),
+    );
+    note.addMyReaction(displayNote.id, reactionString);
   }
 }
 

diff --git a/lib/view/common/misskey_notes/reaction_button.dart b/lib/view/common/misskey_notes/reaction_button.dart
@@ -1,7 +1,6 @@
 import 'dart:math';
 
 import 'package:flutter/material.dart';
-import 'package:miria/const.dart';
 import 'package:miria/model/account.dart';
 import 'package:miria/model/misskey_emoji_data.dart';
 import 'package:miria/providers.dart';
@@ -81,12 +80,7 @@ class ReactionButtonState extends ConsumerState<ReactionButton> {
                 .notes
                 .reactions
                 .delete(NotesReactionsDeleteRequest(noteId: widget.noteId));
-            if (account.host == "misskey.io") {
-              await Future.delayed(
-                  const Duration(milliseconds: misskeyIOReactionDelay));
-            }
-
-            await ref.read(notesProvider(account)).refresh(widget.noteId);
+            ref.read(notesProvider(account)).removeMyReaction(widget.noteId);
 
             return;
           }
@@ -102,23 +96,21 @@ class ReactionButtonState extends ConsumerState<ReactionButton> {
               break;
             case CustomEmojiData():
               if (!emojiData.isCurrentServer) return;
-              reactionString = ":${emojiData.baseName}:";
+              reactionString = ":${emojiData.baseName}@.:";
               break;
             case NotEmojiData():
               return;
           }
 
           await ref.read(misskeyProvider(account)).notes.reactions.create(
-              NotesReactionsCreateRequest(
-                  noteId: widget.noteId, reaction: reactionString));
-
-          // misskey.ioはただちにリアクションを反映してくれない
-          if (account.host == "misskey.io") {
-            await Future.delayed(
-                const Duration(milliseconds: misskeyIOReactionDelay));
-          }
-
-          await ref.read(notesProvider(account)).refresh(widget.noteId);
+                NotesReactionsCreateRequest(
+                  noteId: widget.noteId,
+                  reaction: reactionString,
+                ),
+              );
+          ref
+              .read(notesProvider(account))
+              .addMyReaction(widget.noteId, reactionString);
         },
         onLongPress: () {
           showDialog(