Add "locked" flag to accounts, prevent blocked users from following, force-unfollow blocked users

2 files changed, 7 insertions, 1 deletions

diff --git a/db/migrate/20161222201034_add_locked_to_accounts.rb b/db/migrate/20161222201034_add_locked_to_accounts.rb
new file mode 100644
index 000000000..c246a90ce
--- /dev/null
+++ b/db/migrate/20161222201034_add_locked_to_accounts.rb
@@ -0,0 +1,5 @@
+class AddLockedToAccounts < ActiveRecord::Migration[5.0]
+  def change
+    add_column :accounts, :locked, :boolean, null: false, default: false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 706099897..47e1b098d 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: 20161221152630) do
+ActiveRecord::Schema.define(version: 20161222201034) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -42,6 +42,7 @@ ActiveRecord::Schema.define(version: 20161221152630) do
     t.datetime "subscription_expires_at"
     t.boolean  "silenced",                default: false, null: false
     t.boolean  "suspended",               default: false, null: false
+    t.boolean  "locked",                  default: false, null: false
     t.index ["username", "domain"], name: "index_accounts_on_username_and_domain", unique: true, using: :btree
   end