pleroma

commit: fecfe8bf89a32ffda0d52106f05b1f2e10d56472
parent 9077d0925b61b0ba23c0ee5b41627dc91266d52d
Author: marcin mikołajczak <me@mkljczk.pl>
Date:   Mon,  2 Sep 2024 11:08:33 +0000

Merge branch 'scrubbers-allow-mention-hashtag' into 'develop'

scrubbers/default: Allow "mention hashtag" classes used by Mastodon

See merge request pleroma/pleroma!4245
Diffstat:
A
changelog.d/scrubbers-allow-mention-hashtag.add
2
++
M
priv/scrubbers/default.ex
3
++-
M
priv/scrubbers/twitter_text.ex
3
++-

3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/changelog.d/scrubbers-allow-mention-hashtag.add b/changelog.d/scrubbers-allow-mention-hashtag.add
@@ -0,0 +1 @@
+scrubbers/default: Allow "mention hashtag" classes used by Mastodon
+\ No newline at end of file
diff --git a/priv/scrubbers/default.ex b/priv/scrubbers/default.ex
@@ -22,7 +22,8 @@ defmodule Pleroma.HTML.Scrubber.Default do
     "u-url",
     "mention",
     "u-url mention",
-    "mention u-url"
+    "mention u-url",
+    "mention hashtag"
   ])
 
   Meta.allow_tag_with_this_attribute_values(:a, "rel", [
diff --git a/priv/scrubbers/twitter_text.ex b/priv/scrubbers/twitter_text.ex
@@ -23,7 +23,8 @@ defmodule Pleroma.HTML.Scrubber.TwitterText do
     "u-url",
     "mention",
     "u-url mention",
-    "mention u-url"
+    "mention u-url",
+    "mention hashtag"
   ])
 
   Meta.allow_tag_with_this_attribute_values(:a, "rel", [