Merge branch 'main' into glitch-soc/merge-upstream

2023-09-19 17:07:29 +02:00
parent 0cb343eec2 f4b780ba22
commit f546b0c999
11 changed files with 90 additions and 242 deletions
@@ -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