projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/tag_feed' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
feed
/
feed_view.ex
diff --git
a/lib/pleroma/web/feed/feed_view.ex
b/lib/pleroma/web/feed/feed_view.ex
index 2e7db1ebbd3966ac4cee2ca1bbd0b8ef813683b1..334802e0a62ad4cd05361d2335a4dd92aae625de 100644
(file)
--- a/
lib/pleroma/web/feed/feed_view.ex
+++ b/
lib/pleroma/web/feed/feed_view.ex
@@
-22,16
+22,28
@@
defmodule Pleroma.Web.Feed.FeedView do
def pub_date(%DateTime{} = date), do: Timex.format!(date, "{RFC822}")
def pub_date(%DateTime{} = date), do: Timex.format!(date, "{RFC822}")
- def prepare_activity(activity) do
+ def prepare_activity(activity
, opts \\ []
) do
object = activity_object(activity)
object = activity_object(activity)
+ actor =
+ if opts[:actor] do
+ Pleroma.User.get_cached_by_ap_id(activity.actor)
+ end
+
%{
activity: activity,
data: Map.get(object, :data),
%{
activity: activity,
data: Map.get(object, :data),
- object: object
+ object: object,
+ actor: actor
}
end
}
end
+ def most_recent_update(activities) do
+ with %{updated_at: updated_at} <- List.first(activities) do
+ NaiveDateTime.to_iso8601(updated_at)
+ end
+ end
+
def most_recent_update(activities, user) do
(List.first(activities) || user).updated_at
|> NaiveDateTime.to_iso8601()
def most_recent_update(activities, user) do
(List.first(activities) || user).updated_at
|> NaiveDateTime.to_iso8601()