diff options
author | ThibG <thib@sitedethib.com> | 2020-11-07 21:47:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-07 21:47:31 +0100 |
commit | cfb16b9b70a50ec5451c9aebb2c35d3a44701311 (patch) | |
tree | 6ba298899b376d0c8862d77c1e34339a08dc3121 /app/lib | |
parent | 5a9fc749c3eab8d3c93dd282fa89c20a5cb0e994 (diff) | |
parent | e4d62042bdb3b0d675c2367b4c48a2a48647af5e (diff) |
Merge pull request #1453 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib')
-rw-r--r-- | app/lib/activitypub/activity/create.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index 3a9f83978..d56d47a2d 100644 --- 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']), |