diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-07-22 13:38:17 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-22 13:38:17 +0200 |
| commit | b9f351d8455f672137a34ea0ea0b1050fba3464b (patch) | |
| tree | 4a2dd275ddecf46760ccb8140fac5f6cb21ac766 /app/lib/activitypub/activity/update.rb | |
| parent | 801e546ecc1efb4103232d8265229eb455a8dd5b (diff) | |
| parent | 5d9acc0ce41aa0274fef2dd321a8fad1fb0665ea (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/mastodon/actions/compose.js`: Not a “real” conflict, but change too close to a change we made to fix the vanilla WebUI locally pushing authored local-only toots in the public TL view.
Diffstat (limited to 'app/lib/activitypub/activity/update.rb')
| -rw-r--r-- | app/lib/activitypub/activity/update.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/lib/activitypub/activity/update.rb b/app/lib/activitypub/activity/update.rb index 70035325b..018e2df54 100644 --- a/app/lib/activitypub/activity/update.rb +++ b/app/lib/activitypub/activity/update.rb @@ -4,6 +4,8 @@ class ActivityPub::Activity::Update < ActivityPub::Activity SUPPORTED_TYPES = %w(Application Group Organization Person Service).freeze def perform + dereference_object! + if equals_or_includes_any?(@object['type'], SUPPORTED_TYPES) update_account elsif equals_or_includes_any?(@object['type'], %w(Question)) |