diff options
| author | Fire Demon <firedemon@creature.cafe> | 2020-08-18 00:09:52 -0500 |
|---|---|---|
| committer | Fire Demon <firedemon@creature.cafe> | 2020-08-30 05:45:19 -0500 |
| commit | dbc0b8cac26f207be6a418016435803e7f81943a (patch) | |
| tree | 52efaa05a52f0442dbfe3cf967beaa4b502b7e06 /app | |
| parent | 99c139cdd4e3b805b07ee0af26807c332246905c (diff) | |
[Privacy] Allow mixed-privacy posts in local API
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/accounts_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/api/v1/accounts/statuses_controller.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 8059e0e5d..88b30fb28 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -81,6 +81,7 @@ class AccountsController < ApplicationController @account.statuses.permitted_for( @account, current_account, + include_semiprivate: true, include_reblogs: !(threads_requested? || replies_requested?), only_reblogs: reblogs_requested?, only_replies: replies_requested?, diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb index 61633ce36..f9b8ccc24 100644 --- a/app/controllers/api/v1/accounts/statuses_controller.rb +++ b/app/controllers/api/v1/accounts/statuses_controller.rb @@ -42,6 +42,7 @@ class Api::V1::Accounts::StatusesController < Api::BaseController @account.statuses.permitted_for( @account, current_account, + include_semiprivate: true, include_reblogs: include_reblogs?, include_replies: include_replies?, only_reblogs: only_reblogs?, |