Allow reports with long comments from remote instances, but truncate (#25028)

2023-05-22 13:15:21 +02:00
parent d51464283c
commit 19f9098551
6 changed files with 62 additions and 11 deletions
--- a/app/lib/activitypub/activity/flag.rb
+++ b/app/lib/activitypub/activity/flag.rb
@@ -16,7 +16,7 @@ class ActivityPub::Activity::Flag < ActivityPub::Activity
        @account,
        target_account,
        status_ids: target_statuses.nil? ? [] : target_statuses.map(&:id),
-        comment: @json['content'] || '',
+        comment: report_comment,
        uri: report_uri
      )
    end
@@ -35,4 +35,8 @@ class ActivityPub::Activity::Flag < ActivityPub::Activity
  def report_uri
    @json['id'] unless @json['id'].nil? || non_matching_uri_hosts?(@account.uri, @json['id'])
  end
+
+  def report_comment
+    (@json['content'] || '')[0...5000]
+  end
 end