aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-04-22 15:11:13 +0200
committerRoger Braun <roger@rogerbraun.net>2017-04-22 15:11:13 +0200
commit04fb4f9c47b273256d628eefa5bd8af77cca31fb (patch)
tree73b5915182c035febea0f16e626a1815e767b37c /lib
parent923584d0467b2213bef0d3d78c8713f34b7b21d7 (diff)
downloadpleroma-04fb4f9c47b273256d628eefa5bd8af77cca31fb.tar.gz
Add poco data to user.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/ostatus/feed_representer.ex3
-rw-r--r--lib/pleroma/web/ostatus/user_representer.ex5
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/pleroma/web/ostatus/feed_representer.ex b/lib/pleroma/web/ostatus/feed_representer.ex
index c9cd12937..749cb10d0 100644
--- a/lib/pleroma/web/ostatus/feed_representer.ex
+++ b/lib/pleroma/web/ostatus/feed_representer.ex
@@ -16,7 +16,8 @@ defmodule Pleroma.Web.OStatus.FeedRepresenter do
[{
:feed, [
xmlns: 'http://www.w3.org/2005/Atom',
- "xmlns:activity": 'http://activitystrea.ms/spec/1.0/'
+ "xmlns:activity": 'http://activitystrea.ms/spec/1.0/',
+ "xmlns:poco": 'http://portablecontacts.net/spec/1.0'
], [
{:id, h.(OStatus.feed_path(user))},
{:title, ['#{user.nickname}\'s timeline']},
diff --git a/lib/pleroma/web/ostatus/user_representer.ex b/lib/pleroma/web/ostatus/user_representer.ex
index e7ee4cfeb..65dfc5643 100644
--- a/lib/pleroma/web/ostatus/user_representer.ex
+++ b/lib/pleroma/web/ostatus/user_representer.ex
@@ -3,11 +3,16 @@ defmodule Pleroma.Web.OStatus.UserRepresenter do
def to_simple_form(user) do
ap_id = to_charlist(user.ap_id)
nickname = to_charlist(user.nickname)
+ name = to_charlist(user.name)
+ bio = to_charlist(user.bio)
avatar_url = to_charlist(User.avatar_url(user))
[
{ :id, [ap_id] },
{ :"activity:object", ['http://activitystrea.ms/schema/1.0/person'] },
{ :uri, [ap_id] },
+ { :"poco:preferredUsername", [nickname] },
+ { :"poco:displayName", [name] },
+ { :"poco:note", [bio] },
{ :name, [nickname] },
{ :link, [rel: 'avatar', href: avatar_url], []}
]