projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'issue/1339' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
templates
/
feed
/
feed
/
feed.xml.eex
diff --git
a/lib/pleroma/web/templates/feed/feed/feed.xml.eex
b/lib/pleroma/web/templates/feed/feed/feed.xml.eex
index fbfdc46b542505e7fce2e0331b50b03b8184c802..5ae36d345d79bc88e663eeeab60d3dc634fc9082 100644
(file)
--- a/
lib/pleroma/web/templates/feed/feed/feed.xml.eex
+++ b/
lib/pleroma/web/templates/feed/feed/feed.xml.eex
@@
-10,8
+10,6
@@
<title><%= @user.nickname <> "'s timeline" %></title>
<updated><%= most_recent_update(@activities, @user) %></updated>
<logo><%= logo(@user) %></logo>
<title><%= @user.nickname <> "'s timeline" %></title>
<updated><%= most_recent_update(@activities, @user) %></updated>
<logo><%= logo(@user) %></logo>
- <link rel="hub" href="<%= websub_url(@conn, :websub_subscription_request, @user.nickname) %>"/>
- <link rel="salmon" href="<%= o_status_url(@conn, :salmon_incoming, @user.nickname) %>"/>
<link rel="self" href="<%= '#{feed_url(@conn, :feed, @user.nickname)}.atom' %>" type="application/atom+xml"/>
<%= render @view_module, "_author.xml", assigns %>
<link rel="self" href="<%= '#{feed_url(@conn, :feed, @user.nickname)}.atom' %>" type="application/atom+xml"/>
<%= render @view_module, "_author.xml", assigns %>
@@
-21,6
+19,6
@@
<% end %>
<%= for activity <- @activities do %>
<% end %>
<%= for activity <- @activities do %>
-
<%= render @view_module, "_activity.xml", Map.merge(assigns, %{activity: activity, data: activity_object_data(activity)}
) %>
+
<%= render @view_module, "_activity.xml", Map.merge(assigns, prepare_activity(activity)
) %>
<% end %>
</feed>
<% end %>
</feed>