Add safe dm mode option.
This commit is contained in:
parent
0d14def0ca
commit
8468f3f6d4
7 changed files with 76 additions and 8 deletions
|
|
@ -181,6 +181,31 @@ defmodule Pleroma.FormatterTest do
|
|||
expected_text = "@a hi"
|
||||
assert {^expected_text, [] = _mentions, [] = _tags} = Formatter.linkify(text)
|
||||
end
|
||||
|
||||
test "given the 'safe_mention' option, it will only mention people in the beginning" do
|
||||
user = insert(:user)
|
||||
_other_user = insert(:user)
|
||||
third_user = insert(:user)
|
||||
text = " @#{user.nickname} hey dude i hate @#{third_user.nickname}"
|
||||
{expected_text, mentions, [] = _tags} = Formatter.linkify(text, safe_mention: true)
|
||||
|
||||
assert mentions == [{"@#{user.nickname}", user}]
|
||||
|
||||
assert expected_text ==
|
||||
"<span class='h-card'><a data-user='#{user.id}' class='u-url mention' href='#{
|
||||
user.ap_id
|
||||
}'>@<span>#{user.nickname}</span></a></span> hey dude i hate <span class='h-card'><a data-user='#{
|
||||
third_user.id
|
||||
}' class='u-url mention' href='#{third_user.ap_id}'>@<span>#{third_user.nickname}</span></a></span>"
|
||||
end
|
||||
|
||||
test "given the 'safe_mention' option, it will still work without any mention" do
|
||||
text = "A post without any mention"
|
||||
{expected_text, mentions, [] = _tags} = Formatter.linkify(text, safe_mention: true)
|
||||
|
||||
assert mentions == []
|
||||
assert expected_text == text
|
||||
end
|
||||
end
|
||||
|
||||
describe ".parse_tags" do
|
||||
|
|
|
|||
|
|
@ -10,6 +10,24 @@ defmodule Pleroma.Web.CommonAPITest do
|
|||
|
||||
import Pleroma.Factory
|
||||
|
||||
test "with the safe_dm_mention option set, it does not mention people beyond the initial tags" do
|
||||
har = insert(:user)
|
||||
jafnhar = insert(:user)
|
||||
tridi = insert(:user)
|
||||
option = Pleroma.Config.get([:instance, :safe_dm_mentions])
|
||||
Pleroma.Config.put([:instance, :safe_dm_mentions], true)
|
||||
|
||||
{:ok, activity} =
|
||||
CommonAPI.post(har, %{
|
||||
"status" => "@#{jafnhar.nickname} hey, i never want to see @#{tridi.nickname} again",
|
||||
"visibility" => "direct"
|
||||
})
|
||||
|
||||
refute tridi.ap_id in activity.recipients
|
||||
assert jafnhar.ap_id in activity.recipients
|
||||
Pleroma.Config.put([:instance, :safe_dm_mentions], option)
|
||||
end
|
||||
|
||||
test "it de-duplicates tags" do
|
||||
user = insert(:user)
|
||||
{:ok, activity} = CommonAPI.post(user, %{"status" => "#2hu #2HU"})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue