diff options
| author | Starfall <root@starfall.blue> | 2019-12-09 19:07:33 -0600 |
|---|---|---|
| committer | Starfall <root@starfall.blue> | 2019-12-09 19:09:31 -0600 |
| commit | 6b34fcfef7566105e8d80ab5fee0a539c06cddbf (patch) | |
| tree | 8fad2d47bf8be255d3c671c40cbfd04c2f55ed03 /app/helpers/admin/action_logs_helper.rb | |
| parent | 9fbb4af7611aa7836e65ef9f544d341423c15685 (diff) | |
| parent | 246addd5b33a172600342af3fb6fb5e4c80ad95e (diff) | |
Merge branch 'glitch'`
Diffstat (limited to 'app/helpers/admin/action_logs_helper.rb')
| -rw-r--r-- | app/helpers/admin/action_logs_helper.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/helpers/admin/action_logs_helper.rb b/app/helpers/admin/action_logs_helper.rb index e5fbb1500..608a99dd5 100644 --- a/app/helpers/admin/action_logs_helper.rb +++ b/app/helpers/admin/action_logs_helper.rb @@ -44,6 +44,8 @@ module Admin::ActionLogsHelper 'flag' when 'DomainBlock' 'lock' + when 'DomainAllow' + 'plus-circle' when 'EmailDomainBlock' 'envelope' when 'Status' @@ -86,10 +88,10 @@ module Admin::ActionLogsHelper record.shortcode when 'Report' link_to "##{record.id}", admin_report_path(record) - when 'DomainBlock', 'EmailDomainBlock' + when 'DomainBlock', 'DomainAllow', 'EmailDomainBlock' link_to record.domain, "https://#{record.domain}" when 'Status' - link_to record.account.acct, TagManager.instance.url_for(record) + link_to record.account.acct, ActivityPub::TagManager.instance.url_for(record) when 'AccountWarning' link_to record.target_account.acct, admin_account_path(record.target_account_id) end @@ -99,7 +101,7 @@ module Admin::ActionLogsHelper case type when 'CustomEmoji' attributes['shortcode'] - when 'DomainBlock', 'EmailDomainBlock' + when 'DomainBlock', 'DomainAllow', 'EmailDomainBlock' link_to attributes['domain'], "https://#{attributes['domain']}" when 'Status' tmp_status = Status.new(attributes.except('reblogs_count', 'favourites_count')) |