Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream

2019-06-04 20:40:19 +02:00
parent 58946fef3c 48fee1a800
commit 02b56c7e1a
16 changed files with 952 additions and 365 deletions
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@ -234,7 +234,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
    @account.polls.new(
      multiple: multiple,
      expires_at: expires_at,
-      options: items.map { |item| item['name'].presence || item['content'] },
+      options: items.map { |item| item['name'].presence || item['content'] }.compact,
      cached_tallies: items.map { |item| item.dig('replies', 'totalItems') || 0 }
    )
  end