Pull in remote avatar on federation.

diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index 16b6ac421b3ff632957d8850553f6c8eaf8e4849..01d6745ef41faa74560784fb7f4f21e13855e81c 100644 (file)
--- a/lib/pleroma/web/ostatus/ostatus.ex
+++ b/lib/pleroma/web/ostatus/ostatus.ex
@@ -39,8 +39,6 @@ defmodule Pleroma.Web.OStatus do
     {:ok, activities}
   end
 
-  # TODO
-  # wire up replies
   def handle_note(entry, doc \\ nil) do
     content_html = string_from_xpath("/entry/content[1]", entry)
 
@@ -112,7 +110,8 @@ defmodule Pleroma.Web.OStatus do
         name: info.name,
         nickname: info.nickname <> "@" <> info.host,
         ap_id: info.uri,
-        info: info
+        info: info,
+        avatar: info.avatar
       }
       # TODO: Make remote user changeset
       # SHould enforce fqn nickname
@@ -121,9 +120,9 @@ defmodule Pleroma.Web.OStatus do
   end
 
   # TODO: Just takes the first one for now.
-  defp make_avatar_object(author_doc) do
-    href = string_from_xpath("/author[1]/link[@rel=\"avatar\"]/@href", author_doc)
-    type = string_from_xpath("/author[1]/link[@rel=\"avatar\"]/@type", author_doc)
+  def make_avatar_object(author_doc) do
+    href = string_from_xpath("/feed/author[1]/link[@rel=\"avatar\"]/@href", author_doc)
+    type = string_from_xpath("/feed/author[1]/link[@rel=\"avatar\"]/@type", author_doc)
 
     if href do
       %{

diff --git a/lib/pleroma/web/websub/websub.ex b/lib/pleroma/web/websub/websub.ex
index 3fd779fba25c50956f09c7be51e59f990c162903..63a91055a9081264e06dd662f3752656bfb59773 100644 (file)
--- a/lib/pleroma/web/websub/websub.ex
+++ b/lib/pleroma/web/websub/websub.ex
@@ -134,13 +134,15 @@ defmodule Pleroma.Web.Websub do
       name = XML.string_from_xpath("/feed/author[1]/name", doc)
       preferredUsername = XML.string_from_xpath("/feed/author[1]/poco:preferredUsername", doc)
       displayName = XML.string_from_xpath("/feed/author[1]/poco:displayName", doc)
+      avatar = OStatus.make_avatar_object(doc)
 
       {:ok, %{
         uri: uri,
         hub: hub,
         nickname: preferredUsername || name,
         name: displayName || name,
-        host: URI.parse(uri).host
+        host: URI.parse(uri).host,
+        avatar: avatar
       }}
     else e ->
       {:error, e}

diff --git a/test/web/ostatus/ostatus_test.exs b/test/web/ostatus/ostatus_test.exs
index 07073a40d79f4487be7a5afd5186bf20d9f5a965..4e7e401cde3c761c1f349d56cebf92e8c26b4630 100644 (file)
--- a/test/web/ostatus/ostatus_test.exs
+++ b/test/web/ostatus/ostatus_test.exs
@@ -64,6 +64,7 @@ defmodule Pleroma.Web.OStatusTest do
       assert user.local == false
       assert user.info["uri"] == uri
       assert user.ap_id == uri
+      assert user.avatar["type"] == "Image"
 
       {:ok, user_again} = OStatus.find_or_make_user(uri)
 
@@ -88,7 +89,8 @@ defmodule Pleroma.Web.OStatusTest do
         topic: "https://social.heldscal.la/api/statuses/user_timeline/29191.atom",
         uri: "https://social.heldscal.la/user/29191",
         host: "social.heldscal.la",
-        fqn: user
+        fqn: user,
+        avatar: %{"type" => "Image", "url" => [%{"href" => "https://social.heldscal.la/avatar/29191-original-20170421154949.jpeg", "mediaType" => "image/jpeg", "type" => "Link"}]}
       }
       assert data == expected
     end
@@ -109,7 +111,8 @@ defmodule Pleroma.Web.OStatusTest do
         topic: "https://social.heldscal.la/api/statuses/user_timeline/29191.atom",
         uri: "https://social.heldscal.la/user/29191",
         host: "social.heldscal.la",
-        fqn: user
+        fqn: user,
+        avatar: %{"type" => "Image", "url" => [%{"href" => "https://social.heldscal.la/avatar/29191-original-20170421154949.jpeg", "mediaType" => "image/jpeg", "type" => "Link"}]}
       }
       assert data == expected
     end

diff --git a/test/web/websub/websub_test.exs b/test/web/websub/websub_test.exs
index e0d71e16d96d72928eadbdcfd8478bef99d09d3a..ad312cd25017fd748f9f6995cf2c41de6eb3f0b6 100644 (file)
--- a/test/web/websub/websub_test.exs
+++ b/test/web/websub/websub_test.exs
@@ -119,7 +119,8 @@ defmodule Pleroma.Web.WebsubTest do
       uri: "https://mastodon.social/users/lambadalambda",
       nickname: "lambadalambda",
       name: "Critical Value",
-      host: "mastodon.social"
+      host: "mastodon.social",
+      avatar: %{"type" => "Image", "url" => [%{"href" => "https://files.mastodon.social/accounts/avatars/000/000/264/original/1429214160519.gif?1492379244", "mediaType" => "image/gif", "type" => "Link"}]}
     }
 
     assert expected == discovered