Add exclude_follows, exclude_localusers settings to custom_filter

app/controllers/api/v1/filters_controller.rb

@@ -52,11 +52,11 @@ class Api::V1::FiltersController < Api::BaseController
   end
 
   def resource_params
-    params.permit(:phrase, :expires_in, :irreversible, :whole_word, context: [])
+    params.permit(:phrase, :expires_in, :irreversible, :exclude_follows, :exclude_localusers, :whole_word, context: [])
   end
 
   def filter_params
-    resource_params.slice(:phrase, :expires_in, :irreversible, :context)
+    resource_params.slice(:phrase, :expires_in, :irreversible, :exclude_follows, :exclude_localusers, :context)
   end
 
   def keyword_params

app/controllers/api/v2/filters_controller.rb

@@ -43,6 +43,6 @@ class Api::V2::FiltersController < Api::BaseController
   end
 
   def resource_params
-    params.permit(:title, :expires_in, :filter_action, context: [], keywords_attributes: [:id, :keyword, :whole_word, :_destroy])
+    params.permit(:title, :expires_in, :filter_action, :exclude_follows, :exclude_localusers, context: [], keywords_attributes: [:id, :keyword, :whole_word, :_destroy])
   end
 end

app/controllers/filters_controller.rb

@@ -49,7 +49,7 @@ class FiltersController < ApplicationController
   end
 
   def resource_params
-    params.require(:custom_filter).permit(:title, :expires_in, :filter_action, context: [], keywords_attributes: [:id, :keyword, :whole_word, :_destroy])
+    params.require(:custom_filter).permit(:title, :expires_in, :filter_action, :exclude_follows, :exclude_localusers, context: [], keywords_attributes: [:id, :keyword, :whole_word, :_destroy])
   end
 
   def set_body_classes

app/models/concerns/account_interactions.rb

@@ -265,7 +265,7 @@ module AccountInteractions
 
   def status_matches_filters(status)
     active_filters = CustomFilter.cached_filters_for(id)
-    CustomFilter.apply_cached_filters(active_filters, status)
+    CustomFilter.apply_cached_filters(active_filters, status, following?(status.account))
   end
 
   def followers_for_local_distribution

app/models/custom_filter.rb

@@ -4,14 +4,16 @@
 #
 # Table name: custom_filters
 #
-#  id         :bigint(8)        not null, primary key
-#  account_id :bigint(8)
-#  expires_at :datetime
-#  phrase     :text             default(""), not null
-#  context    :string           default([]), not null, is an Array
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
-#  action     :integer          default("warn"), not null
+#  id                 :bigint(8)        not null, primary key
+#  account_id         :bigint(8)
+#  expires_at         :datetime
+#  phrase             :text             default(""), not null
+#  context            :string           default([]), not null, is an Array
+#  created_at         :datetime         not null
+#  updated_at         :datetime         not null
+#  action             :integer          default("warn"), not null
+#  exclude_follows    :boolean          default(FALSE), not null
+#  exclude_localusers :boolean          default(FALSE), not null
 #
 
 class CustomFilter < ApplicationRecord
@@ -94,8 +96,11 @@ class CustomFilter < ApplicationRecord
     active_filters.select { |custom_filter, _| !custom_filter.expired? }
   end
 
-  def self.apply_cached_filters(cached_filters, status)
+  def self.apply_cached_filters(cached_filters, status, following)
     cached_filters.filter_map do |filter, rules|
+      next if filter.exclude_follows && following
+      next if filter.exclude_localusers && status.account.local?
+
       match = rules[:keywords].match(status.proper.searchable_text) if rules[:keywords].present?
       keyword_matches = [match.to_s] unless match.nil?
 

app/models/custom_filter_keyword.rb

@@ -7,7 +7,7 @@
 #  id               :bigint(8)        not null, primary key
 #  custom_filter_id :bigint(8)        not null
 #  keyword          :text             default(""), not null
-#  whole_word       :boolean          default(TRUE), not null
+#  whole_word       :boolean          default(FALSE), not null
 #  created_at       :datetime         not null
 #  updated_at       :datetime         not null
 #

app/presenters/status_relationships_presenter.rb

@@ -7,6 +7,8 @@ class StatusRelationshipsPresenter
               :bookmarks_map, :filters_map, :emoji_reactions_map
 
   def initialize(statuses, current_account_id = nil, **options)
+    @current_account_id = current_account_id
+
     if current_account_id.nil?
       @reblogs_map         = {}
       @favourites_map      = {}
@@ -37,7 +39,7 @@ class StatusRelationshipsPresenter
     active_filters = CustomFilter.cached_filters_for(current_account_id)
 
     @filters_map = statuses.each_with_object({}) do |status, h|
-      filter_matches = CustomFilter.apply_cached_filters(active_filters, status)
+      filter_matches = CustomFilter.apply_cached_filters(active_filters, status, following?(status.account_id))
 
       unless filter_matches.empty?
         h[status.id] = filter_matches
@@ -45,4 +47,14 @@ class StatusRelationshipsPresenter
       end
     end
   end
+
+  def following?(other_account_id)
+    return false if @current_account_id.nil?
+
+    @account ||= Account.find(@current_account_id)
+    return false unless @account
+
+    @following_map ||= @account.following.pluck(:id)
+    @following_map.include?(other_account_id)
+  end
 end

app/serializers/rest/filter_serializer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class REST::FilterSerializer < ActiveModel::Serializer
-  attributes :id, :title, :context, :expires_at, :filter_action
+  attributes :id, :title, :exclude_follows, :exclude_localusers, :context, :expires_at, :filter_action
   has_many :keywords, serializer: REST::FilterKeywordSerializer, if: :rules_requested?
   has_many :statuses, serializer: REST::FilterStatusSerializer, if: :rules_requested?
 

app/serializers/rest/v1/filter_serializer.rb

@@ -2,7 +2,7 @@
 
 class REST::V1::FilterSerializer < ActiveModel::Serializer
   attributes :id, :phrase, :context, :whole_word, :expires_at,
-             :irreversible
+             :irreversible, :exclude_follows, :exclude_localusers
 
   delegate :context, :expires_at, to: :custom_filter
 
@@ -18,6 +18,10 @@ class REST::V1::FilterSerializer < ActiveModel::Serializer
     custom_filter.irreversible?
   end
 
+  delegate :exclude_follows, to: :custom_filter
+
+  delegate :exclude_localusers, to: :custom_filter
+
   private
 
   def custom_filter

app/views/filters/_filter_fields.html.haml

@@ -12,6 +12,10 @@
 .fields-group
   = f.input :filter_action, as: :radio_buttons, collection: %i(warn hide), include_blank: false, wrapper: :with_block_label, label_method: ->(action) { safe_join([t("simple_form.labels.filters.actions.#{action}"), content_tag(:span, t("simple_form.hints.filters.actions.#{action}"), class: 'hint')]) }, hint: t('simple_form.hints.filters.action'), required: true
 
+.fields-group
+  = f.input :exclude_follows, wrapper: :with_label, kmyblue: true, label: t('simple_form.labels.filters.options.exclude_follows')
+  = f.input :exclude_localusers, wrapper: :with_label, kmyblue: true, label: t('simple_form.labels.filters.options.exclude_localusers')
+
 %hr.spacer/
 
 - unless f.object.statuses.empty?