diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-10-14 22:57:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-14 22:57:41 +0200 |
| commit | b6f24ef0fb8b594c38c29090518c21af051b63b7 (patch) | |
| tree | 5cec6a6b13dfd062848c74ae8e041c589ae40d00 /app/models | |
| parent | ebf2c3195615bb524f6908e84f99887c8775cbc3 (diff) | |
| parent | 6964952d5f242ca936de9df361185b3e70a99ca4 (diff) | |
Merge pull request #1622 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/account_statuses_cleanup_policy.rb | 4 | ||||
| -rw-r--r-- | app/models/admin/action_log_filter.rb | 2 | ||||
| -rw-r--r-- | app/models/status.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/models/account_statuses_cleanup_policy.rb b/app/models/account_statuses_cleanup_policy.rb index 705ccff54..0a9551ec2 100644 --- a/app/models/account_statuses_cleanup_policy.rb +++ b/app/models/account_statuses_cleanup_policy.rb @@ -164,8 +164,8 @@ class AccountStatusesCleanupPolicy < ApplicationRecord def without_popular_scope scope = Status.left_joins(:status_stat) - scope = scope.where('COALESCE(status_stats.reblogs_count, 0) <= ?', min_reblogs) unless min_reblogs.nil? - scope = scope.where('COALESCE(status_stats.favourites_count, 0) <= ?', min_favs) unless min_favs.nil? + scope = scope.where('COALESCE(status_stats.reblogs_count, 0) < ?', min_reblogs) unless min_reblogs.nil? + scope = scope.where('COALESCE(status_stats.favourites_count, 0) < ?', min_favs) unless min_favs.nil? scope end end diff --git a/app/models/admin/action_log_filter.rb b/app/models/admin/action_log_filter.rb index a1c156a8b..6e19dcf70 100644 --- a/app/models/admin/action_log_filter.rb +++ b/app/models/admin/action_log_filter.rb @@ -76,7 +76,7 @@ class Admin::ActionLogFilter when 'account_id' Admin::ActionLog.where(account_id: value) when 'target_account_id' - account = Account.find(value) + account = Account.find_or_initialize_by(id: value) Admin::ActionLog.where(target: [account, account.user].compact) else raise "Unknown filter: #{key}" diff --git a/app/models/status.rb b/app/models/status.rb index 9f673ee53..7b11709fa 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -494,7 +494,7 @@ class Status < ApplicationRecord end def decrement_counter_caches - return if direct_visibility? + return if direct_visibility? || new_record? account&.decrement_count!(:statuses_count) reblog&.decrement_count!(:reblogs_count) if reblog? |