diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/instance.rb | 8 | ||||
| -rw-r--r-- | app/views/admin/instances/index.html.haml | 13 |
2 files changed, 9 insertions, 12 deletions
diff --git a/app/models/instance.rb b/app/models/instance.rb index 556ee9f70..ca72cfdc2 100644 --- a/app/models/instance.rb +++ b/app/models/instance.rb @@ -13,12 +13,8 @@ class Instance @updated_at = resource.is_a?(DomainBlock) ? resource.updated_at : 0 end - def cached_sample_accounts - Rails.cache.fetch("#{cache_key}/sample_accounts", expires_in: 12.hours) { Account.where(domain: domain).searchable.joins(:account_stat).popular.limit(3) } - end - - def cached_accounts_count - @accounts_count || Rails.cache.fetch("#{cache_key}/count", expires_in: 12.hours) { Account.where(domain: domain).count } + def countable? + @accounts_count.present? end def to_param diff --git a/app/views/admin/instances/index.html.haml b/app/views/admin/instances/index.html.haml index 49800451c..e7afe7841 100644 --- a/app/views/admin/instances/index.html.haml +++ b/app/views/admin/instances/index.html.haml @@ -39,17 +39,19 @@ %h4 = instance.domain %small - = t('admin.instances.known_accounts', count: instance.cached_accounts_count) - - if instance.domain_block + - first_item = true - if !instance.domain_block.noop? - • = t("admin.domain_blocks.severity.#{instance.domain_block.severity}") + - first_item = false - if instance.domain_block.reject_media? - • + - unless first_item + • = t('admin.domain_blocks.rejecting_media') + - first_item = false - if instance.domain_block.reject_reports? - • + - unless first_item + • = t('admin.domain_blocks.rejecting_reports') - if instance.domain_block.reason = simple_format(h("Policy reason: #{instance.domain_block.reason}")) @@ -59,5 +61,4 @@ = t('admin.accounts.no_limits_imposed') - if instance.countable? .trends__item__current{ title: t('admin.instances.known_accounts', count: instance.accounts_count) }= number_to_human instance.accounts_count, strip_insignificant_zeros: true - = paginate paginated_instances |