Merge remote-tracking branch 'parent/stable-4.2' into kb_development

This commit is contained in:
KMY 2023-09-20 09:04:10 +09:00
commit 454f262b2f
23 changed files with 370 additions and 389 deletions

View file

@ -75,7 +75,9 @@ class TranslateStatusService < BaseService
case source
when :content
status_translation.content = unwrap_emoji_shortcodes(translation.text).to_html
node = unwrap_emoji_shortcodes(translation.text)
Sanitize.node!(node, Sanitize::Config::MASTODON_STRICT)
status_translation.content = node.to_html
when :spoiler_text
status_translation.spoiler_text = unwrap_emoji_shortcodes(translation.text).content
when Poll::Option