Do not truncate DM when it contains newlines and safe_dm_mentions is set to true
This commit is contained in:
parent
be6b57193a
commit
9134848170
@ -8,7 +8,7 @@ defmodule Pleroma.Formatter do
|
|||||||
alias Pleroma.User
|
alias Pleroma.User
|
||||||
alias Pleroma.Web.MediaProxy
|
alias Pleroma.Web.MediaProxy
|
||||||
|
|
||||||
@safe_mention_regex ~r/^(\s*(?<mentions>@.+?\s+)+)(?<rest>.*)/
|
@safe_mention_regex ~r/^(\s*(?<mentions>@.+?\s+)+)(?<rest>.*)/s
|
||||||
@link_regex ~r"((?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~%:/?#[\]@!\$&'\(\)\*\+,;=.]+)|[0-9a-z+\-\.]+:[0-9a-z$-_.+!*'(),]+"ui
|
@link_regex ~r"((?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~%:/?#[\]@!\$&'\(\)\*\+,;=.]+)|[0-9a-z+\-\.]+:[0-9a-z$-_.+!*'(),]+"ui
|
||||||
@markdown_characters_regex ~r/(`|\*|_|{|}|[|]|\(|\)|#|\+|-|\.|!)/
|
@markdown_characters_regex ~r/(`|\*|_|{|}|[|]|\(|\)|#|\+|-|\.|!)/
|
||||||
|
|
||||||
|
@ -206,6 +206,15 @@ defmodule Pleroma.FormatterTest do
|
|||||||
assert mentions == []
|
assert mentions == []
|
||||||
assert expected_text == text
|
assert expected_text == text
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "given the 'safe_mention' option, it will keep text after newlines" do
|
||||||
|
user = insert(:user)
|
||||||
|
text = " @#{user.nickname}\n hey dude\n\nhow are you doing?"
|
||||||
|
|
||||||
|
{expected_text, _, _} = Formatter.linkify(text, safe_mention: true)
|
||||||
|
|
||||||
|
assert expected_text =~ "how are you doing?"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe ".parse_tags" do
|
describe ".parse_tags" do
|
||||||
|
Loading…
Reference in New Issue
Block a user