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
/
feed
/
feed_view.ex
diff --git
a/lib/pleroma/web/feed/feed_view.ex
b/lib/pleroma/web/feed/feed_view.ex
index 1ae03e7e28d2d3651cb91a9134168e7f50beb2b9..1155c6a398e6db0ce183a7dcf07ee95588cf48db 100644
(file)
--- a/
lib/pleroma/web/feed/feed_view.ex
+++ b/
lib/pleroma/web/feed/feed_view.ex
@@
-32,6
+32,7
@@
defmodule Pleroma.Web.Feed.FeedView do
%{
activity: activity,
%{
activity: activity,
+ object: object,
data: Map.get(object, :data),
actor: actor
}
data: Map.get(object, :data),
actor: actor
}
@@
-51,7
+52,7
@@
defmodule Pleroma.Web.Feed.FeedView do
def feed_logo do
case Pleroma.Config.get([:feed, :logo]) do
nil ->
def feed_logo do
case Pleroma.Config.get([:feed, :logo]) do
nil ->
- "#{Pleroma.Web.base_url()}/static/logo.
pn
g"
+ "#{Pleroma.Web.base_url()}/static/logo.
sv
g"
logo ->
"#{Pleroma.Web.base_url()}#{logo}"
logo ->
"#{Pleroma.Web.base_url()}#{logo}"
@@
-83,7
+84,7
@@
defmodule Pleroma.Web.Feed.FeedView do
def activity_content(_), do: ""
def activity_content(_), do: ""
- def activity_context(activity), do:
activity.data["context"]
+ def activity_context(activity), do:
escape(activity.data["context"])
def attachment_href(attachment) do
attachment["url"]
def attachment_href(attachment) do
attachment["url"]