projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ActivityPub: Refactor create function.
[akkoma]
/
lib
/
pleroma
/
web
/
ostatus
/
feed_representer.ex
diff --git
a/lib/pleroma/web/ostatus/feed_representer.ex
b/lib/pleroma/web/ostatus/feed_representer.ex
index 749cb10d0665ed27b21f0653229c37865c54d643..8461b2b9f3cf81879c8e5563e212ef6d546b1e81 100644
(file)
--- a/
lib/pleroma/web/ostatus/feed_representer.ex
+++ b/
lib/pleroma/web/ostatus/feed_representer.ex
@@
-1,14
+1,19
@@
defmodule Pleroma.Web.OStatus.FeedRepresenter do
alias Pleroma.Web.OStatus
alias Pleroma.Web.OStatus.{UserRepresenter, ActivityRepresenter}
defmodule Pleroma.Web.OStatus.FeedRepresenter do
alias Pleroma.Web.OStatus
alias Pleroma.Web.OStatus.{UserRepresenter, ActivityRepresenter}
+ alias Pleroma.User
+ alias Pleroma.Web.MediaProxy
- def to_simple_form(user, activities, users) do
- most_recent_update =
List.first(activities
).updated_at
+ def to_simple_form(user, activities,
_
users) do
+ most_recent_update =
(List.first(activities) || user
).updated_at
|> NaiveDateTime.to_iso8601
h = fn(str) -> [to_charlist(str)] end
|> NaiveDateTime.to_iso8601
h = fn(str) -> [to_charlist(str)] end
- entries = Enum.map(activities, fn(activity) ->
+ last_activity = List.last(activities)
+
+ entries = activities
+ |> Enum.map(fn(activity) ->
{:entry, ActivityRepresenter.to_simple_form(activity, user)}
end)
|> Enum.filter(fn ({_, form}) -> form end)
{:entry, ActivityRepresenter.to_simple_form(activity, user)}
end)
|> Enum.filter(fn ({_, form}) -> form end)
@@
-16,16
+21,28
@@
defmodule Pleroma.Web.OStatus.FeedRepresenter do
[{
:feed, [
xmlns: 'http://www.w3.org/2005/Atom',
[{
:feed, [
xmlns: 'http://www.w3.org/2005/Atom',
+ "xmlns:thr": 'http://purl.org/syndication/thread/1.0',
"xmlns:activity": 'http://activitystrea.ms/spec/1.0/',
"xmlns:activity": 'http://activitystrea.ms/spec/1.0/',
- "xmlns:poco": 'http://portablecontacts.net/spec/1.0'
+ "xmlns:poco": 'http://portablecontacts.net/spec/1.0',
+ "xmlns:ostatus": 'http://ostatus.org/schema/1.0'
], [
{:id, h.(OStatus.feed_path(user))},
{:title, ['#{user.nickname}\'s timeline']},
{:updated, h.(most_recent_update)},
], [
{:id, h.(OStatus.feed_path(user))},
{:title, ['#{user.nickname}\'s timeline']},
{:updated, h.(most_recent_update)},
+ {:logo, [to_charlist(User.avatar_url(user) |> MediaProxy.url())]},
{:link, [rel: 'hub', href: h.(OStatus.pubsub_path(user))], []},
{:link, [rel: 'hub', href: h.(OStatus.pubsub_path(user))], []},
- {:link, [rel: 'self', href: h.(OStatus.feed_path(user))], []},
+ {:link, [rel: 'salmon', href: h.(OStatus.salmon_path(user))], []},
+ {:link, [rel: 'self', href: h.(OStatus.feed_path(user)), type: 'application/atom+xml'], []},
{:author, UserRepresenter.to_simple_form(user)},
{:author, UserRepresenter.to_simple_form(user)},
- ] ++ entries
+ ] ++
+ if last_activity do
+ [{:link, [rel: 'next',
+ href: to_charlist(OStatus.feed_path(user)) ++ '?max_id=' ++ to_charlist(last_activity.id),
+ type: 'application/atom+xml'], []}]
+ else
+ []
+ end
+ ++ entries
}]
end
end
}]
end
end