sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity

RelMe.maybe_put_rel_me/2: When true put "me" otherwise nil

This commit is contained in:
Haelwenn (lanodan) Monnier 2019-03-02 06:58:42 +01:00
parent 39a5bea9b7
commit 8e6f7fdb86
No known key found for this signature in database
GPG Key ID: D5B7A8E43C997DEE
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pleroma/web/rel_me.ex
View File

@ -40,12 +40,12 @@ defmodule Pleroma.Web.RelMe do
true = Enum.any?(rel_me_hrefs, fn x -> x in profile_urls end) true = Enum.any?(rel_me_hrefs, fn x -> x in profile_urls end)
"rel=\"me\" " "me"
rescue rescue
_ -> "" _ -> nil
end end
def maybe_put_rel_me(_, _) do def maybe_put_rel_me(_, _) do
"" nil
end end
end end

7
test/web/rel_me_test.exs
View File

@ -37,13 +37,14 @@ defmodule Pleroma.Web.RelMeTest do
test "maybe_put_rel_me/2" do test "maybe_put_rel_me/2" do
profile_urls = ["https://social.example.org/users/lain"] profile_urls = ["https://social.example.org/users/lain"]
attr = "rel=\"me\" " attr = "me"
fallback = nil
assert Pleroma.Web.RelMe.maybe_put_rel_me("http://example.com/rel_me/null", profile_urls) == assert Pleroma.Web.RelMe.maybe_put_rel_me("http://example.com/rel_me/null", profile_urls) ==
"" fallback
assert Pleroma.Web.RelMe.maybe_put_rel_me("http://example.com/rel_me/error", profile_urls) == assert Pleroma.Web.RelMe.maybe_put_rel_me("http://example.com/rel_me/error", profile_urls) ==
"" fallback
assert Pleroma.Web.RelMe.maybe_put_rel_me("http://example.com/rel_me/anchor", profile_urls) == assert Pleroma.Web.RelMe.maybe_put_rel_me("http://example.com/rel_me/anchor", profile_urls) ==
attr attr