Merge pull request #157 from glitch-soc/merging-upstream

ABRACA-HRRRRRRRRRRRNGGGGGGGHHH!!!!!!!!!!!!!!!!!!!

1 files changed, 85 insertions, 61 deletions

diff --git a/db/schema.rb b/db/schema.rb
index 52edfa497..6b73ebb94 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,20 +10,20 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170914032032) do
+ActiveRecord::Schema.define(version: 20170924022025) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
-  create_table "account_domain_blocks", id: :serial, force: :cascade do |t|
-    t.integer "account_id"
+  create_table "account_domain_blocks", force: :cascade do |t|
+    t.bigint "account_id"
     t.string "domain"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["account_id", "domain"], name: "index_account_domain_blocks_on_account_id_and_domain", unique: true
   end
 
-  create_table "accounts", id: :serial, force: :cascade do |t|
+  create_table "accounts", force: :cascade do |t|
     t.string "username", default: "", null: false
     t.string "domain"
     t.string "secret", default: "", null: false
@@ -68,16 +68,16 @@ ActiveRecord::Schema.define(version: 20170914032032) do
     t.index ["username", "domain"], name: "index_accounts_on_username_and_domain", unique: true
   end
 
-  create_table "blocks", id: :serial, force: :cascade do |t|
-    t.integer "account_id", null: false
-    t.integer "target_account_id", null: false
+  create_table "blocks", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "target_account_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["account_id", "target_account_id"], name: "index_blocks_on_account_id_and_target_account_id", unique: true
   end
 
-  create_table "conversation_mutes", id: :serial, force: :cascade do |t|
-    t.integer "account_id", null: false
+  create_table "conversation_mutes", force: :cascade do |t|
+    t.bigint "account_id", null: false
     t.bigint "conversation_id", null: false
     t.index ["account_id", "conversation_id"], name: "index_conversation_mutes_on_account_id_and_conversation_id", unique: true
   end
@@ -89,7 +89,19 @@ ActiveRecord::Schema.define(version: 20170914032032) do
     t.index ["uri"], name: "index_conversations_on_uri", unique: true
   end
 
-  create_table "domain_blocks", id: :serial, force: :cascade do |t|
+  create_table "custom_emojis", force: :cascade do |t|
+    t.string "shortcode", default: "", null: false
+    t.string "domain"
+    t.string "image_file_name"
+    t.string "image_content_type"
+    t.integer "image_file_size"
+    t.datetime "image_updated_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["shortcode", "domain"], name: "index_custom_emojis_on_shortcode_and_domain", unique: true
+  end
+
+  create_table "domain_blocks", force: :cascade do |t|
     t.string "domain", default: "", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -98,9 +110,9 @@ ActiveRecord::Schema.define(version: 20170914032032) do
     t.index ["domain"], name: "index_domain_blocks_on_domain", unique: true
   end
 
-  create_table "favourites", id: :serial, force: :cascade do |t|
-    t.integer "account_id", null: false
-    t.integer "status_id", null: false
+  create_table "favourites", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "status_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["account_id", "id"], name: "index_favourites_on_account_id_and_id"
@@ -108,24 +120,24 @@ ActiveRecord::Schema.define(version: 20170914032032) do
     t.index ["status_id"], name: "index_favourites_on_status_id"
   end
 
-  create_table "follow_requests", id: :serial, force: :cascade do |t|
-    t.integer "account_id", null: false
-    t.integer "target_account_id", null: false
+  create_table "follow_requests", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "target_account_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["account_id", "target_account_id"], name: "index_follow_requests_on_account_id_and_target_account_id", unique: true
   end
 
-  create_table "follows", id: :serial, force: :cascade do |t|
-    t.integer "account_id", null: false
-    t.integer "target_account_id", null: false
+  create_table "follows", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "target_account_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["account_id", "target_account_id"], name: "index_follows_on_account_id_and_target_account_id", unique: true
   end
 
-  create_table "imports", id: :serial, force: :cascade do |t|
-    t.integer "account_id", null: false
+  create_table "imports", force: :cascade do |t|
+    t.bigint "account_id", null: false
     t.integer "type", null: false
     t.boolean "approved", default: false, null: false
     t.datetime "created_at", null: false
@@ -136,14 +148,14 @@ ActiveRecord::Schema.define(version: 20170914032032) do
     t.datetime "data_updated_at"
   end
 
-  create_table "media_attachments", id: :serial, force: :cascade do |t|
+  create_table "media_attachments", force: :cascade do |t|
     t.bigint "status_id"
     t.string "file_file_name"
     t.string "file_content_type"
     t.integer "file_file_size"
     t.datetime "file_updated_at"
     t.string "remote_url", default: "", null: false
-    t.integer "account_id"
+    t.bigint "account_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.string "shortcode"
@@ -154,8 +166,8 @@ ActiveRecord::Schema.define(version: 20170914032032) do
     t.index ["status_id"], name: "index_media_attachments_on_status_id"
   end
 
-  create_table "mentions", id: :serial, force: :cascade do |t|
-    t.integer "account_id"
+  create_table "mentions", force: :cascade do |t|
+    t.bigint "account_id"
     t.bigint "status_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -163,30 +175,30 @@ ActiveRecord::Schema.define(version: 20170914032032) do
     t.index ["status_id"], name: "index_mentions_on_status_id"
   end
 
-  create_table "mutes", id: :serial, force: :cascade do |t|
-    t.integer "account_id", null: false
-    t.integer "target_account_id", null: false
+  create_table "mutes", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "target_account_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.boolean "hide_notifications", default: true, null: false
     t.index ["account_id", "target_account_id"], name: "index_mutes_on_account_id_and_target_account_id", unique: true
   end
 
-  create_table "notifications", id: :serial, force: :cascade do |t|
-    t.integer "account_id"
+  create_table "notifications", force: :cascade do |t|
+    t.bigint "account_id"
     t.bigint "activity_id"
     t.string "activity_type"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.integer "from_account_id"
+    t.bigint "from_account_id"
     t.index ["account_id", "activity_id", "activity_type"], name: "account_activity", unique: true
     t.index ["activity_id", "activity_type"], name: "index_notifications_on_activity_id_and_activity_type"
     t.index ["id", "account_id", "activity_type"], name: "index_notifications_on_id_and_account_id_and_activity_type", order: { id: :desc }
   end
 
-  create_table "oauth_access_grants", id: :serial, force: :cascade do |t|
-    t.integer "resource_owner_id", null: false
-    t.integer "application_id", null: false
+  create_table "oauth_access_grants", force: :cascade do |t|
+    t.bigint "resource_owner_id", null: false
+    t.bigint "application_id", null: false
     t.string "token", null: false
     t.integer "expires_in", null: false
     t.text "redirect_uri", null: false
@@ -196,9 +208,9 @@ ActiveRecord::Schema.define(version: 20170914032032) do
     t.index ["token"], name: "index_oauth_access_grants_on_token", unique: true
   end
 
-  create_table "oauth_access_tokens", id: :serial, force: :cascade do |t|
-    t.integer "resource_owner_id"
-    t.integer "application_id"
+  create_table "oauth_access_tokens", force: :cascade do |t|
+    t.bigint "resource_owner_id"
+    t.bigint "application_id"
     t.string "token", null: false
     t.string "refresh_token"
     t.integer "expires_in"
@@ -210,7 +222,7 @@ ActiveRecord::Schema.define(version: 20170914032032) do
     t.index ["token"], name: "index_oauth_access_tokens_on_token", unique: true
   end
 
-  create_table "oauth_applications", id: :serial, force: :cascade do |t|
+  create_table "oauth_applications", force: :cascade do |t|
     t.string "name", null: false
     t.string "uid", null: false
     t.string "secret", null: false
@@ -220,7 +232,7 @@ ActiveRecord::Schema.define(version: 20170914032032) do
     t.datetime "updated_at"
     t.boolean "superapp", default: false, null: false
     t.string "website"
-    t.integer "owner_id"
+    t.bigint "owner_id"
     t.string "owner_type"
     t.index ["owner_id", "owner_type"], name: "index_oauth_applications_on_owner_id_and_owner_type"
     t.index ["uid"], name: "index_oauth_applications_on_uid", unique: true
@@ -253,42 +265,54 @@ ActiveRecord::Schema.define(version: 20170914032032) do
     t.index ["status_id", "preview_card_id"], name: "index_preview_cards_statuses_on_status_id_and_preview_card_id"
   end
 
-  create_table "reports", id: :serial, force: :cascade do |t|
-    t.integer "account_id", null: false
-    t.integer "target_account_id", null: false
+  create_table "reports", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "target_account_id", null: false
     t.bigint "status_ids", default: [], null: false, array: true
     t.text "comment", default: "", null: false
     t.boolean "action_taken", default: false, null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.integer "action_taken_by_account_id"
+    t.bigint "action_taken_by_account_id"
     t.index ["account_id"], name: "index_reports_on_account_id"
     t.index ["target_account_id"], name: "index_reports_on_target_account_id"
   end
 
   create_table "session_activations", force: :cascade do |t|
-    t.integer "user_id", null: false
+    t.bigint "user_id", null: false
     t.string "session_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.string "user_agent", default: "", null: false
     t.inet "ip"
-    t.integer "access_token_id"
-    t.integer "web_push_subscription_id"
+    t.bigint "access_token_id"
+    t.bigint "web_push_subscription_id"
     t.index ["session_id"], name: "index_session_activations_on_session_id", unique: true
     t.index ["user_id"], name: "index_session_activations_on_user_id"
   end
 
-  create_table "settings", id: :serial, force: :cascade do |t|
+  create_table "settings", force: :cascade do |t|
     t.string "var", null: false
     t.text "value"
     t.string "thing_type"
-    t.integer "thing_id"
+    t.bigint "thing_id"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.index ["thing_type", "thing_id", "var"], name: "index_settings_on_thing_type_and_thing_id_and_var", unique: true
   end
 
+  create_table "site_uploads", force: :cascade do |t|
+    t.string "var", default: "", null: false
+    t.string "file_file_name"
+    t.string "file_content_type"
+    t.integer "file_file_size"
+    t.datetime "file_updated_at"
+    t.json "meta"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["var"], name: "index_site_uploads_on_var", unique: true
+  end
+
   create_table "status_pins", force: :cascade do |t|
     t.bigint "account_id", null: false
     t.bigint "status_id", null: false
@@ -299,7 +323,7 @@ ActiveRecord::Schema.define(version: 20170914032032) do
 
   create_table "statuses", force: :cascade do |t|
     t.string "uri"
-    t.integer "account_id", null: false
+    t.bigint "account_id", null: false
     t.text "text", default: "", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -308,8 +332,8 @@ ActiveRecord::Schema.define(version: 20170914032032) do
     t.string "url"
     t.boolean "sensitive", default: false, null: false
     t.integer "visibility", default: 0, null: false
-    t.integer "in_reply_to_account_id"
-    t.integer "application_id"
+    t.bigint "in_reply_to_account_id"
+    t.bigint "application_id"
     t.text "spoiler_text", default: "", null: false
     t.boolean "reply", default: false, null: false
     t.integer "favourites_count", default: 0, null: false
@@ -326,13 +350,13 @@ ActiveRecord::Schema.define(version: 20170914032032) do
 
   create_table "statuses_tags", id: false, force: :cascade do |t|
     t.bigint "status_id", null: false
-    t.integer "tag_id", null: false
+    t.bigint "tag_id", null: false
     t.index ["status_id"], name: "index_statuses_tags_on_status_id"
     t.index ["tag_id", "status_id"], name: "index_statuses_tags_on_tag_id_and_status_id", unique: true
   end
 
-  create_table "stream_entries", id: :serial, force: :cascade do |t|
-    t.integer "account_id"
+  create_table "stream_entries", force: :cascade do |t|
+    t.bigint "account_id"
     t.bigint "activity_id"
     t.string "activity_type"
     t.datetime "created_at", null: false
@@ -342,12 +366,12 @@ ActiveRecord::Schema.define(version: 20170914032032) do
     t.index ["activity_id", "activity_type"], name: "index_stream_entries_on_activity_id_and_activity_type"
   end
 
-  create_table "subscriptions", id: :serial, force: :cascade do |t|
+  create_table "subscriptions", force: :cascade do |t|
     t.string "callback_url", default: "", null: false
     t.string "secret"
     t.datetime "expires_at"
     t.boolean "confirmed", default: false, null: false
-    t.integer "account_id", null: false
+    t.bigint "account_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.datetime "last_successful_delivery_at"
@@ -355,7 +379,7 @@ ActiveRecord::Schema.define(version: 20170914032032) do
     t.index ["account_id", "callback_url"], name: "index_subscriptions_on_account_id_and_callback_url", unique: true
   end
 
-  create_table "tags", id: :serial, force: :cascade do |t|
+  create_table "tags", force: :cascade do |t|
     t.string "name", default: "", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -363,9 +387,9 @@ ActiveRecord::Schema.define(version: 20170914032032) do
     t.index ["name"], name: "index_tags_on_name", unique: true
   end
 
-  create_table "users", id: :serial, force: :cascade do |t|
+  create_table "users", force: :cascade do |t|
     t.string "email", default: "", null: false
-    t.integer "account_id", null: false
+    t.bigint "account_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.string "encrypted_password", default: "", null: false
@@ -407,8 +431,8 @@ ActiveRecord::Schema.define(version: 20170914032032) do
     t.datetime "updated_at", null: false
   end
 
-  create_table "web_settings", id: :serial, force: :cascade do |t|
-    t.integer "user_id"
+  create_table "web_settings", force: :cascade do |t|
+    t.bigint "user_id"
     t.json "data"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false