From bfc509f44ac5506d1d675eb01aeda1324d4cdb6b Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Sun, 12 May 2019 20:14:35 +0200 Subject: [PATCH] Add database row to hold status content type --- app/models/status.rb | 2 ++ db/migrate/20190512200918_add_content_type_to_statuses.rb | 5 +++++ db/schema.rb | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20190512200918_add_content_type_to_statuses.rb diff --git a/app/models/status.rb b/app/models/status.rb index 8736e65e37..e0dc747908 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -24,6 +24,7 @@ # local_only :boolean # full_status_text :text default(""), not null # poll_id :bigint(8) +# content_type :string # class Status < ApplicationRecord @@ -74,6 +75,7 @@ class Status < ApplicationRecord validates_with DisallowedHashtagsValidator validates :reblog, uniqueness: { scope: :account }, if: :reblog? validates :visibility, exclusion: { in: %w(direct limited) }, if: :reblog? + validates :content_type, inclusion: { in: %w(text/plain text/markdown) }, allow_nil: true accepts_nested_attributes_for :poll diff --git a/db/migrate/20190512200918_add_content_type_to_statuses.rb b/db/migrate/20190512200918_add_content_type_to_statuses.rb new file mode 100644 index 0000000000..efbe2caa71 --- /dev/null +++ b/db/migrate/20190512200918_add_content_type_to_statuses.rb @@ -0,0 +1,5 @@ +class AddContentTypeToStatuses < ActiveRecord::Migration[5.2] + def change + add_column :statuses, :content_type, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 75a67c6c3a..8584d8864e 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_05_11_152737) do +ActiveRecord::Schema.define(version: 2019_05_12_200918) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -637,6 +637,7 @@ ActiveRecord::Schema.define(version: 2019_05_11_152737) do t.bigint "in_reply_to_account_id" t.boolean "local_only" t.bigint "poll_id" + t.string "content_type" t.index ["account_id", "id", "visibility", "updated_at"], name: "index_statuses_20180106", order: { id: :desc } 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"