diff --git a/app/helpers/home_helper.rb b/app/helpers/home_helper.rb index 79e28c983af..2c6db135952 100644 --- a/app/helpers/home_helper.rb +++ b/app/helpers/home_helper.rb @@ -7,34 +7,32 @@ module HomeHelper } end - def account_link_to(account, button = '', path: nil) + def account_link_to(account, path: nil) content_tag(:div, class: 'account account--minimal') do content_tag(:div, class: 'account__wrapper') do - section = if account.nil? - content_tag(:div, class: 'account__display-name') do - content_tag(:div, class: 'account__avatar-wrapper') do - image_tag(full_asset_url('avatars/original/missing.png', skip_pipeline: true), class: 'account__avatar') - end + - content_tag(:span, class: 'display-name') do - content_tag(:strong, t('about.contact_missing')) + - content_tag(:span, t('about.contact_unavailable'), class: 'display-name__account') - end - end - else - link_to(path || ActivityPub::TagManager.instance.url_for(account), class: 'account__display-name') do - content_tag(:div, class: 'account__avatar-wrapper') do - image_tag(full_asset_url(current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url), class: 'account__avatar', width: 46, height: 46) - end + - content_tag(:span, class: 'display-name') do - content_tag(:bdi) do - content_tag(:strong, display_name(account, custom_emojify: true), class: 'display-name__html emojify') - end + - content_tag(:span, "@#{account.acct}", class: 'display-name__account') - end - end - end - - section + button + if account.nil? + content_tag(:div, class: 'account__display-name') do + content_tag(:div, class: 'account__avatar-wrapper') do + image_tag(full_asset_url('avatars/original/missing.png', skip_pipeline: true), class: 'account__avatar') + end + + content_tag(:span, class: 'display-name') do + content_tag(:strong, t('about.contact_missing')) + + content_tag(:span, t('about.contact_unavailable'), class: 'display-name__account') + end + end + else + link_to(path || ActivityPub::TagManager.instance.url_for(account), class: 'account__display-name') do + content_tag(:div, class: 'account__avatar-wrapper') do + image_tag(full_asset_url(current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url), class: 'account__avatar', width: 46, height: 46) + end + + content_tag(:span, class: 'display-name') do + content_tag(:bdi) do + content_tag(:strong, display_name(account, custom_emojify: true), class: 'display-name__html emojify') + end + + content_tag(:span, "@#{account.acct}", class: 'display-name__account') + end + end + end end end end diff --git a/app/views/admin/reports/index.html.haml b/app/views/admin/reports/index.html.haml index e08218a05d9..514cf4c4806 100644 --- a/app/views/admin/reports/index.html.haml +++ b/app/views/admin/reports/index.html.haml @@ -33,7 +33,7 @@ - @reports.group_by(&:target_account).each do |target_account, reports| .report-card .report-card__profile - = account_link_to target_account, '', path: admin_account_path(target_account.id) + = account_link_to target_account, path: admin_account_path(target_account.id) .report-card__profile__stats = link_to t('admin.reports.account.notes', count: target_account.targeted_moderation_notes.count), admin_account_path(target_account.id) %br/