about summary refs log tree commit diff
path: root/app/models/concerns/account_finder_concern.rb
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2023-01-18 16:33:03 +0100
committerGitHub <noreply@github.com>2023-01-18 16:33:03 +0100
commitd1387579b904542245646fc12eca99c97feccc63 (patch)
tree1f8a0bc58a7c76a773e6a4fb02bb705d0501e2ad /app/models/concerns/account_finder_concern.rb
parent9b3e22c40d5a24ddfa0df42d8fe6e96a273e8afd (diff)
Fix situations in which instance actor can be set to a Mastodon-incompatible name (#22307)
* Validate internal actor

* Use “internal.actor” by default for the server actor username

* Fix instance actor username on the fly if it includes ':'

* Change actor name from internal.actor to mastodon.internal
Diffstat (limited to 'app/models/concerns/account_finder_concern.rb')
-rw-r--r--app/models/concerns/account_finder_concern.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/models/concerns/account_finder_concern.rb b/app/models/concerns/account_finder_concern.rb
index e8b804934..37c3b8895 100644
--- a/app/models/concerns/account_finder_concern.rb
+++ b/app/models/concerns/account_finder_concern.rb
@@ -13,9 +13,11 @@ module AccountFinderConcern
     end
 
     def representative
-      Account.find(-99).tap(&:ensure_keys!)
+      actor = Account.find(-99).tap(&:ensure_keys!)
+      actor.update!(username: 'mastodon.internal') if actor.username.include?(':')
+      actor
     rescue ActiveRecord::RecordNotFound
-      Account.create!(id: -99, actor_type: 'Application', locked: true, username: Rails.configuration.x.local_domain)
+      Account.create!(id: -99, actor_type: 'Application', locked: true, username: 'mastodon.internal')
     end
 
     def find_local(username)