squeegily
/
pleroma
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 42 Wiki Activity
Browse Source

Web.RelMe: Fix having other values in rel attr 

One example of this is Github which puts a rel="nofollow me" on the
profile link.
tags/v1.1.4
Haelwenn (lanodan) Monnier 5 years ago
parent
682cc94db1
commit
788a354ce0
No known key found for this signature in database GPG Key ID: D5B7A8E43C997DEE
4 changed files with 29 additions and 1 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -1
      lib/pleroma/web/rel_me.ex
  2. +14
    -0
      test/fixtures/rel_me_anchor_nofollow.html
  3. +1
    -0
      test/fixtures/rel_me_null.html
  4. +12
    -0
      test/web/rel_me_test.exs

+ 2
- 1
lib/pleroma/web/rel_me.ex View File

@@ -28,7 +28,8 @@ defmodule Pleroma.Web.RelMe do
{:ok, %Tesla.Env{body: html}} = Pleroma.HTTP.get(url, [], adapter: @hackney_options)

data =
Floki.attribute(html, "link[rel=me]", "href") ++ Floki.attribute(html, "a[rel=me]", "href")
Floki.attribute(html, "link[rel~=me]", "href") ++
Floki.attribute(html, "a[rel~=me]", "href")

{:ok, data}
rescue


+ 14
- 0
test/fixtures/rel_me_anchor_nofollow.html View File

@@ -0,0 +1,14 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8"/>
<title>Blog</title>
</head>
<body>
<article>
<h1>Lorem ipsum</h1>
<p>Lorem ipsum dolor sit ameph, …</p>
<a rel="me nofollow" href="https://social.example.org/users/lain">lain’s account</a>
</article>
</body>
</html>

+ 1
- 0
test/fixtures/rel_me_null.html View File

@@ -8,6 +8,7 @@
<article>
<h1>Lorem ipsum</h1>
<p>Lorem ipsum dolor sit ameph, …</p>
<a rel="nofollow" href="https://social.example.org/users/lain">lain’s account</a>
</article>
</body>
</html>

+ 12
- 0
test/web/rel_me_test.exs View File

@@ -11,6 +11,12 @@ defmodule Pleroma.Web.RelMeTest do

%{
method: :get,
url: "http://example.com/rel_me/anchor_nofollow"
} ->
%Tesla.Env{status: 200, body: File.read!("test/fixtures/rel_me_anchor_nofollow.html")}

%{
method: :get,
url: "http://example.com/rel_me/link"
} ->
%Tesla.Env{status: 200, body: File.read!("test/fixtures/rel_me_link.html")}
@@ -33,6 +39,7 @@ defmodule Pleroma.Web.RelMeTest do

assert Pleroma.Web.RelMe.parse("http://example.com/rel_me/link") == {:ok, hrefs}
assert Pleroma.Web.RelMe.parse("http://example.com/rel_me/anchor") == {:ok, hrefs}
assert Pleroma.Web.RelMe.parse("http://example.com/rel_me/anchor_nofollow") == {:ok, hrefs}
end

test "maybe_put_rel_me/2" do
@@ -49,6 +56,11 @@ defmodule Pleroma.Web.RelMeTest do
assert Pleroma.Web.RelMe.maybe_put_rel_me("http://example.com/rel_me/anchor", profile_urls) ==
attr

assert Pleroma.Web.RelMe.maybe_put_rel_me(
"http://example.com/rel_me/anchor_nofollow",
profile_urls
) == attr

assert Pleroma.Web.RelMe.maybe_put_rel_me("http://example.com/rel_me/link", profile_urls) ==
attr
end


Write Preview
Loading…
Cancel
Save