* 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 in
This commit is contained in:
parent
1ed1014546
commit
1364e9e4ae
9 changed files with 95 additions and 4 deletions
13
app/views/remote_unfollows/_card.html.haml
Normal file
13
app/views/remote_unfollows/_card.html.haml
Normal file
|
@ -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')
|
3
app/views/remote_unfollows/error.html.haml
Normal file
3
app/views/remote_unfollows/error.html.haml
Normal file
|
@ -0,0 +1,3 @@
|
|||
.form-container
|
||||
.flash-message#error_explanation
|
||||
= t('remote_unfollow.error')
|
10
app/views/remote_unfollows/success.html.haml
Normal file
10
app/views/remote_unfollows/success.html.haml
Normal file
|
@ -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'
|
Loading…
Add table
Add a link
Reference in a new issue