projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
[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 7f9d6a46bab1420bf9ee12bbeb1e5c729d104e48..08710f24697887402ce131216a0cc2894354cd55 100644
(file)
--- a/
lib/pleroma/web/ostatus/feed_representer.ex
+++ b/
lib/pleroma/web/ostatus/feed_representer.ex
@@
-2,13
+2,14
@@
defmodule Pleroma.Web.OStatus.FeedRepresenter do
alias Pleroma.Web.OStatus
alias Pleroma.Web.OStatus.{UserRepresenter, ActivityRepresenter}
alias Pleroma.Web.OStatus
alias Pleroma.Web.OStatus.{UserRepresenter, ActivityRepresenter}
- def to_simple_form(user, activities, users) do
+ 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
most_recent_update = (List.first(activities) || user).updated_at
|> NaiveDateTime.to_iso8601
h = fn(str) -> [to_charlist(str)] end
- entries = Enum.map(activities, fn(activity) ->
+ 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)