filters now have options to separately match post text, content warnings/titles, & hashtags + option to filter threads containing a matching post

6 files changed, 31 insertions, 1 deletions

diff --git a/db/migrate/20190801212756_add_thread_to_custom_filters.rb b/db/migrate/20190801212756_add_thread_to_custom_filters.rb
new file mode 100644
index 000000000..de2507451
--- /dev/null
+++ b/db/migrate/20190801212756_add_thread_to_custom_filters.rb
@@ -0,0 +1,5 @@
+class AddThreadToCustomFilters < ActiveRecord::Migration[5.2]
+  def change
+    safety_assured { add_column :custom_filters, :thread, :boolean, null: false, default: false }
+  end
+end
diff --git a/db/migrate/20190801213117_add_spoiler_to_custom_filters.rb b/db/migrate/20190801213117_add_spoiler_to_custom_filters.rb
new file mode 100644
index 000000000..63aba46ac
--- /dev/null
+++ b/db/migrate/20190801213117_add_spoiler_to_custom_filters.rb
@@ -0,0 +1,5 @@
+class AddSpoilerToCustomFilters < ActiveRecord::Migration[5.2]
+  def change
+    safety_assured { add_column :custom_filters, :spoiler, :boolean, null: false, default: false }
+  end
+end
diff --git a/db/migrate/20190801213606_add_tags_to_custom_filters.rb b/db/migrate/20190801213606_add_tags_to_custom_filters.rb
new file mode 100644
index 000000000..4ed1a6e34
--- /dev/null
+++ b/db/migrate/20190801213606_add_tags_to_custom_filters.rb
@@ -0,0 +1,5 @@
+class AddTagsToCustomFilters < ActiveRecord::Migration[5.2]
+  def change
+    safety_assured { add_column :custom_filters, :tags, :boolean, null: false, default: false }
+  end
+end
diff --git a/db/migrate/20190801222645_add_status_text_to_custom_filters.rb b/db/migrate/20190801222645_add_status_text_to_custom_filters.rb
new file mode 100644
index 000000000..cf4bbd28b
--- /dev/null
+++ b/db/migrate/20190801222645_add_status_text_to_custom_filters.rb
@@ -0,0 +1,5 @@
+class AddStatusTextToCustomFilters < ActiveRecord::Migration[5.2]
+  def change
+    safety_assured { add_column :custom_filters, :status_text, :boolean, null: false, default: false }
+  end
+end
diff --git a/db/migrate/20190801222823_set_status_text_bool_for_existing_filters.rb b/db/migrate/20190801222823_set_status_text_bool_for_existing_filters.rb
new file mode 100644
index 000000000..787c63929
--- /dev/null
+++ b/db/migrate/20190801222823_set_status_text_bool_for_existing_filters.rb
@@ -0,0 +1,6 @@
+class SetStatusTextBoolForExistingFilters < ActiveRecord::Migration[5.2]
+  def up
+    CustomFilter.where(status_text: false).in_batches.update_all(status_text: true)
+    CustomFilter.where(spoiler_text: false).in_batches.update_all(spoiler_text: true)
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 4d7085515..9197404aa 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2019_07_30_213656) do
+ActiveRecord::Schema.define(version: 2019_08_01_222823) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -251,6 +251,10 @@ ActiveRecord::Schema.define(version: 2019_07_30_213656) do
     t.boolean "whole_word", default: true, null: false
     t.boolean "exclude_media", default: false, null: false
     t.boolean "media_only", default: false, null: false
+    t.boolean "thread", default: false, null: false
+    t.boolean "spoiler", default: false, null: false
+    t.boolean "tags", default: false, null: false
+    t.boolean "status_text", default: false, null: false
     t.index ["account_id"], name: "index_custom_filters_on_account_id"
   end