From 6d07ba50f31f82633019b62dc83ec7099e3926b3 Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Fri, 19 Jul 2019 15:43:59 -0500 Subject: keep `locked` badge for approves-followers + add `frozen` badge for admin-locked accts, also federate `frozen` state --- app/helpers/stream_entries_helper.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/helpers/stream_entries_helper.rb') diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb index ed58efdb4..fcf98fd70 100644 --- a/app/helpers/stream_entries_helper.rb +++ b/app/helpers/stream_entries_helper.rb @@ -36,7 +36,9 @@ module StreamEntriesHelper def account_badge(account, all: false) content_tag(:div, class: 'roles') do + froze = account.local? ? (account&.user.nil? ? true : account.user.disabled?) : account.froze? roles = [] + roles << content_tag(:div, t('accounts.roles.froze'), class: 'account-role froze') if froze roles << content_tag(:div, t('accounts.roles.locked'), class: 'account-role locked') if account.locked? roles << content_tag(:div, t('accounts.roles.bot'), class: 'account-role bot') if account.bot? roles << content_tag(:div, t('accounts.roles.adult'), class: 'account-role adult') if account.adult_content? -- cgit