diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-09-16 13:24:15 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-09-16 13:24:15 +0200 |
| commit | 0fbf1911f58df76c248b30660de6ddd610dd7297 (patch) | |
| tree | 4e7ec189d735670f04c77762178339b7538617a6 /lib | |
| parent | abac96f41dcc845985f0a3e97a452e9a594b858b (diff) | |
| download | pleroma-0fbf1911f58df76c248b30660de6ddd610dd7297.tar.gz | |
Banners are objects.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/ostatus/ostatus.ex | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex index 51abdcc12..bc975f82d 100644 --- a/lib/pleroma/web/ostatus/ostatus.ex +++ b/lib/pleroma/web/ostatus/ostatus.ex @@ -180,7 +180,7 @@ defmodule Pleroma.Web.OStatus do avatar <- make_avatar_object(doc), bio <- string_from_xpath("//author[1]/summary", doc), name <- string_from_xpath("//author[1]/poco:displayName", doc), - info <- Map.put(user.info, "banner", string_from_xpath("//author[1]/link[@rel=\"avatar\"]/@href" || user.info["banner"], doc)), + info <- Map.put(user.info, "banner", make_avatar_object(doc, "header") || user.info["banner"]), new_data <- %{avatar: avatar || old_data.avatar, name: name || old_data.name, bio: bio || old_data.bio, info: info || old_data.info}, false <- new_data == old_data do change = Ecto.Changeset.change(user, new_data) @@ -233,9 +233,9 @@ defmodule Pleroma.Web.OStatus do end # TODO: Just takes the first one for now. - def 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, rel \\ "avatar") do + href = string_from_xpath("//author[1]/link[@rel=\"#{rel}\"]/@href", author_doc) + type = string_from_xpath("//author[1]/link[@rel=\"#{rel}\"]/@type", author_doc) if href do %{ |