custom filters now have an option to add or override content warnings; filter caching has been fixed
parent
f783ec279d
commit
7bbcf793bc
|
@ -43,6 +43,6 @@ class Api::V1::FiltersController < Api::BaseController
|
||||||
end
|
end
|
||||||
|
|
||||||
def resource_params
|
def resource_params
|
||||||
params.permit(:phrase, :expires_in, :irreversible, :whole_word, :exclude_media, :media_only, :status_text, :spoiler, :tags, context: [])
|
params.permit(:phrase, :expires_in, :irreversible, :whole_word, :exclude_media, :media_only, :status_text, :spoiler, :tags, :custom_cw, :override_cw, context: [])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
class Api::V1::StatusesController < Api::BaseController
|
class Api::V1::StatusesController < Api::BaseController
|
||||||
include Authorization
|
include Authorization
|
||||||
|
include FilterHelper
|
||||||
|
|
||||||
before_action -> { authorize_if_got_token! :read, :'read:statuses' }, except: [:create, :destroy]
|
before_action -> { authorize_if_got_token! :read, :'read:statuses' }, except: [:create, :destroy]
|
||||||
before_action -> { doorkeeper_authorize! :write, :'write:statuses' }, only: [:create, :destroy]
|
before_action -> { doorkeeper_authorize! :write, :'write:statuses' }, only: [:create, :destroy]
|
||||||
|
@ -18,6 +19,8 @@ class Api::V1::StatusesController < Api::BaseController
|
||||||
|
|
||||||
def show
|
def show
|
||||||
@status = cache_collection([@status], Status).first
|
@status = cache_collection([@status], Status).first
|
||||||
|
# make sure any custom cws are applied
|
||||||
|
phrase_filtered?(@status, current_account.id, 'thread') unless current_account.nil?
|
||||||
render json: @status, serializer: REST::StatusSerializer
|
render json: @status, serializer: REST::StatusSerializer
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -58,7 +58,7 @@ class FiltersController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def resource_params
|
def resource_params
|
||||||
params.require(:custom_filter).permit(:phrase, :expires_in, :irreversible, :whole_word, :exclude_media, :spoiler, :tags, :thread, :media_only, context: [])
|
params.require(:custom_filter).permit(:phrase, :expires_in, :irreversible, :whole_word, :exclude_media, :media_only, :status_text, :spoiler, :tags, :custom_cw, :override_cw, context: [])
|
||||||
end
|
end
|
||||||
|
|
||||||
def set_body_classes
|
def set_body_classes
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
class StatusesController < ApplicationController
|
class StatusesController < ApplicationController
|
||||||
include SignatureAuthentication
|
include SignatureAuthentication
|
||||||
include Authorization
|
include Authorization
|
||||||
|
include FilterHelper
|
||||||
|
|
||||||
ANCESTORS_LIMIT = 40
|
ANCESTORS_LIMIT = 40
|
||||||
DESCENDANTS_LIMIT = 60
|
DESCENDANTS_LIMIT = 60
|
||||||
|
@ -192,6 +193,9 @@ class StatusesController < ApplicationController
|
||||||
@type = @stream_entry.activity_type.downcase
|
@type = @stream_entry.activity_type.downcase
|
||||||
@sharekey = params[:key]
|
@sharekey = params[:key]
|
||||||
|
|
||||||
|
# make sure any custom cws are applied
|
||||||
|
phrase_filtered?(@status, current_account.id, 'thread') unless current_account.nil?
|
||||||
|
|
||||||
if @status.sharekey.present? && @sharekey == @status.sharekey
|
if @status.sharekey.present? && @sharekey == @status.sharekey
|
||||||
skip_authorization
|
skip_authorization
|
||||||
else
|
else
|
||||||
|
|
|
@ -1,7 +1,10 @@
|
||||||
module FilterHelper
|
module FilterHelper
|
||||||
def phrase_filtered?(status, receiver_id, context)
|
include Redisable
|
||||||
filters = Rails.cache.fetch("filters:#{receiver_id}") { CustomFilter.where(account_id: receiver_id).active_irreversible.to_a }.to_a
|
|
||||||
|
|
||||||
|
def phrase_filtered?(status, receiver_id, context)
|
||||||
|
return true if redis.sismember("filtered_statuses:#{receiver_id}", status.id)
|
||||||
|
|
||||||
|
filters = cached_filters(receiver_id)
|
||||||
filters.select! { |filter| filter.context.include?(context.to_s) && !filter.expired? }
|
filters.select! { |filter| filter.context.include?(context.to_s) && !filter.expired? }
|
||||||
|
|
||||||
if status.media_attachments.any?
|
if status.media_attachments.any?
|
||||||
|
@ -34,6 +37,17 @@ module FilterHelper
|
||||||
|
|
||||||
if matched
|
if matched
|
||||||
filter_thread(receiver_id, status.conversation_id) if filter.thread
|
filter_thread(receiver_id, status.conversation_id) if filter.thread
|
||||||
|
|
||||||
|
unless filter.custom_cw.nil?
|
||||||
|
cw = if filter.override_cw || status.spoiler_text.blank?
|
||||||
|
filter.custom_cw
|
||||||
|
else
|
||||||
|
"[#{filter.custom_cw}] #{status.spoiler_text}".rstrip
|
||||||
|
end
|
||||||
|
redis.hset("custom_cw:#{receiver_id}", status.id, cw)
|
||||||
|
end
|
||||||
|
|
||||||
|
redis.sadd("filtered_statuses:#{receiver_id}", status.id)
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -43,10 +57,14 @@ module FilterHelper
|
||||||
|
|
||||||
def filter_thread(account_id, conversation_id)
|
def filter_thread(account_id, conversation_id)
|
||||||
return if Status.where(account_id: account_id, conversation_id: conversation_id).exists?
|
return if Status.where(account_id: account_id, conversation_id: conversation_id).exists?
|
||||||
Redis.current.sadd("filtered_threads:#{account_id}", conversation_id)
|
redis.sadd("filtered_threads:#{account_id}", conversation_id)
|
||||||
end
|
end
|
||||||
|
|
||||||
def filtering_thread?(account_id, conversation_id)
|
def filtering_thread?(account_id, conversation_id)
|
||||||
Redis.current.sismember("filtered_threads:#{account_id}", conversation_id)
|
redis.sismember("filtered_threads:#{account_id}", conversation_id)
|
||||||
|
end
|
||||||
|
|
||||||
|
def cached_filters(account_id)
|
||||||
|
Rails.cache.fetch("filters:#{account_id}") { CustomFilter.where(account_id: account_id).to_a }.to_a
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -18,6 +18,8 @@
|
||||||
# spoiler :boolean default(FALSE), not null
|
# spoiler :boolean default(FALSE), not null
|
||||||
# tags :boolean default(FALSE), not null
|
# tags :boolean default(FALSE), not null
|
||||||
# status_text :boolean default(FALSE), not null
|
# status_text :boolean default(FALSE), not null
|
||||||
|
# custom_cw :text
|
||||||
|
# override_cw :boolean default(FALSE), not null
|
||||||
#
|
#
|
||||||
|
|
||||||
class CustomFilter < ApplicationRecord
|
class CustomFilter < ApplicationRecord
|
||||||
|
@ -29,6 +31,7 @@ class CustomFilter < ApplicationRecord
|
||||||
).freeze
|
).freeze
|
||||||
|
|
||||||
include Expireable
|
include Expireable
|
||||||
|
include Redisable
|
||||||
|
|
||||||
belongs_to :account
|
belongs_to :account
|
||||||
|
|
||||||
|
@ -38,6 +41,7 @@ class CustomFilter < ApplicationRecord
|
||||||
|
|
||||||
scope :active_irreversible, -> { where(irreversible: true).where(Arel.sql('expires_at IS NULL OR expires_at > NOW()')) }
|
scope :active_irreversible, -> { where(irreversible: true).where(Arel.sql('expires_at IS NULL OR expires_at > NOW()')) }
|
||||||
|
|
||||||
|
before_validation :prepare_custom_cw
|
||||||
before_validation :clean_up_contexts
|
before_validation :clean_up_contexts
|
||||||
after_commit :remove_cache
|
after_commit :remove_cache
|
||||||
|
|
||||||
|
@ -47,9 +51,15 @@ class CustomFilter < ApplicationRecord
|
||||||
self.context = Array(context).map(&:strip).map(&:presence).compact
|
self.context = Array(context).map(&:strip).map(&:presence).compact
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def prepare_custom_cw
|
||||||
|
custom_cw&.strip!
|
||||||
|
end
|
||||||
|
|
||||||
def remove_cache
|
def remove_cache
|
||||||
Rails.cache.delete("filters:#{account_id}")
|
Rails.cache.delete("filters:#{account_id}")
|
||||||
Rails.cache.delete("filtered_threads:#{account_id}")
|
redis.del("custom_cw:#{account_id}")
|
||||||
|
redis.del("filtered_threads:#{account_id}")
|
||||||
|
redis.del("filtered_statuses:#{account_id}")
|
||||||
Redis.current.publish("timeline:#{account_id}", Oj.dump(event: :filters_changed))
|
Redis.current.publish("timeline:#{account_id}", Oj.dump(event: :filters_changed))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
class REST::StatusSerializer < ActiveModel::Serializer
|
class REST::StatusSerializer < ActiveModel::Serializer
|
||||||
|
include Redisable
|
||||||
|
|
||||||
attributes :id, :created_at, :in_reply_to_id, :in_reply_to_account_id,
|
attributes :id, :created_at, :in_reply_to_id, :in_reply_to_account_id,
|
||||||
:sensitive, :spoiler_text, :visibility, :language,
|
:sensitive, :spoiler_text, :visibility, :language,
|
||||||
:uri, :url, :replies_count, :reblogs_count,
|
:uri, :url, :replies_count, :reblogs_count,
|
||||||
|
@ -55,6 +57,10 @@ class REST::StatusSerializer < ActiveModel::Serializer
|
||||||
object.account.user_shows_application? || owner?
|
object.account.user_shows_application? || owner?
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def spoiler_text
|
||||||
|
redis.hget("custom_cw:#{current_user&.account_id}", object.id) || object.spoiler_text
|
||||||
|
end
|
||||||
|
|
||||||
def visibility
|
def visibility
|
||||||
if object.limited_visibility?
|
if object.limited_visibility?
|
||||||
'private'
|
'private'
|
||||||
|
|
|
@ -22,3 +22,7 @@
|
||||||
= f.input :thread, wrapper: :with_label
|
= f.input :thread, wrapper: :with_label
|
||||||
= f.input :media_only, wrapper: :with_label
|
= f.input :media_only, wrapper: :with_label
|
||||||
= f.input :exclude_media, wrapper: :with_label
|
= f.input :exclude_media, wrapper: :with_label
|
||||||
|
|
||||||
|
.fields-group
|
||||||
|
= f.input :custom_cw, as: :string, wrapper: :with_label
|
||||||
|
= f.input :override_cw, wrapper: :with_label
|
||||||
|
|
|
@ -181,6 +181,8 @@ en:
|
||||||
username: Username
|
username: Username
|
||||||
username_or_email: Username or Email
|
username_or_email: Username or Email
|
||||||
whole_word: Whole word
|
whole_word: Whole word
|
||||||
|
custom_cw: Set or prepend content warning
|
||||||
|
override_cw: Override existing content warning
|
||||||
boost_interval:
|
boost_interval:
|
||||||
1: 1 minute
|
1: 1 minute
|
||||||
2: 2 minutes
|
2: 2 minutes
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
class AddCustomCwsToCustomFilters < ActiveRecord::Migration[5.2]
|
||||||
|
def change
|
||||||
|
safety_assured {
|
||||||
|
add_column :custom_filters, :custom_cw, :text
|
||||||
|
add_column :custom_filters, :override_cw, :boolean, null: false, default: false
|
||||||
|
}
|
||||||
|
end
|
||||||
|
end
|
|
@ -10,7 +10,7 @@
|
||||||
#
|
#
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# It's strongly recommended that you check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema.define(version: 2019_08_07_221924) do
|
ActiveRecord::Schema.define(version: 2019_08_15_232125) do
|
||||||
|
|
||||||
# These are extensions that must be enabled in order to support this database
|
# These are extensions that must be enabled in order to support this database
|
||||||
enable_extension "plpgsql"
|
enable_extension "plpgsql"
|
||||||
|
@ -256,6 +256,8 @@ ActiveRecord::Schema.define(version: 2019_08_07_221924) do
|
||||||
t.boolean "spoiler", default: false, null: false
|
t.boolean "spoiler", default: false, null: false
|
||||||
t.boolean "tags", default: false, null: false
|
t.boolean "tags", default: false, null: false
|
||||||
t.boolean "status_text", default: false, null: false
|
t.boolean "status_text", default: false, null: false
|
||||||
|
t.text "custom_cw"
|
||||||
|
t.boolean "override_cw", default: false, null: false
|
||||||
t.index ["account_id"], name: "index_custom_filters_on_account_id"
|
t.index ["account_id"], name: "index_custom_filters_on_account_id"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue