Fix merge

kmycode · Jan 18, 2024 · 5e58478 · 5e58478
1 parent 43570ed
commit 5e58478
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb
@@ -78,14 +78,14 @@ def misskey_software?
 
     @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