restrict private pin visibility to packmates & do not include them in `featured` collection (mainline masto does not respect pin visibility)
parent
9ba2081720
commit
9a3c4bc051
|
@ -29,7 +29,7 @@ class AccountsController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
@pinned_statuses = cache_collection(@account.pinned_statuses, Status) if show_pinned_statuses?
|
@pinned_statuses = cache_collection(pinned_statuses, Status) if show_pinned_statuses?
|
||||||
@statuses = filtered_status_page(params)
|
@statuses = filtered_status_page(params)
|
||||||
@statuses = cache_collection(@statuses, Status)
|
@statuses = cache_collection(@statuses, Status)
|
||||||
|
|
||||||
|
@ -51,6 +51,14 @@ class AccountsController < ApplicationController
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
|
def pinned_statuses
|
||||||
|
if user_signed_in? && current_account.following?(@account)
|
||||||
|
@account.pinned_statuses
|
||||||
|
else
|
||||||
|
@account.pinned_statuses.where.not(visibility: :private)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def show_pinned_statuses?
|
def show_pinned_statuses?
|
||||||
[reblogs_requested?, replies_requested?, media_requested?, tag_requested?, params[:max_id].present?, params[:min_id].present?].none?
|
[reblogs_requested?, replies_requested?, media_requested?, tag_requested?, params[:max_id].present?, params[:min_id].present?].none?
|
||||||
end
|
end
|
||||||
|
|
|
@ -35,7 +35,7 @@ class ActivityPub::CollectionsController < Api::BaseController
|
||||||
def set_size
|
def set_size
|
||||||
case params[:id]
|
case params[:id]
|
||||||
when 'featured'
|
when 'featured'
|
||||||
@account.pinned_statuses.count
|
@account.pinned_statuses.where.not(visibility: :private).count
|
||||||
else
|
else
|
||||||
raise ActiveRecord::RecordNotFound
|
raise ActiveRecord::RecordNotFound
|
||||||
end
|
end
|
||||||
|
@ -45,7 +45,7 @@ class ActivityPub::CollectionsController < Api::BaseController
|
||||||
case params[:id]
|
case params[:id]
|
||||||
when 'featured'
|
when 'featured'
|
||||||
@account.statuses.permitted_for(@account, signed_request_account).tap do |scope|
|
@account.statuses.permitted_for(@account, signed_request_account).tap do |scope|
|
||||||
scope.merge!(@account.pinned_statuses)
|
scope.merge!(@account.pinned_statuses.where.not(visibility: :private))
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
raise ActiveRecord::RecordNotFound
|
raise ActiveRecord::RecordNotFound
|
||||||
|
|
|
@ -57,7 +57,11 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
|
||||||
end
|
end
|
||||||
|
|
||||||
def pinned_scope
|
def pinned_scope
|
||||||
@account.pinned_statuses
|
if user_signed_in? && current_account.following?(@account)
|
||||||
|
@account.pinned_statuses
|
||||||
|
else
|
||||||
|
@account.pinned_statuses.where.not(visibility: :private)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def no_replies_scope
|
def no_replies_scope
|
||||||
|
|
Loading…
Reference in New Issue