projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'pleroma/develop' into remote-deletions
[akkoma]
/
lib
/
pleroma
/
web
/
templates
/
feed
/
feed
/
_activity.rss.eex
diff --git
a/lib/pleroma/web/templates/feed/feed/_activity.rss.eex
b/lib/pleroma/web/templates/feed/feed/_activity.rss.eex
index 9ebaa3300d78f74357144db83f909d5f4ec673f4..279f2171d811a491ed133edd9713c9df5bda54ed 100644
(file)
--- a/
lib/pleroma/web/templates/feed/feed/_activity.rss.eex
+++ b/
lib/pleroma/web/templates/feed/feed/_activity.rss.eex
@@
-9,7
+9,6
@@
<ostatus:conversation ref="<%= activity_context(@activity) %>">
<%= activity_context(@activity) %>
</ostatus:conversation>
<ostatus:conversation ref="<%= activity_context(@activity) %>">
<%= activity_context(@activity) %>
</ostatus:conversation>
- <link rel="ostatus:conversation"><%= activity_context(@activity) %></link>
<%= if @data["summary"] do %>
<description><%= escape(@data["summary"]) %></description>
<%= if @data["summary"] do %>
<description><%= escape(@data["summary"]) %></description>
@@
-21,8
+20,10
@@
<link><%= @data["external_url"] %></link>
<% end %>
<link><%= @data["external_url"] %></link>
<% end %>
- <%= for hashtag <- Object.hashtags(@object) do %>
- <category term="<%= hashtag %>"></category>
+ <link rel="ostatus:conversation"><%= activity_context(@activity) %></link>
+
+ <%= for tag <- Pleroma.Object.hashtags(@object) do %>
+ <category term="<%= tag %>"></category>
<% end %>
<%= for attachment <- @data["attachment"] || [] do %>
<% end %>
<%= for attachment <- @data["attachment"] || [] do %>
@@
-37,7
+38,7
@@
<%= if id == Pleroma.Constants.as_public() do %>
<link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection">http://activityschema.org/collection/public</link>
<% else %>
<%= if id == Pleroma.Constants.as_public() do %>
<link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection">http://activityschema.org/collection/public</link>
<% else %>
- <%= unless Regex.match?(~r/^#{Pleroma.Web.
base_
url()}.+followers$/, id) do %>
+ <%= unless Regex.match?(~r/^#{Pleroma.Web.
Endpoint.
url()}.+followers$/, id) do %>
<link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person"><%= id %></link>
<% end %>
<% end %>
<link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person"><%= id %></link>
<% end %>
<% end %>