projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
create_service_actor is now type Application
[akkoma]
/
lib
/
pleroma
/
web
/
plugs
/
static_fe_plug.ex
diff --git
a/lib/pleroma/web/plugs/static_fe_plug.ex
b/lib/pleroma/web/plugs/static_fe_plug.ex
index 658a1052e53ecc649e34256514b55709e4e54f54..049a4ffbe351ac8fc861f309d7288ef839aa1be8 100644
(file)
--- a/
lib/pleroma/web/plugs/static_fe_plug.ex
+++ b/
lib/pleroma/web/plugs/static_fe_plug.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.Plugs.StaticFEPlug do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Plugs.StaticFEPlug do
@@
-9,7
+9,7
@@
defmodule Pleroma.Web.Plugs.StaticFEPlug do
def init(options), do: options
def call(conn, _) do
def init(options), do: options
def call(conn, _) do
- if enabled?() and requires_html?(conn) do
+ if enabled?() and requires_html?(conn)
and not_logged_in?(conn)
do
conn
|> StaticFEController.call(:show)
|> halt()
conn
|> StaticFEController.call(:show)
|> halt()
@@
-23,4
+23,7
@@
defmodule Pleroma.Web.Plugs.StaticFEPlug do
defp requires_html?(conn) do
Phoenix.Controller.get_format(conn) == "html"
end
defp requires_html?(conn) do
Phoenix.Controller.get_format(conn) == "html"
end
+
+ defp not_logged_in?(%{assigns: %{user: %Pleroma.User{}}}), do: false
+ defp not_logged_in?(_), do: true
end
end