From 91e252259d6b661d4d1c183d7318e31b98fecf89 Mon Sep 17 00:00:00 2001
From: KMY <tt@kmycode.net>
Date: Thu, 12 Jun 2025 10:37:20 +0900
Subject: [PATCH] Fix lint

---
 .../mastodon/features/ui/components/more_link.tsx    | 12 +++++++-----
 app/lib/activitypub/parser/custom_emoji_parser.rb    |  2 +-
 app/serializers/rest/custom_emoji_slim_serializer.rb |  2 +-
 spec/services/software_update_check_service_spec.rb  |  2 +-
 spec/system/new_statuses_spec.rb                     |  2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/javascript/mastodon/features/ui/components/more_link.tsx b/app/javascript/mastodon/features/ui/components/more_link.tsx
index 8b86f96adf..73d24bdaad 100644
--- a/app/javascript/mastodon/features/ui/components/more_link.tsx
+++ b/app/javascript/mastodon/features/ui/components/more_link.tsx
@@ -63,11 +63,13 @@ export const MoreLink: React.FC = () => {
 
   const emojiReactionMenu = useMemo(() => {
     if (!enableEmojiReaction) return [];
-    return [{
-      text: intl.formatMessage(messages.emoji_reactions),
-      to: '/emoji_reactions',
-    }];
-  }, [enableEmojiReaction, intl]);
+    return [
+      {
+        text: intl.formatMessage(messages.emoji_reactions),
+        to: '/emoji_reactions',
+      },
+    ];
+  }, [intl]);
 
   const menu = useMemo(() => {
     const arr: MenuItem[] = [
diff --git a/app/lib/activitypub/parser/custom_emoji_parser.rb b/app/lib/activitypub/parser/custom_emoji_parser.rb
index fcd36b0395..3cfcc6212e 100644
--- a/app/lib/activitypub/parser/custom_emoji_parser.rb
+++ b/app/lib/activitypub/parser/custom_emoji_parser.rb
@@ -29,7 +29,7 @@ class ActivityPub::Parser::CustomEmojiParser
     nil
   end
 
-  def is_sensitive # rubocop:disable Naming/PredicateName
+  def is_sensitive # rubocop:disable Naming/PredicatePrefix
     @json['isSensitive'].presence || false
   end
 
diff --git a/app/serializers/rest/custom_emoji_slim_serializer.rb b/app/serializers/rest/custom_emoji_slim_serializer.rb
index 6b17c15a03..13d024502a 100644
--- a/app/serializers/rest/custom_emoji_slim_serializer.rb
+++ b/app/serializers/rest/custom_emoji_slim_serializer.rb
@@ -53,7 +53,7 @@ class REST::CustomEmojiSlimSerializer < ActiveModel::Serializer
     object.is_sensitive
   end
 
-  def is_sensitive # rubocop:disable Naming/PredicateName
+  def is_sensitive # rubocop:disable Naming/PredicatePrefix
     sensitive
   end
 end
diff --git a/spec/services/software_update_check_service_spec.rb b/spec/services/software_update_check_service_spec.rb
index 7f493a0cc8..c6473b5b13 100644
--- a/spec/services/software_update_check_service_spec.rb
+++ b/spec/services/software_update_check_service_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe SoftwareUpdateCheckService do
   subject { described_class.new }
 
   shared_examples 'when the feature is enabled' do
-    let(:full_update_check_url) { "#{update_check_url}?version=#{Mastodon::Version.kmyblue_major}.#{Mastodon::Version.kmyblue_minor}-lts#{Mastodon::Version.dev? ? '-dev' : ''}" }
+    let(:full_update_check_url) { "#{update_check_url}?version=#{Mastodon::Version.kmyblue_major}.#{Mastodon::Version.kmyblue_minor}-lts#{'-dev' if Mastodon::Version.dev?}" }
 
     let(:devops_role)     { Fabricate(:user_role, name: 'DevOps', permissions: UserRole::FLAGS[:view_devops]) }
     let(:owner_user)      { Fabricate(:owner_user) }
diff --git a/spec/system/new_statuses_spec.rb b/spec/system/new_statuses_spec.rb
index 5af061806d..7375846da6 100644
--- a/spec/system/new_statuses_spec.rb
+++ b/spec/system/new_statuses_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe 'NewStatuses', :inline_jobs, :js, :streaming do
 
   before do
     as_a_logged_in_user
-    page.driver.browser.manage.window.resize_to(1600, 1050)
+    page.set_viewport_size(width: 1600, height: 1050)
   end
 
   it 'can be posted' do