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

diff --git a/app/models/account.rb b/app/models/account.rb
index 273c098331ffd4055b12a3337a14fddeae58d1c2..5c1f6e7c1cca3cdf229b0b2d338f3ddb48133a84 100644 (file)
--- 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
index c132a6896c28ad81d07e6846a6509438553f7eef..77fd6c457f80f4ea74423f240589c1235c38c965 100644 (file)
--- 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'