Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-24 19:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's version of the conflicting lines.
This commit is contained in:
Claire
2023-12-21 19:24:10 +01:00
parent 7a0be26367 f99e05710e
commit f5b7307890
65 changed files with 2346 additions and 661 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/custom_filter.rb
View File

@@ -91,7 +91,7 @@ class CustomFilter < ApplicationRecord
filters_hash.values.map { |cache| [cache.delete(:filter), cache] }
end.to_a
active_filters.select { |custom_filter, _| !custom_filter.expired? }
active_filters.reject { |custom_filter, _| custom_filter.expired? }
end
def self.apply_cached_filters(cached_filters, status)