marrub
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

only drop posts matching a custom filter when the filter has no cw override set

staging
multiple creatures 2019-08-15 22:53:02 -05:00
parent 7bbcf793bc
commit 14cf223041
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/helpers/filter_helper.rb
View File

@ -2,7 +2,9 @@ module FilterHelper
include Redisable
def phrase_filtered?(status, receiver_id, context)
return true if redis.sismember("filtered_statuses:#{receiver_id}", status.id)
if redis.sismember("filtered_statuses:#{receiver_id}", status.id)
return redis.hexists("custom_cw:#{receiver_id}", status.id)
end
filters = cached_filters(receiver_id)
filters.select! { |filter| filter.context.include?(context.to_s) && !filter.expired? }
@ -38,7 +40,7 @@ module FilterHelper
if matched
filter_thread(receiver_id, status.conversation_id) if filter.thread
unless filter.custom_cw.nil?
unless filter.custom_cw.blank?
cw = if filter.override_cw || status.spoiler_text.blank?
filter.custom_cw
else
@ -48,7 +50,7 @@ module FilterHelper
end
redis.sadd("filtered_statuses:#{receiver_id}", status.id)
return true
return filter.custom_cw.blank?
end
end