mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-28 03:03:46 +01:00
aec61a703f
Conflicts: - `.github/workflows/build-image.yml`: Upstream changed how docker images were built, including how they were cached. I don't know much about it, so applied upstream's changes. - `app/controllers/admin/domain_blocks_controller.rb`: The feature, that was in glitch-soc, got backported upstream. It also had a few fixes upstream, so those have been ported! - `app/javascript/packs/admin.js`: Glitch-soc changes have been backported upstream. As a result, some code from `app/javascript/core/admin.js` got added upstream. Kept our version since our shared Javascript already has that feature. - `app/models/user.rb`: Upstream added something to distinguish unusable and unusable-because-moved accounts, while glitch-soc considers moved accounts usable. Took upstream's code for `functional_or_moved?` and made `functional?` call it. - `app/views/statuses/_simple_status.html.haml`: Upstream cleaned up code style a bit, on a line that we had custom changes for. Applied upstream's change while keeping our change. - `config/initializers/content_security_policy.rb`: Upstream adopted one CSP directive we already had. The conflict is because of our files being structurally different, but the change itself was already part of glitch-soc. Kept our version.
111 lines
2.8 KiB
Ruby
111 lines
2.8 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class AccountsController < ApplicationController
|
|
PAGE_SIZE = 20
|
|
PAGE_SIZE_MAX = 200
|
|
|
|
include AccountControllerConcern
|
|
include SignatureAuthentication
|
|
|
|
before_action :require_account_signature!, if: -> { request.format == :json && authorized_fetch_mode? }
|
|
before_action :set_cache_headers
|
|
|
|
skip_around_action :set_locale, if: -> { [:json, :rss].include?(request.format&.to_sym) }
|
|
skip_before_action :require_functional!, unless: :whitelist_mode?
|
|
|
|
def show
|
|
respond_to do |format|
|
|
format.html do
|
|
expires_in 0, public: true unless user_signed_in?
|
|
|
|
@rss_url = rss_url
|
|
end
|
|
|
|
format.rss do
|
|
expires_in 1.minute, public: true
|
|
|
|
limit = params[:limit].present? ? [params[:limit].to_i, PAGE_SIZE_MAX].min : PAGE_SIZE
|
|
@statuses = filtered_statuses.without_reblogs.limit(limit)
|
|
@statuses = cache_collection(@statuses, Status)
|
|
end
|
|
|
|
format.json do
|
|
expires_in 3.minutes, public: !(authorized_fetch_mode? && signed_request_account.present?)
|
|
render_with_cache json: @account, content_type: 'application/activity+json', serializer: ActivityPub::ActorSerializer, adapter: ActivityPub::Adapter
|
|
end
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def filtered_statuses
|
|
default_statuses.tap do |statuses|
|
|
statuses.merge!(hashtag_scope) if tag_requested?
|
|
statuses.merge!(only_media_scope) if media_requested?
|
|
statuses.merge!(no_replies_scope) unless replies_requested?
|
|
end
|
|
end
|
|
|
|
def default_statuses
|
|
@account.statuses.not_local_only.where(visibility: [:public, :unlisted])
|
|
end
|
|
|
|
def only_media_scope
|
|
Status.joins(:media_attachments).merge(@account.media_attachments.reorder(nil)).group(:id)
|
|
end
|
|
|
|
def no_replies_scope
|
|
Status.without_replies
|
|
end
|
|
|
|
def hashtag_scope
|
|
tag = Tag.find_normalized(params[:tag])
|
|
|
|
if tag
|
|
Status.tagged_with(tag.id)
|
|
else
|
|
Status.none
|
|
end
|
|
end
|
|
|
|
def username_param
|
|
params[:username]
|
|
end
|
|
|
|
def skip_temporary_suspension_response?
|
|
request.format == :json
|
|
end
|
|
|
|
def rss_url
|
|
if tag_requested?
|
|
short_account_tag_url(@account, params[:tag], format: 'rss')
|
|
else
|
|
short_account_url(@account, format: 'rss')
|
|
end
|
|
end
|
|
|
|
def media_requested?
|
|
request.path.split('.').first.end_with?('/media') && !tag_requested?
|
|
end
|
|
|
|
def replies_requested?
|
|
request.path.split('.').first.end_with?('/with_replies') && !tag_requested?
|
|
end
|
|
|
|
def tag_requested?
|
|
request.path.split('.').first.end_with?(Addressable::URI.parse("/tagged/#{params[:tag]}").normalize)
|
|
end
|
|
|
|
def cached_filtered_status_page
|
|
cache_collection_paginated_by_id(
|
|
filtered_statuses,
|
|
Status,
|
|
PAGE_SIZE,
|
|
params_slice(:max_id, :min_id, :since_id)
|
|
)
|
|
end
|
|
|
|
def params_slice(*keys)
|
|
params.slice(*keys).permit(*keys)
|
|
end
|
|
end
|