Merge branch 'fix/rss-link' into 'develop'

RSS: Make sure post URL is the first `<link>` element

See merge request pleroma/pleroma!3308
This commit is contained in:
rinpatch 2021-02-08 20:14:53 +00:00
commit 17f41a589f

View File

@ -9,7 +9,6 @@
<ostatus:conversation ref="<%= activity_context(@activity) %>"> <ostatus:conversation ref="<%= activity_context(@activity) %>">
<%= activity_context(@activity) %> <%= activity_context(@activity) %>
</ostatus:conversation> </ostatus:conversation>
<link rel="ostatus:conversation"><%= activity_context(@activity) %></link>
<%= if @data["summary"] do %> <%= if @data["summary"] do %>
<description><%= escape(@data["summary"]) %></description> <description><%= escape(@data["summary"]) %></description>
@ -21,6 +20,8 @@
<link><%= @data["external_url"] %></link> <link><%= @data["external_url"] %></link>
<% end %> <% end %>
<link rel="ostatus:conversation"><%= activity_context(@activity) %></link>
<%= for tag <- @data["tag"] || [] do %> <%= for tag <- @data["tag"] || [] do %>
<category term="<%= tag %>"></category> <category term="<%= tag %>"></category>
<% end %> <% end %>