about summary refs log tree commit diff
path: root/app/lib
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-06-04 20:40:19 +0200
committerThibaut Girka <thib@sitedethib.com>2019-06-04 20:40:19 +0200
commit02b56c7e1a0fa561af9a85f765ec22eee3053561 (patch)
treeba851bcad4bf9f657a0c2414ac3befdea9acea15 /app/lib
parent58946fef3c05342289c1c50132996fc4fd01cf68 (diff)
parent48fee1a800a262ce26171d724c15738d083eb6d6 (diff)
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/lib')
-rw-r--r--app/lib/activitypub/activity/create.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 2bc33c04b..f55dd35b2 100644
--- 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