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

handle custom cws when a filter has the `entire thread` option set

staging
multiple creatures 2019-08-15 23:22:43 -05:00
parent 14cf223041
commit f40c6dbc93
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/helpers/filter_helper.rb
View File

@ -3,7 +3,7 @@ module FilterHelper
def phrase_filtered?(status, receiver_id, context)
if redis.sismember("filtered_statuses:#{receiver_id}", status.id)
return redis.hexists("custom_cw:#{receiver_id}", status.id)
return !(redis.hexists("custom_cw:#{receiver_id}", status.id) || redis.hexists("custom_cw:#{receiver_id}", "c#{status.conversation_id}"))
end
filters = cached_filters(receiver_id)
@ -38,7 +38,7 @@ module FilterHelper
matched = true unless tags.empty? || regex.match(tags).nil?
if matched
filter_thread(receiver_id, status.conversation_id) if filter.thread
filter_thread(receiver_id, status.conversation_id) if filter.thread && filter.custom_cw.blank?
unless filter.custom_cw.blank?
cw = if filter.override_cw || status.spoiler_text.blank?
@ -46,7 +46,12 @@ module FilterHelper
else
"[#{filter.custom_cw}] #{status.spoiler_text}".rstrip
end
redis.hset("custom_cw:#{receiver_id}", status.id, cw)
if filter.thread
redis.hset("custom_cw:#{receiver_id}", "c#{status.conversation_id}", cw)
else
redis.hset("custom_cw:#{receiver_id}", status.id, cw)
end
end
redis.sadd("filtered_statuses:#{receiver_id}", status.id)

2
app/serializers/rest/status_serializer.rb
View File

@ -58,7 +58,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
end
def spoiler_text
redis.hget("custom_cw:#{current_user&.account_id}", object.id) || object.spoiler_text
redis.hget("custom_cw:#{current_user&.account_id}", object.id) || redis.hget("custom_cw:#{current_user&.account_id}", "c#{object.conversation_id}") || object.spoiler_text
end
def visibility