projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request 'Add /api/v1/followed_tags' (#410) from followed-tags into develop
[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 30e0a2a55b69228b470ed0a35a8111ff80c6149e..52771205ec5e0cb150ca62eb041f29dd4581cce0 100644
(file)
--- a/
lib/pleroma/web/feed/feed_view.ex
+++ b/
lib/pleroma/web/feed/feed_view.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Feed.FeedView do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Feed.FeedView do
@@
-9,6
+9,7
@@
defmodule Pleroma.Web.Feed.FeedView do
alias Pleroma.Formatter
alias Pleroma.Object
alias Pleroma.User
alias Pleroma.Formatter
alias Pleroma.Object
alias Pleroma.User
+ alias Pleroma.Web.Gettext
alias Pleroma.Web.MediaProxy
require Pleroma.Constants
alias Pleroma.Web.MediaProxy
require Pleroma.Constants
@@
-23,7
+24,7
@@
defmodule Pleroma.Web.Feed.FeedView do
def pub_date(%DateTime{} = date), do: Timex.format!(date, "{RFC822}")
def prepare_activity(activity, opts \\ []) do
def pub_date(%DateTime{} = date), do: Timex.format!(date, "{RFC822}")
def prepare_activity(activity, opts \\ []) do
- object = Object.normalize(activity)
+ object = Object.normalize(activity
, fetch: false
)
actor =
if opts[:actor] do
actor =
if opts[:actor] do
@@
-32,6
+33,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,10
+53,10
@@
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.svg"
+ "#{Pleroma.Web.
Endpoint.
url()}/static/logo.svg"
logo ->
logo ->
- "#{Pleroma.Web.
base_
url()}#{logo}"
+ "#{Pleroma.Web.
Endpoint.
url()}#{logo}"
end
|> MediaProxy.url()
end
end
|> MediaProxy.url()
end