diff options
| author | ThibG <thib@sitedethib.com> | 2019-09-06 12:06:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-06 12:06:59 +0200 |
| commit | 286bf110c3e69042049968440f1eb99372a7e0e6 (patch) | |
| tree | ddf1c32803022cb200087a8c4c6818612ca76d3b /app/controllers/admin | |
| parent | 0128509605ed90ee5a29d6af2347ab32bd46aeb9 (diff) | |
| parent | 4434e2eb7f9942b44561c2f7702af3ed3854b8db (diff) | |
Merge pull request #1211 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/tags_controller.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/admin/tags_controller.rb b/app/controllers/admin/tags_controller.rb index 39aca2a4b..8bd4e5f8b 100644 --- a/app/controllers/admin/tags_controller.rb +++ b/app/controllers/admin/tags_controller.rb @@ -37,7 +37,8 @@ module Admin def set_usage_by_domain @usage_by_domain = @tag.statuses - .where(visibility: :public) + .with_public_visibility + .excluding_silenced_accounts .where(Status.arel_table[:id].gteq(Mastodon::Snowflake.id_at(Time.now.utc.beginning_of_day))) .joins(:account) .group('accounts.domain') @@ -56,7 +57,7 @@ module Admin scope = scope.unreviewed if filter_params[:review] == 'unreviewed' scope = scope.reviewed.order(reviewed_at: :desc) if filter_params[:review] == 'reviewed' scope = scope.pending_review.order(requested_review_at: :desc) if filter_params[:review] == 'pending_review' - scope.order(score: :desc) + scope.order(max_score: :desc) end def filter_params |