* Fix follow/unfollow buttons on public profile - Present non-logged users with web+mastodon:// URLs for remote accounts - Present logged-in users with appropriate links (authorize_follows and remote_unfollows) for remote accounts * Do not cache rendered cards if user is logged inpull/4/head
@ -0,0 +1,21 @@ | |||||
# frozen_string_literal: true | |||||
module RemoteAccountControllerConcern | |||||
extend ActiveSupport::Concern | |||||
included do | |||||
layout 'public' | |||||
before_action :set_account | |||||
before_action :check_account_suspension | |||||
end | |||||
private | |||||
def set_account | |||||
@account = Account.find_remote!(params[:acct]) | |||||
end | |||||
def check_account_suspension | |||||
gone if @account.suspended? | |||||
end | |||||
end |
@ -0,0 +1,39 @@ | |||||
# frozen_string_literal: true | |||||
class RemoteUnfollowsController < ApplicationController | |||||
layout 'modal' | |||||
before_action :authenticate_user! | |||||
before_action :set_body_classes | |||||
def create | |||||
@account = unfollow_attempt.try(:target_account) | |||||
if @account.nil? | |||||
render :error | |||||
else | |||||
render :success | |||||
end | |||||
rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError | |||||
render :error | |||||
end | |||||
private | |||||
def unfollow_attempt | |||||
username, domain = acct_without_prefix.split('@') | |||||
UnfollowService.new.call(current_account, Account.find_remote!(username, domain)) | |||||
end | |||||
def acct_without_prefix | |||||
acct_params.gsub(/\Aacct:/, '') | |||||
end | |||||
def acct_params | |||||
params.fetch(:acct, '') | |||||
end | |||||
def set_body_classes | |||||
@body_classes = 'modal-layout' | |||||
end | |||||
end |
@ -0,0 +1,13 @@ | |||||
.account-card | |||||
.detailed-status__display-name | |||||
%div | |||||
= image_tag account.avatar.url(:original), alt: '', width: 48, height: 48, class: 'avatar' | |||||
%span.display-name | |||||
- account_url = local_assigns[:admin] ? admin_account_path(account.id) : TagManager.instance.url_for(account) | |||||
= link_to account_url, class: 'detailed-status__display-name p-author h-card', target: '_blank', rel: 'noopener' do | |||||
%strong.emojify= display_name(account) | |||||
%span @#{account.acct} | |||||
- if account.note? | |||||
.account__header__content.emojify= Formatter.instance.simplified_format(account) |
@ -0,0 +1,4 @@ | |||||
.post-follow-actions | |||||
%div= link_to t('authorize_follow.post_follow.web'), web_url("accounts/#{@account.id}"), class: 'button button--block' | |||||
%div= link_to t('authorize_follow.post_follow.return'), TagManager.instance.url_for(@account), class: 'button button--block' | |||||
%div= t('authorize_follow.post_follow.close') |
@ -0,0 +1,3 @@ | |||||
.form-container | |||||
.flash-message#error_explanation | |||||
= t('remote_unfollow.error') |
@ -0,0 +1,10 @@ | |||||
- content_for :page_title do | |||||
= t('remote_unfollow.title', acct: @account.acct) | |||||
.form-container | |||||
.follow-prompt | |||||
%h2= t('remote_unfollow.unfollowed') | |||||
= render 'card', account: @account | |||||
= render 'post_follow_actions' |