diff options
| -rw-r--r-- | app/models/account.rb | 7 | ||||
| -rw-r--r-- | db/schema.rb | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index d939909eb..6379a5031 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -25,8 +25,6 @@ # header_file_size :integer # header_updated_at :datetime # avatar_remote_url :string -# silenced :boolean default(FALSE), not null -# suspended :boolean default(FALSE), not null # locked :boolean default(FALSE), not null # header_remote_url :string default(""), not null # last_webfingered_at :datetime @@ -41,9 +39,6 @@ # actor_type :string # discoverable :boolean # also_known_as :string is an Array -# silenced_at :datetime -# suspended_at :datetime -# hidden :boolean # hidden :boolean default(FALSE), not null # vars :jsonb not null # replies :boolean default(TRUE), not null @@ -51,6 +46,8 @@ # force_unlisted :boolean default(FALSE), not null # force_sensitive :boolean default(FALSE), not null # adults_only :boolean default(FALSE), not null +# silenced_at :datetime +# suspended_at :datetime # class Account < ApplicationRecord diff --git a/db/schema.rb b/db/schema.rb index 19725e8a1..46edcab6a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -128,8 +128,6 @@ ActiveRecord::Schema.define(version: 2019_05_19_130537) do t.integer "header_file_size" t.datetime "header_updated_at" t.string "avatar_remote_url" - t.boolean "silenced", default: false, null: false - t.boolean "suspended", default: false, null: false t.boolean "locked", default: false, null: false t.string "header_remote_url", default: "", null: false t.datetime "last_webfingered_at" @@ -144,9 +142,6 @@ ActiveRecord::Schema.define(version: 2019_05_19_130537) do t.string "actor_type" t.boolean "discoverable" t.string "also_known_as", array: true - t.datetime "silenced_at" - t.datetime "suspended_at" - t.boolean "hidden" t.boolean "hidden", default: false, null: false t.jsonb "vars", default: {}, null: false t.boolean "replies", default: true, null: false @@ -154,6 +149,8 @@ ActiveRecord::Schema.define(version: 2019_05_19_130537) do t.boolean "force_unlisted", default: false, null: false t.boolean "force_sensitive", default: false, null: false t.boolean "adults_only", default: false, null: false + t.datetime "silenced_at" + t.datetime "suspended_at" t.index "(((setweight(to_tsvector('simple'::regconfig, (display_name)::text), 'A'::\"char\") || setweight(to_tsvector('simple'::regconfig, (username)::text), 'B'::\"char\")) || setweight(to_tsvector('simple'::regconfig, (COALESCE(domain, ''::character varying))::text), 'C'::\"char\")))", name: "search_index", using: :gin t.index "lower((username)::text), lower((domain)::text)", name: "index_accounts_on_username_and_domain_lower", unique: true t.index ["moved_to_account_id"], name: "index_accounts_on_moved_to_account_id" |