mastofe

commit: 9d42bff285551303ed4f49935991321de570564e
parent: b891a81008d2cf595cb37432a8e1f36606db16d6
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Thu, 22 Dec 2016 23:07:46 +0100

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

Diffstat:
M
app/models/account.rb
4
++++
M
app/views/accounts/_header.html.haml
2
+-

2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/app/models/account.rb b/app/models/account.rb
@@ -91,6 +91,10 @@ class Account < ApplicationRecord
     blocking.include?(other_account)
   end
 
+  def requested?(other_account)
+    follow_requests.where(target_account: other_account).exists?
+  end
+
   def local?
     domain.nil?
   end
diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml
@@ -1,5 +1,5 @@
 .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
       - if current_account.following?(@account)
         = link_to t('accounts.unfollow'), unfollow_account_path(@account), data: { method: :post }, class: 'button'