detect pleroma server actors when auto-learning trusted accounts in graylist mode

2 files changed, 2 insertions, 2 deletions

diff --git a/app/models/account.rb b/app/models/account.rb
index cc7c5be42..07896fac6 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -494,7 +494,7 @@ class Account < ApplicationRecord
   end
 
   def service?
-    @_is_service ||= actor_type == "Application" || actor_type == "Service" || username == "relay" || username == domain
+    @_is_service ||= actor_type == "Application" || actor_type == "Service" || username == "relay" || username.in?([domain, 'internal.fetch'])
   end
 
   def can_be_marked_known?
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb
index 9f529ed52..88b33eb12 100644
--- a/app/services/activitypub/process_account_service.rb
+++ b/app/services/activitypub/process_account_service.rb
@@ -234,7 +234,7 @@ class ActivityPub::ProcessAccountService < BaseService
   def auto_mark_known?
     return false if @account.manual_only
 
-    @username == @domain ? Setting.always_mark_instance_actors_known : (!Setting.auto_reject_unknown && Setting.auto_mark_known)
+    @username.in?([@domain, 'internal.fetch']) ? Setting.always_mark_instance_actors_known : (!Setting.auto_reject_unknown && Setting.auto_mark_known)
   end
 
   def domain_block