about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2019-05-18 13:03:36 -0500
committermultiple creatures <dev@multiple-creature.party>2019-05-21 03:16:50 -0500
commit7a0dc34cad955fecba8072f5ed3c179ba5a3fd98 (patch)
tree7e539207950bc274c5504bf5904a49abf0d9aca2 /app/models
parent09b7532805a349d1a57f4a650c7f41456cda184b (diff)
reimplement monsterpit bbcode and markdown extensions on top of new glitch-soc formatting system + bbcode feature parity + new `i:am` footer + set content type from `format` bangtag
Diffstat (limited to 'app/models')
-rw-r--r--app/models/status.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/status.rb b/app/models/status.rb
index 0de92e0c6..895ac8fd6 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -23,11 +23,12 @@
 #  in_reply_to_account_id :bigint(8)
 #  local_only             :boolean
 #  poll_id                :bigint(8)
-#  content_type           :string
 #  tsv                    :tsvector
 #  curated                :boolean          default(FALSE), not null
 #  sharekey               :string
 #  network                :boolean          default(FALSE), not null
+#  content_type           :string
+#  footer                 :text
 #
 
 class Status < ApplicationRecord
@@ -81,7 +82,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 text/html) }, allow_nil: true
+  validates :content_type, inclusion: { in: %w(text/plain text/markdown text/x-bbcode text/x-bbcode+markdown text/html) }, allow_nil: true
 
   accepts_nested_attributes_for :poll