From afa1a102d6611ea0a7a41feb6383687df4f0019f Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Sat, 30 Jul 2022 19:41:47 +0200
Subject: [PATCH] Prevent Twitter markdown from stripping `<///3`

---
 app/helpers/markdown_helper.rb       | 4 ++--
 spec/helpers/markdown_helper_spec.rb | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/helpers/markdown_helper.rb b/app/helpers/markdown_helper.rb
index 23af88a1..6d80f255 100644
--- a/app/helpers/markdown_helper.rb
+++ b/app/helpers/markdown_helper.rb
@@ -7,12 +7,12 @@ module MarkdownHelper
 
   def strip_markdown(content)
     md = Redcarpet::Markdown.new(Redcarpet::Render::StripDown, MARKDOWN_OPTS)
-    CGI.unescape_html(Sanitize.fragment(md.render(content), EVIL_TAGS)).strip
+    CGI.unescape_html(Sanitize.fragment(CGI.escape_html(md.render(content)), EVIL_TAGS)).strip
   end
 
   def twitter_markdown(content)
     md = Redcarpet::Markdown.new(TwitteredMarkdown, MARKDOWN_OPTS)
-    CGI.unescape_html(Sanitize.fragment(md.render(content), EVIL_TAGS)).strip
+    CGI.unescape_html(Sanitize.fragment(CGI.escape_html(md.render(content)), EVIL_TAGS)).strip
   end
 
   def question_markdown(content)
diff --git a/spec/helpers/markdown_helper_spec.rb b/spec/helpers/markdown_helper_spec.rb
index bcfdecf1..b5ecf606 100644
--- a/spec/helpers/markdown_helper_spec.rb
+++ b/spec/helpers/markdown_helper_spec.rb
@@ -59,6 +59,10 @@ describe MarkdownHelper, type: :helper do
         expect(twitter_markdown("@test")).to eq("test")
       end
     end
+
+    it "should not strip weird hearts" do
+      expect(twitter_markdown("<///3")).to eq("<///3")
+    end
   end
 
   describe "#question_markdown" do