From 8db2f96c361442ef0d0850f81615c575f27cf44f Mon Sep 17 00:00:00 2001 From: KMY Date: Wed, 12 Apr 2023 16:37:40 +0900 Subject: [PATCH] Fix markdown property on edit status --- app/models/concerns/status_snapshot_concern.rb | 1 + app/models/status_edit.rb | 1 + app/serializers/rest/status_edit_serializer.rb | 2 +- db/migrate/20230412073021_add_markdown_to_status_edits.rb | 5 +++++ db/schema.rb | 3 ++- 5 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20230412073021_add_markdown_to_status_edits.rb diff --git a/app/models/concerns/status_snapshot_concern.rb b/app/models/concerns/status_snapshot_concern.rb index 9741b9aeb2..43b3ecd44e 100644 --- a/app/models/concerns/status_snapshot_concern.rb +++ b/app/models/concerns/status_snapshot_concern.rb @@ -19,6 +19,7 @@ module StatusSnapshotConcern status_id: id, text: text, spoiler_text: spoiler_text, + markdown: markdown, sensitive: sensitive, ordered_media_attachment_ids: ordered_media_attachment_ids&.dup || media_attachments.pluck(:id), media_descriptions: ordered_media_attachments.map(&:description), diff --git a/app/models/status_edit.rb b/app/models/status_edit.rb index 683441bb56..0ba97f33cf 100644 --- a/app/models/status_edit.rb +++ b/app/models/status_edit.rb @@ -15,6 +15,7 @@ # media_descriptions :text is an Array # poll_options :string is an Array # sensitive :boolean +# markdown :boolean default(FALSE) # class StatusEdit < ApplicationRecord diff --git a/app/serializers/rest/status_edit_serializer.rb b/app/serializers/rest/status_edit_serializer.rb index f7a48797d1..58fb039a01 100644 --- a/app/serializers/rest/status_edit_serializer.rb +++ b/app/serializers/rest/status_edit_serializer.rb @@ -5,7 +5,7 @@ class REST::StatusEditSerializer < ActiveModel::Serializer has_one :account, serializer: REST::AccountSerializer - attributes :content, :spoiler_text, :sensitive, :created_at + attributes :content, :spoiler_text, :markdown, :sensitive, :created_at has_many :ordered_media_attachments, key: :media_attachments, serializer: REST::MediaAttachmentSerializer has_many :emojis, serializer: REST::CustomEmojiSerializer diff --git a/db/migrate/20230412073021_add_markdown_to_status_edits.rb b/db/migrate/20230412073021_add_markdown_to_status_edits.rb new file mode 100644 index 0000000000..f73f5fbff5 --- /dev/null +++ b/db/migrate/20230412073021_add_markdown_to_status_edits.rb @@ -0,0 +1,5 @@ +class AddMarkdownToStatusEdits < ActiveRecord::Migration[6.1] + def change + add_column :status_edits, :markdown, :boolean, default: false + end +end diff --git a/db/schema.rb b/db/schema.rb index 2754e12256..991cfaf140 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: 2023_04_12_005311) do +ActiveRecord::Schema.define(version: 2023_04_12_073021) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -912,6 +912,7 @@ ActiveRecord::Schema.define(version: 2023_04_12_005311) do t.text "media_descriptions", array: true t.string "poll_options", array: true t.boolean "sensitive" + t.boolean "markdown", default: false t.index ["account_id"], name: "index_status_edits_on_account_id" t.index ["status_id"], name: "index_status_edits_on_status_id" end