diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-28 15:12:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-28 15:12:33 +0100 |
| commit | bb316faffff7a76bc89f7e942233f0e14caf60f5 (patch) | |
| tree | 260458c7ff43dd82fc02cc7e5ef0920dd8d2a25b /app/lib/activitypub/activity/update.rb | |
| parent | 0418bdd71f59b4d7e9f3498f2990c8b044f310e1 (diff) | |
| parent | 050efbc12650feaac3e833c4dd740bf090e3dae1 (diff) | |
Merge pull request #970 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/activitypub/activity/update.rb')
| -rw-r--r-- | app/lib/activitypub/activity/update.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/lib/activitypub/activity/update.rb b/app/lib/activitypub/activity/update.rb index bc9a63f98..70035325b 100644 --- a/app/lib/activitypub/activity/update.rb +++ b/app/lib/activitypub/activity/update.rb @@ -23,8 +23,8 @@ class ActivityPub::Activity::Update < ActivityPub::Activity return reject_payload! if invalid_origin?(@object['id']) status = Status.find_by(uri: object_uri, account_id: @account.id) - return if status.nil? || status.poll.nil? + return if status.nil? || status.preloadable_poll.nil? - ActivityPub::ProcessPollService.new.call(status.poll, @object) + ActivityPub::ProcessPollService.new.call(status.preloadable_poll, @object) end end |