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

2020-11-07 18:19:34 +01:00
parent 5a9fc749c3 ee8cf246cf
commit 412218af2e
56 changed files with 403 additions and 170 deletions
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@ -111,7 +111,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
        created_at: @object['published'],
        override_timestamps: @options[:override_timestamps],
        reply: @object['inReplyTo'].present?,
-        sensitive: @object['sensitive'] || false,
+        sensitive: @account.sensitized? || @object['sensitive'] || false,
        visibility: visibility_from_audience,
        thread: replied_to_status,
        conversation: conversation_from_uri(@object['conversation']),