projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'chores/2.4.0-develop' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
static_fe
/
static_fe_controller.ex
diff --git
a/lib/pleroma/web/static_fe/static_fe_controller.ex
b/lib/pleroma/web/static_fe/static_fe_controller.ex
index bdec0897a6dac228a3916fae3a8630ae770628ea..50f0927a36c207863cb4a372856a8b1fa9245b51 100644
(file)
--- a/
lib/pleroma/web/static_fe/static_fe_controller.ex
+++ b/
lib/pleroma/web/static_fe/static_fe_controller.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.StaticFE.StaticFEController do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.StaticFE.StaticFEController do
@@
-14,7
+14,6
@@
defmodule Pleroma.Web.StaticFE.StaticFEController do
alias Pleroma.Web.Router.Helpers
plug(:put_layout, :static_fe)
alias Pleroma.Web.Router.Helpers
plug(:put_layout, :static_fe)
- plug(:put_view, Pleroma.Web.StaticFE.StaticFEView)
plug(:assign_id)
@page_keys ["max_id", "min_id", "limit", "since_id", "order"]
plug(:assign_id)
@page_keys ["max_id", "min_id", "limit", "since_id", "order"]
@@
-122,7
+121,7
@@
defmodule Pleroma.Web.StaticFE.StaticFEController do
end
defp get_counts(%Activity{} = activity) do
end
defp get_counts(%Activity{} = activity) do
- %Object{data: data} = Object.normalize(activity)
+ %Object{data: data} = Object.normalize(activity
, fetch: false
)
%{
likes: data["like_count"] || 0,
%{
likes: data["like_count"] || 0,