From 7bbcf793bc75b44f2b20de77b7774759af60cd90 Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Thu, 15 Aug 2019 22:40:20 -0500 Subject: custom filters now have an option to add or override content warnings; filter caching has been fixed --- app/controllers/statuses_controller.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'app/controllers/statuses_controller.rb') diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb index 6fd937f8d..7af237da4 100644 --- a/app/controllers/statuses_controller.rb +++ b/app/controllers/statuses_controller.rb @@ -3,6 +3,7 @@ class StatusesController < ApplicationController include SignatureAuthentication include Authorization + include FilterHelper ANCESTORS_LIMIT = 40 DESCENDANTS_LIMIT = 60 @@ -192,6 +193,9 @@ class StatusesController < ApplicationController @type = @stream_entry.activity_type.downcase @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 skip_authorization else -- cgit