diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-11-07 18:19:34 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-11-07 18:23:02 +0100 |
| commit | 412218af2ecd4cd004708d781e574208742dea4c (patch) | |
| tree | c0bf823109c7481ec9242a0263e091ec4aaeafeb /app/lib | |
| parent | 5a9fc749c3eab8d3c93dd282fa89c20a5cb0e994 (diff) | |
| parent | ee8cf246cfe8e05914ad7dcf81596f8535b3e161 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
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']), |