nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Hide follow/unfollow button from public page if follow already requested

This commit is contained in:
Eugen Rochko 2016-12-22 23:07:46 +01:00
parent b891a81008
commit 9d42bff285
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/account.rb
View File

@ -91,6 +91,10 @@ class Account < ApplicationRecord
blocking.include?(other_account) blocking.include?(other_account)
end end
def requested?(other_account)
follow_requests.where(target_account: other_account).exists?
end
def local? def local?
domain.nil? domain.nil?
end end

2
app/views/accounts/_header.html.haml
View File

@ -1,5 +1,5 @@
.card{ style: "background-image: url(#{@account.header.url( :original)})" } .card{ style: "background-image: url(#{@account.header.url( :original)})" }
- if user_signed_in? && current_account.id != @account.id - if user_signed_in? && current_account.id != @account.id && !current_account.requested?(@account)
.controls .controls
- if current_account.following?(@account) - if current_account.following?(@account)
= link_to t('accounts.unfollow'), unfollow_account_path(@account), data: { method: :post }, class: 'button' = link_to t('accounts.unfollow'), unfollow_account_path(@account), data: { method: :post }, class: 'button'