autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixing merge & local pinned post leak

Browse Source
This commit is contained in:
Darius Kazemi
2020-05-16 13:01:41 -07:00
parent 877a478466
commit c7a78558ea
3 changed files with 6 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/accounts_controller.rb
View File

@ -26,7 +26,11 @@ class AccountsController < ApplicationController
return
end
@pinned_statuses = cache_collection(@account.pinned_statuses, Status) if show_pinned_statuses?
if current_user.nil?
@pinned_statuses = cache_collection(@account.pinned_statuses.without_local_only, Status) if show_pinned_statuses?
else
@pinned_statuses = cache_collection(@account.pinned_statuses, Status) if show_pinned_statuses?
end
@statuses = filtered_status_page
@statuses = cache_collection(@statuses, Status)
@rss_url = rss_url

2
app/controllers/api/v1/statuses_controller.rb
View File

@ -46,7 +46,7 @@ class Api::V1::StatusesController < Api::BaseController
application: doorkeeper_token.application,
poll: status_params[:poll],
idempotency: request.headers['Idempotency-Key'],
local_only: status_params[:local_only]),
local_only: status_params[:local_only],
with_rate_limit: true)
render json: @status, serializer: @status.is_a?(ScheduledStatus) ? REST::ScheduledStatusSerializer : REST::StatusSerializer