diff options
| author | marcin mikołajczak <me@mkljczk.pl> | 2024-09-02 11:08:33 +0000 |
|---|---|---|
| committer | marcin mikołajczak <me@mkljczk.pl> | 2024-09-02 11:08:33 +0000 |
| commit | fecfe8bf89a32ffda0d52106f05b1f2e10d56472 (patch) | |
| tree | fd64698db6d89b9fe4b174a59ec916ae1ab838e6 | |
| parent | 9077d0925b61b0ba23c0ee5b41627dc91266d52d (diff) | |
| parent | 37397a43be7e73efeb1004f59fc9e69bc75da927 (diff) | |
| download | pleroma-fecfe8bf89a32ffda0d52106f05b1f2e10d56472.tar.gz pleroma-fecfe8bf89a32ffda0d52106f05b1f2e10d56472.zip | |
Merge branch 'scrubbers-allow-mention-hashtag' into 'develop'
scrubbers/default: Allow "mention hashtag" classes used by Mastodon
See merge request pleroma/pleroma!4245
| -rw-r--r-- | changelog.d/scrubbers-allow-mention-hashtag.add | 1 | ||||
| -rw-r--r-- | priv/scrubbers/default.ex | 3 | ||||
| -rw-r--r-- | priv/scrubbers/twitter_text.ex | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/changelog.d/scrubbers-allow-mention-hashtag.add b/changelog.d/scrubbers-allow-mention-hashtag.add new file mode 100644 index 000000000..c12ab1ffb --- /dev/null +++ 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 index a75a6465d..dad9dc1a1 100644 --- 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 index 6e23b3efb..4df840735 100644 --- 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", [ |