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 'remotes/origin/develop' into feature/object-hashtags...
[akkoma]
/
lib
/
pleroma
/
web
/
templates
/
feed
/
feed
/
_activity.atom.eex
diff --git
a/lib/pleroma/web/templates/feed/feed/_activity.atom.eex
b/lib/pleroma/web/templates/feed/feed/_activity.atom.eex
index cb18abb5db9958658ec1d8f7e232480545a72ee9..6688830baa954d081ac736703fe870e514535259 100644
(file)
--- a/
lib/pleroma/web/templates/feed/feed/_activity.atom.eex
+++ b/
lib/pleroma/web/templates/feed/feed/_activity.atom.eex
@@
-22,8
+22,8
@@
<link type="text/html" href='<%= @data["external_url"] %>' rel="alternate"/>
<% end %>
<link type="text/html" href='<%= @data["external_url"] %>' rel="alternate"/>
<% end %>
- <%= for
hashtag <- Object.hashtags(@data
) do %>
- <category term="<%=
hash
tag %>"></category>
+ <%= for
tag <- Pleroma.Object.hashtags(@object
) do %>
+ <category term="<%= tag %>"></category>
<% end %>
<%= for attachment <- @data["attachment"] || [] do %>
<% end %>
<%= for attachment <- @data["attachment"] || [] do %>