projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pbkdf2: Use it everywhere.
[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 56c024617c9cb948083ed8d8413659a0da0f6e7b..df97d2f46e1476df600585816a9940d70773a350 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
@@
-23,7
+23,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
@@
-51,7
+51,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}"