mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-12 14:16:12 +01:00
Code Issues Projects Releases Wiki Activity

Add support for HTML-formatted toots

Browse Source
This commit is contained in:
Thibaut Girka 2019-05-12 21:33:37 +02:00 committed by ThibG
parent 94aef563b9
commit d7520f8175
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/lib/formatter.rb
View File

@ -37,9 +37,9 @@ class Formatter
html = raw_content
html = "RT @#{prepend_reblog} #{html}" if prepend_reblog
html = format_markdown(html) if status.content_type == 'text/markdown'
html = encode_and_link_urls(html, linkable_accounts, keep_html: status.content_type == 'text/markdown')
html = encode_and_link_urls(html, linkable_accounts, keep_html: %w(text/markdown text/html).include?(status.content_type))
html = encode_custom_emojis(html, status.emojis, options[:autoplay]) if options[:custom_emojify]
html = simple_format(html, {}, sanitize: false) unless status.content_type == 'text/markdown'
html = simple_format(html, {}, sanitize: false) unless %w(text/markdown text/html).include?(status.content_type)
html = html.delete("\n")
html.html_safe # rubocop:disable Rails/OutputSafety

2
app/models/status.rb
View File

@ -75,7 +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
validates :content_type, inclusion: { in: %w(text/plain text/markdown text/html) }, allow_nil: true
accepts_nested_attributes_for :poll