mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2024-12-22 08:06:55 +00:00
Merge branch 'scrubbers-allow-mention-hashtag' into 'develop'
scrubbers/default: Allow "mention hashtag" classes used by Mastodon See merge request pleroma/pleroma!4245
This commit is contained in:
commit
fecfe8bf89
3 changed files with 5 additions and 2 deletions
1
changelog.d/scrubbers-allow-mention-hashtag.add
Normal file
1
changelog.d/scrubbers-allow-mention-hashtag.add
Normal file
|
@ -0,0 +1 @@
|
||||||
|
scrubbers/default: Allow "mention hashtag" classes used by Mastodon
|
|
@ -22,7 +22,8 @@ defmodule Pleroma.HTML.Scrubber.Default do
|
||||||
"u-url",
|
"u-url",
|
||||||
"mention",
|
"mention",
|
||||||
"u-url mention",
|
"u-url mention",
|
||||||
"mention u-url"
|
"mention u-url",
|
||||||
|
"mention hashtag"
|
||||||
])
|
])
|
||||||
|
|
||||||
Meta.allow_tag_with_this_attribute_values(:a, "rel", [
|
Meta.allow_tag_with_this_attribute_values(:a, "rel", [
|
||||||
|
|
|
@ -23,7 +23,8 @@ defmodule Pleroma.HTML.Scrubber.TwitterText do
|
||||||
"u-url",
|
"u-url",
|
||||||
"mention",
|
"mention",
|
||||||
"u-url mention",
|
"u-url mention",
|
||||||
"mention u-url"
|
"mention u-url",
|
||||||
|
"mention hashtag"
|
||||||
])
|
])
|
||||||
|
|
||||||
Meta.allow_tag_with_this_attribute_values(:a, "rel", [
|
Meta.allow_tag_with_this_attribute_values(:a, "rel", [
|
||||||
|
|
Loading…
Reference in a new issue