revert the current unfinished chat implementation

2 files changed, 2 insertions, 29 deletions

diff --git a/db/migrate/20190526052454_create_chat_accounts.rb b/db/migrate/20190526052454_create_chat_accounts.rb
deleted file mode 100644
index b950e36c1..000000000
--- a/db/migrate/20190526052454_create_chat_accounts.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class CreateChatAccounts < ActiveRecord::Migration[5.2]
-  def change
-    create_table :chat_accounts do |t|
-      t.references :account, foreign_key: { on_delete: :cascade }, null: false
-      t.references :tag, foreign_key: { on_delete: :cascade }, null: false
-      t.index [:account_id, :tag_id], unique: true
-      t.index [:tag_id, :account_id]
-      t.timestamps
-    end
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index 23ad7cf13..47768043a 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_23_152514) do
+ActiveRecord::Schema.define(version: 2019_07_24_175247) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -151,7 +151,6 @@ ActiveRecord::Schema.define(version: 2019_07_23_152514) do
     t.boolean "adult_content", default: false, null: false
     t.datetime "silenced_at"
     t.datetime "suspended_at"
-    t.boolean "supports_chat", default: false, null: false
     t.boolean "gently", default: false, null: false
     t.boolean "kobold", default: false, null: false
     t.boolean "froze"
@@ -212,17 +211,6 @@ ActiveRecord::Schema.define(version: 2019_07_23_152514) do
     t.index ["status_id"], name: "index_bookmarks_on_status_id"
   end
 
-  create_table "chat_accounts", force: :cascade do |t|
-    t.bigint "account_id", null: false
-    t.bigint "tag_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["account_id", "tag_id"], name: "index_chat_accounts_on_account_id_and_tag_id", unique: true
-    t.index ["account_id"], name: "index_chat_accounts_on_account_id"
-    t.index ["tag_id", "account_id"], name: "index_chat_accounts_on_tag_id_and_account_id"
-    t.index ["tag_id"], name: "index_chat_accounts_on_tag_id"
-  end
-
   create_table "conversation_mutes", force: :cascade do |t|
     t.bigint "conversation_id", null: false
     t.bigint "account_id", null: false
@@ -676,7 +664,7 @@ ActiveRecord::Schema.define(version: 2019_07_23_152514) do
     t.string "origin"
     t.tsvector "tsv"
     t.index ["account_id", "id", "visibility", "updated_at"], name: "index_statuses_20180106", order: { id: :desc }
-    t.index ["account_id", "id", "visibility"], name: "index_statuses_on_account_id_and_id_and_visibility", where: "(visibility = ANY (ARRAY[0, 1, 2, 4, 5]))"
+    t.index ["account_id", "id", "visibility"], name: "index_statuses_on_account_id_and_id_and_visibility", order: { id: :desc }, where: "(visibility = ANY (ARRAY[0, 1, 2, 4]))"
     t.index ["in_reply_to_account_id"], name: "index_statuses_on_in_reply_to_account_id"
     t.index ["in_reply_to_id"], name: "index_statuses_on_in_reply_to_id"
     t.index ["network"], name: "index_statuses_on_network", where: "network"
@@ -711,9 +699,7 @@ ActiveRecord::Schema.define(version: 2019_07_23_152514) do
     t.boolean "local", default: false, null: false
     t.boolean "private", default: false, null: false
     t.boolean "unlisted", default: false, null: false
-    t.boolean "chat", default: false, null: false
     t.index "lower((name)::text) text_pattern_ops", name: "hashtag_search_index"
-    t.index ["chat"], name: "index_tags_on_chat", where: "chat"
     t.index ["name"], name: "index_tags_on_name", unique: true
     t.index ["unlisted"], name: "index_tags_on_unlisted", where: "unlisted"
   end
@@ -819,8 +805,6 @@ ActiveRecord::Schema.define(version: 2019_07_23_152514) do
   add_foreign_key "blocks", "accounts", name: "fk_4269e03e65", on_delete: :cascade
   add_foreign_key "bookmarks", "accounts", on_delete: :cascade
   add_foreign_key "bookmarks", "statuses", on_delete: :cascade
-  add_foreign_key "chat_accounts", "accounts", on_delete: :cascade
-  add_foreign_key "chat_accounts", "tags", on_delete: :cascade
   add_foreign_key "conversation_mutes", "accounts", name: "fk_225b4212bb", on_delete: :cascade
   add_foreign_key "conversation_mutes", "conversations", on_delete: :cascade
   add_foreign_key "custom_filters", "accounts", on_delete: :cascade