From d94713594c29aee76124b2cfcaf6f0f00f0226c4 Mon Sep 17 00:00:00 2001 From: KMY Date: Sat, 7 Oct 2023 13:17:47 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=97=E3=83=AD=E3=82=AD=E3=82=B7=E5=88=A4?= =?UTF-8?q?=E5=AE=9A=E3=83=AD=E3=82=B8=E3=83=83=E3=82=AF=E3=82=92=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/lib/activitypub/activity/follow.rb | 7 ++++--- spec/lib/activitypub/activity/follow_spec.rb | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/lib/activitypub/activity/follow.rb b/app/lib/activitypub/activity/follow.rb index f19bd1f7c8..8d9e37f172 100644 --- a/app/lib/activitypub/activity/follow.rb +++ b/app/lib/activitypub/activity/follow.rb @@ -52,11 +52,12 @@ class ActivityPub::Activity::Follow < ActivityPub::Activity end def proxy_account? - (@account.username.downcase.include?('proxy') || - @account.username.downcase.include?('followbot') || + (@account.username.downcase.include?('_proxy') || + @account.username.downcase.end_with?('proxy') || + @account.username.downcase.include?('_bot_') || + @account.username.downcase.end_with?('bot') || @account.display_name&.downcase&.include?('proxy') || @account.display_name&.include?('プロキシ') || - @account.note&.downcase&.include?('proxy') || @account.note&.include?('プロキシ')) && proxyable_software? end diff --git a/spec/lib/activitypub/activity/follow_spec.rb b/spec/lib/activitypub/activity/follow_spec.rb index 2626c036a4..57f2b07718 100644 --- a/spec/lib/activitypub/activity/follow_spec.rb +++ b/spec/lib/activitypub/activity/follow_spec.rb @@ -4,8 +4,8 @@ require 'rails_helper' RSpec.describe ActivityPub::Activity::Follow do let(:actor_type) { 'Person' } - let(:note) { '' } - let(:sender) { Fabricate(:account, domain: 'example.com', inbox_url: 'https://example.com/inbox', actor_type: actor_type, note: note) } + let(:display_name) { '' } + let(:sender) { Fabricate(:account, domain: 'example.com', inbox_url: 'https://example.com/inbox', actor_type: actor_type, display_name: display_name) } let(:recipient) { Fabricate(:account) } let(:json) do @@ -105,7 +105,7 @@ RSpec.describe ActivityPub::Activity::Follow do end context 'when unlocked misskey proxy account but locked from bot' do - let(:note) { 'i am proxy.' } + let(:display_name) { 'i am proxy.' } before do Fabricate(:instance_info, domain: 'example.com', software: 'misskey') @@ -125,7 +125,7 @@ RSpec.describe ActivityPub::Activity::Follow do end context 'when unlocked mastodon proxy account but locked from bot' do - let(:note) { 'i am proxy.' } + let(:display_name) { 'i am proxy.' } before do Fabricate(:instance_info, domain: 'example.com', software: 'mastodon')