Merge remote-tracking branch 'parent/main' into upstream-20240618

app/helpers/admin/account_moderation_notes_helper.rb

@@ -4,27 +4,42 @@ module Admin::AccountModerationNotesHelper
   def admin_account_link_to(account, path: nil)
     return if account.nil?
 
-    link_to path || admin_account_path(account.id), class: name_tag_classes(account), title: account.acct do
-      safe_join([
-                  image_tag(account.avatar.url, width: 15, height: 15, alt: '', class: 'avatar'),
-                  content_tag(:span, account.acct, class: 'username'),
-                ], ' ')
-    end
+    link_to(
+      labeled_account_avatar(account),
+      path || admin_account_path(account.id),
+      class: class_names('name-tag', suspended: suspended_account?(account)),
+      title: account.acct
+    )
   end
 
   def admin_account_inline_link_to(account)
     return if account.nil?
 
-    link_to admin_account_path(account.id), class: name_tag_classes(account, true), title: account.acct do
-      content_tag(:span, account.acct, class: 'username')
-    end
+    link_to(
+      account_inline_text(account),
+      admin_account_path(account.id),
+      class: class_names('inline-name-tag', suspended: suspended_account?(account)),
+      title: account.acct
+    )
   end
 
   private
 
-  def name_tag_classes(account, inline = false)
-    classes = [inline ? 'inline-name-tag' : 'name-tag']
-    classes << 'suspended' if account.suspended? || (account.local? && account.user.nil?)
-    classes.join(' ')
+  def labeled_account_avatar(account)
+    safe_join(
+      [
+        image_tag(account.avatar.url, width: 15, height: 15, alt: '', class: 'avatar'),
+        account_inline_text(account),
+      ],
+      ' '
+    )
+  end
+
+  def account_inline_text(account)
+    content_tag(:span, account.acct, class: 'username')
+  end
+
+  def suspended_account?(account)
+    account.suspended? || (account.local? && account.user.nil?)
   end
 end

app/helpers/admin/action_logs_helper.rb

@@ -15,8 +15,8 @@ module Admin::ActionLogsHelper
       link_to log.human_identifier, admin_roles_path(log.target_id)
     when 'Report'
       link_to "##{log.human_identifier.presence || log.target_id}", admin_report_path(log.target_id)
-    when 'DomainBlock', 'DomainAllow', 'EmailDomainBlock', 'UnavailableDomain'
-      link_to log.human_identifier, "https://#{log.human_identifier.presence}"
+    when 'Instance', 'DomainBlock', 'DomainAllow', 'UnavailableDomain'
+      log.human_identifier.present? ? link_to(log.human_identifier, admin_instance_path(log.human_identifier)) : I18n.t('admin.action_logs.unavailable_instance')
     when 'Status'
       link_to log.human_identifier, log.permalink
     when 'AccountWarning'
@@ -25,7 +25,7 @@ module Admin::ActionLogsHelper
       link_to truncate(log.human_identifier), edit_admin_announcement_path(log.target_id)
     when 'CustomEmoji'
       link_to log.human_identifier, edit_admin_custom_emoji_path(log.target_id)
-    when 'IpBlock', 'Instance'
+    when 'IpBlock', 'EmailDomainBlock'
       log.human_identifier
     when 'CanonicalEmailBlock'
       content_tag(:samp, (log.human_identifier.presence || '')[0...7], title: log.human_identifier)

app/helpers/application_helper.rb

@@ -270,6 +270,10 @@ module ApplicationHelper
     instance_presenter.app_icon&.file&.url(size)
   end
 
+  def use_mask_icon?
+    instance_presenter.app_icon.blank?
+  end
+
   private
 
   def storage_host_var