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

2019-06-28 12:11:45 +02:00
parent 6ad870a410 ca8944728f
commit c8ba75b963
8 changed files with 74 additions and 5 deletions
--- a/app/serializers/activitypub/update_poll_serializer.rb
+++ b/app/serializers/activitypub/update_poll_serializer.rb
@@ -14,7 +14,7 @@ class ActivityPub::UpdatePollSerializer < ActivityPub::Serializer
  end

  def actor
-    ActivityPub::TagManager.instance.uri_for(object)
+    ActivityPub::TagManager.instance.uri_for(object.account)
  end

  def to