Merge branch 'lint/user-page' into next

poppingmoon · Jan 2, 2024 · 2fbf13e · 2fbf13e
2 parents a347b21 + c6cfe66
commit 2fbf13e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/lib/view/common/misskey_notes/misskey_note.dart b/lib/view/common/misskey_notes/misskey_note.dart
@@ -598,7 +598,14 @@ class MisskeyNoteState extends ConsumerState<MisskeyNote> {
     MisskeyEmojiData? requestEmoji,
   }) async {
     final account = AccountScope.of(context);
-
+    if (requestEmoji != null &&
+        !ref
+            .read(generalSettingsRepositoryProvider)
+            .settings
+            .enableDirectReaction) {
+      // カスタム絵文字押下でのリアクション無効
+      return;
+    }
     // 他のサーバーからログインしている場合は他のアカウントで開く
     if (!account.hasToken) {
       ref
@@ -616,14 +623,6 @@ class MisskeyNoteState extends ConsumerState<MisskeyNote> {
       // すでにリアクション済み
       return;
     }
-    if (requestEmoji != null &&
-        !ref
-            .read(generalSettingsRepositoryProvider)
-            .settings
-            .enableDirectReaction) {
-      // カスタム絵文字押下でのリアクション無効
-      return;
-    }
     if (requestEmoji != null && isLikeOnly) {
       // いいねのみでカスタム絵文字押下
       return;

diff --git a/lib/view/federation_page/federation_announcements.dart b/lib/view/federation_page/federation_announcements.dart
@@ -138,6 +138,7 @@ class AnnouncementState extends ConsumerState<Announcement> {
 
   @override
   Widget build(BuildContext context) {
+    final account = AccountScope.of(context);
     final icon = data.icon;
     final imageUrl = data.imageUrl;
     return Padding(
@@ -174,9 +175,7 @@ class AnnouncementState extends ConsumerState<Announcement> {
               const Padding(padding: EdgeInsets.only(top: 10)),
               MfmText(
                 mfmText: data.text,
-                host: AccountScope.of(context).host == widget.host
-                    ? null
-                    : widget.host,
+                host: account.host == widget.host ? null : widget.host,
               ),
               if (imageUrl != null)
                 Center(
@@ -188,7 +187,8 @@ class AnnouncementState extends ConsumerState<Announcement> {
                     ),
                   ),
                 ),
-              if (AccountScope.of(context).host == widget.host &&
+              if (account.hasToken &&
+                  account.host == widget.host &&
                   data.isRead == false)
                 ElevatedButton(
                   onPressed: () async {