diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-05-07 19:51:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-07 19:51:00 +0200 |
| commit | 50f8ee2e07e0a8a0ab8971543cb6544c8d6c5f5d (patch) | |
| tree | 2d0f4954a3077e3e0bb2d02f671af41b69672e2a /app/services/activitypub/process_account_service.rb | |
| parent | a346912030012dc1451249373ff7ef1a61016517 (diff) | |
| parent | e08b31a70624fe069d2f26bf2078a69e2d48f6aa (diff) | |
Merge pull request #1526 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/activitypub/process_account_service.rb')
| -rw-r--r-- | app/services/activitypub/process_account_service.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb index 6afeb92d6..bb2e8f665 100644 --- a/app/services/activitypub/process_account_service.rb +++ b/app/services/activitypub/process_account_service.rb @@ -87,6 +87,7 @@ class ActivityPub::ProcessAccountService < BaseService @account.url = url || @uri @account.uri = @uri @account.actor_type = actor_type + @account.created_at = @json['published'] if @json['published'].present? end def set_immediate_attributes! @@ -101,7 +102,7 @@ class ActivityPub::ProcessAccountService < BaseService end def set_fetchable_key! - @account.public_key = public_key || '' + @account.public_key = public_key || '' end def set_fetchable_attributes! |