about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-08-31 20:33:01 +0200
committerEugen Rochko <eugen@zeonfederated.com>2018-08-31 20:33:01 +0200
commit45c0f5433ca6aead4ff2ab27cf4b7b0dbd074d7f (patch)
tree25cb38b10a0db8fdd6826624925cba3965887dfa
parent55880c70981bac9278e7f8584f9d4ecd78f1ba6b (diff)
Do not show follow button on moved or memorial accounts (#8546)
This restores the logic from before the public profile redesign. Fixes #8503
-rw-r--r--app/helpers/stream_entries_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb
index 187bfe4a0..ac655f622 100644
--- a/app/helpers/stream_entries_helper.rb
+++ b/app/helpers/stream_entries_helper.rb
@@ -22,12 +22,12 @@ module StreamEntriesHelper
         link_to account_unfollow_path(account), class: 'button logo-button button--destructive', data: { method: :post } do
           safe_join([render(file: Rails.root.join('app', 'javascript', 'images', 'logo.svg')), t('accounts.unfollow')])
         end
-      else
+      elsif !(account.memorial? || account.moved?)
         link_to account_follow_path(account), class: 'button logo-button', data: { method: :post } do
           safe_join([render(file: Rails.root.join('app', 'javascript', 'images', 'logo.svg')), t('accounts.follow')])
         end
       end
-    else
+    elsif !(account.memorial? || account.moved?)
       link_to account_remote_follow_path(account), class: 'button logo-button modal-button', target: '_new' do
         safe_join([render(file: Rails.root.join('app', 'javascript', 'images', 'logo.svg')), t('accounts.follow')])
       end