diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-04-27 09:30:49 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-27 09:30:49 +0200 |
commit | fbe212de6a599a90411d5a80d4fb00d2d6ca9041 (patch) | |
tree | 43038bf3550f8f162495dfc8d9cc077ad1da4052 /app/models | |
parent | a481af15a9b2a7829c2a849906aa4b475ccdbd98 (diff) | |
parent | fc1dd81ea50e3a12ce6a298103a94d2f5445d7d2 (diff) |
Merge pull request #1752 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/account.rb | 6 | ||||
-rw-r--r-- | app/models/concerns/account_finder_concern.rb | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index 1966c5a48..068ee7ae9 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -561,6 +561,12 @@ class Account < ApplicationRecord before_validation :prepare_username, on: :create before_destroy :clean_feed_manager + def ensure_keys! + return unless local? && private_key.blank? && public_key.blank? + generate_keys + save! + end + private def prepare_contents diff --git a/app/models/concerns/account_finder_concern.rb b/app/models/concerns/account_finder_concern.rb index 0dadddad1..e8b804934 100644 --- a/app/models/concerns/account_finder_concern.rb +++ b/app/models/concerns/account_finder_concern.rb @@ -13,7 +13,7 @@ module AccountFinderConcern end def representative - Account.find(-99) + Account.find(-99).tap(&:ensure_keys!) rescue ActiveRecord::RecordNotFound Account.create!(id: -99, actor_type: 'Application', locked: true, username: Rails.configuration.x.local_domain) end |