From 1c09efcf1551023f5fbf17c348d59d26e9e8fec5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?KMY=EF=BC=88=E9=9B=AA=E3=81=82=E3=81=99=E3=81=8B=EF=BC=89?= Date: Fri, 19 Jan 2024 09:24:45 +0900 Subject: [PATCH] =?UTF-8?q?Fix:=20=E4=B8=8D=E6=AD=A3=E8=B3=BC=E8=AA=AD?= =?UTF-8?q?=E3=81=A8=E3=81=97=E3=81=A6=E3=83=9E=E3=83=BC=E3=82=AF=E3=81=95?= =?UTF-8?q?=E3=82=8C=E3=81=9F=E3=82=B5=E3=83=BC=E3=83=90=E3=83=BC=E3=81=8B?= =?UTF-8?q?=E3=82=89=E3=81=AE=E6=8A=95=E7=A8=BF=E3=83=95=E3=82=A7=E3=83=83?= =?UTF-8?q?=E3=83=81=E3=82=92=E6=8A=91=E6=AD=A2=20(#473)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix: 検索許可「誰でも」 * Fix merge --- app/controllers/statuses_controller.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb index b656f45dd7..be87161cc8 100644 --- a/app/controllers/statuses_controller.rb +++ b/app/controllers/statuses_controller.rb @@ -78,12 +78,14 @@ class StatusesController < ApplicationController @misskey_software = false - return false if !@status.local? || signed_request_account&.domain.blank? + return false if !@status.local? || signed_request_account&.domain.blank? || !@status.sending_maybe_compromised_privacy? + + return @misskey_software = true if DomainBlock.detect_invalid_subscription?(signed_request_account.domain) info = InstanceInfo.find_by(domain: signed_request_account.domain) return false if info.nil? - @misskey_software = %w(misskey calckey cherrypick sharkey).include?(info.software) && @status.sending_maybe_compromised_privacy? + @misskey_software = %w(misskey calckey cherrypick sharkey).include?(info.software) end def status_activity_serializer