hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Pull in remote avatar on federation.

Browse source
This commit is contained in:
Roger Braun 2017-04-30 12:53:49 +02:00
commit f9912599c4
4 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/pleroma/web/ostatus/ostatus.ex
View file

@ -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
%{

4
lib/pleroma/web/websub/websub.ex
View file

@ -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}