mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-30 09:07:01 +00:00
12b935fadf
Conflicts: - `.github/dependabot.yml`: Updated upstream, removed in glitch-soc to disable noise. Kept removed. - `CODE_OF_CONDUCT.md`: Upstream updated to a new version of the covenant, but I have not read it yet, so kept unchanged. - `Gemfile.lock`: Not a real conflict, one upstream dependency updated textually too close to the glitch-soc only `hcaptcha` dependency. Applied upstream changes. - `app/controllers/admin/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/disputes/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/relationships_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/statuses_cleanup_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/helpers/application_helper.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream added a highlight animation for onboarding, while we changed the max character limit. Applied our local changes on top of upstream's new version. - `app/views/layouts/application.html.haml`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `stylelint.config.js`: Upstream added ignore paths, glitch-soc had extra ignore paths. Added the same paths as upstream.
84 lines
2.1 KiB
Ruby
84 lines
2.1 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class RelationshipsController < ApplicationController
|
|
layout 'admin'
|
|
|
|
before_action :authenticate_user!
|
|
before_action :set_accounts, only: :show
|
|
before_action :set_pack
|
|
before_action :set_relationships, only: :show
|
|
before_action :set_body_classes
|
|
before_action :set_cache_headers
|
|
|
|
helper_method :following_relationship?, :followed_by_relationship?, :mutual_relationship?
|
|
|
|
def show
|
|
@form = Form::AccountBatch.new
|
|
end
|
|
|
|
def update
|
|
@form = Form::AccountBatch.new(form_account_batch_params.merge(current_account: current_account, action: action_from_button))
|
|
@form.save
|
|
rescue ActionController::ParameterMissing
|
|
# Do nothing
|
|
rescue Mastodon::NotPermittedError, ActiveRecord::RecordNotFound
|
|
flash[:alert] = I18n.t('relationships.follow_failure') if action_from_button == 'follow'
|
|
ensure
|
|
redirect_to relationships_path(filter_params)
|
|
end
|
|
|
|
private
|
|
|
|
def set_accounts
|
|
@accounts = RelationshipFilter.new(current_account, filter_params).results.page(params[:page]).per(40)
|
|
end
|
|
|
|
def set_relationships
|
|
@relationships = AccountRelationshipsPresenter.new(@accounts.pluck(:id), current_user.account_id)
|
|
end
|
|
|
|
def form_account_batch_params
|
|
params.require(:form_account_batch).permit(:action, account_ids: [])
|
|
end
|
|
|
|
def following_relationship?
|
|
params[:relationship].blank? || params[:relationship] == 'following'
|
|
end
|
|
|
|
def mutual_relationship?
|
|
params[:relationship] == 'mutual'
|
|
end
|
|
|
|
def followed_by_relationship?
|
|
params[:relationship] == 'followed_by'
|
|
end
|
|
|
|
def filter_params
|
|
params.slice(:page, *RelationshipFilter::KEYS).permit(:page, *RelationshipFilter::KEYS)
|
|
end
|
|
|
|
def action_from_button
|
|
if params[:follow]
|
|
'follow'
|
|
elsif params[:unfollow]
|
|
'unfollow'
|
|
elsif params[:remove_from_followers]
|
|
'remove_from_followers'
|
|
elsif params[:block_domains] || params[:remove_domains_from_followers]
|
|
'remove_domains_from_followers'
|
|
end
|
|
end
|
|
|
|
def set_body_classes
|
|
@body_classes = 'admin'
|
|
end
|
|
|
|
def set_pack
|
|
use_pack 'admin'
|
|
end
|
|
|
|
def set_cache_headers
|
|
response.cache_control.replace(private: true, no_store: true)
|
|
end
|
|
end
|