custom filters now have an option to add or override content warnings; filter caching has been fixed

2 files changed, 11 insertions, 1 deletions

diff --git a/db/migrate/20190815232125_add_custom_cws_to_custom_filters.rb b/db/migrate/20190815232125_add_custom_cws_to_custom_filters.rb
new file mode 100644
index 000000000..ec201e7b6
--- /dev/null
+++ b/db/migrate/20190815232125_add_custom_cws_to_custom_filters.rb
@@ -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
diff --git a/db/schema.rb b/db/schema.rb
index 7f7d31bd2..16b284b58 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_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
   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 "tags", 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"
   end