about summary refs log tree commit diff
path: root/app/lib/activitypub
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-03-17 15:34:56 +0100
committerEugen Rochko <eugen@zeonfederated.com>2019-03-17 15:34:56 +0100
commita20354a20b9dffada0e8d6170ebc2ff13c79baea (patch)
tree74d1a47399b0cbd24187562b1a864ae5e984979c /app/lib/activitypub
parent5e38ef87a7b8bac59ffa0d98464086ab8a60a2e1 (diff)
Set and store report URIs (#10303)
Fixes #10271
Diffstat (limited to 'app/lib/activitypub')
-rw-r--r--app/lib/activitypub/activity/flag.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/lib/activitypub/activity/flag.rb b/app/lib/activitypub/activity/flag.rb
index 0d10d6c3c..f73b93058 100644
--- a/app/lib/activitypub/activity/flag.rb
+++ b/app/lib/activitypub/activity/flag.rb
@@ -14,7 +14,8 @@ class ActivityPub::Activity::Flag < ActivityPub::Activity
         @account,
         target_account,
         status_ids: target_statuses.nil? ? [] : target_statuses.map(&:id),
-        comment: @json['content'] || ''
+        comment: @json['content'] || '',
+        uri: report_uri
       )
     end
   end
@@ -28,4 +29,8 @@ class ActivityPub::Activity::Flag < ActivityPub::Activity
   def object_uris
     @object_uris ||= Array(@object.is_a?(Array) ? @object.map { |item| value_or_id(item) } : value_or_id(@object))
   end
+
+  def report_uri
+    @json['id'] unless @json['id'].nil? || invalid_origin?(@json['id'])
+  end
 end