projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
c97c7d9
)
SetFormatPlug module name
author
Alexander Strizhakov
<alex.strizhakov@gmail.com>
Wed, 24 Jun 2020 06:26:17 +0000
(09:26 +0300)
committer
Alexander Strizhakov
<alex.strizhakov@gmail.com>
Tue, 13 Oct 2020 13:42:53 +0000
(16:42 +0300)
lib/pleroma/web/feed/user_controller.ex
patch
|
blob
|
history
lib/pleroma/web/o_status/o_status_controller.ex
patch
|
blob
|
history
lib/pleroma/web/plugs/set_format_plug.ex
patch
|
blob
|
history
lib/pleroma/web/web_finger/web_finger_controller.ex
patch
|
blob
|
history
test/pleroma/web/plugs/set_format_plug_test.exs
patch
|
blob
|
history
diff --git
a/lib/pleroma/web/feed/user_controller.ex
b/lib/pleroma/web/feed/user_controller.ex
index bea07649bb1869973322c9eaa7c2aed03036674b..6aad6af44effb6e497d94d612f7fd5d700f8a7a5 100644
(file)
--- a/
lib/pleroma/web/feed/user_controller.ex
+++ b/
lib/pleroma/web/feed/user_controller.ex
@@
-10,7
+10,7
@@
defmodule Pleroma.Web.Feed.UserController do
alias Pleroma.Web.ActivityPub.ActivityPubController
alias Pleroma.Web.Feed.FeedView
alias Pleroma.Web.ActivityPub.ActivityPubController
alias Pleroma.Web.Feed.FeedView
- plug(Pleroma.Plugs.SetFormatPlug when action in [:feed_redirect])
+ plug(Pleroma.
Web.
Plugs.SetFormatPlug when action in [:feed_redirect])
action_fallback(:errors)
action_fallback(:errors)
diff --git
a/lib/pleroma/web/o_status/o_status_controller.ex
b/lib/pleroma/web/o_status/o_status_controller.ex
index 329ab64e08c3f0de99dcc5b2cb03b6adea721b26..d4d095a754defe13e75e66fcde4af2ecff925b3b 100644
(file)
--- a/
lib/pleroma/web/o_status/o_status_controller.ex
+++ b/
lib/pleroma/web/o_status/o_status_controller.ex
@@
-26,7
+26,7
@@
defmodule Pleroma.Web.OStatus.OStatusController do
)
plug(
)
plug(
- Pleroma.Plugs.SetFormatPlug
+ Pleroma.
Web.
Plugs.SetFormatPlug
when action in [:object, :activity, :notice]
)
when action in [:object, :activity, :notice]
)
diff --git
a/lib/pleroma/web/plugs/set_format_plug.ex
b/lib/pleroma/web/plugs/set_format_plug.ex
index c03fcb28dda71b51cf13f0bca796cbddf383a349..c16d2f81d49e2ccc543c837aa8ab83d4c8463159 100644
(file)
--- a/
lib/pleroma/web/plugs/set_format_plug.ex
+++ b/
lib/pleroma/web/plugs/set_format_plug.ex
@@
-2,7
+2,7
@@
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
-defmodule Pleroma.Plugs.SetFormatPlug do
+defmodule Pleroma.
Web.
Plugs.SetFormatPlug do
import Plug.Conn, only: [assign: 3, fetch_query_params: 1]
def init(_), do: nil
import Plug.Conn, only: [assign: 3, fetch_query_params: 1]
def init(_), do: nil
diff --git
a/lib/pleroma/web/web_finger/web_finger_controller.ex
b/lib/pleroma/web/web_finger/web_finger_controller.ex
index 7077b20d231da60a58a5d51e663b1fb1d96530e9..14cb87df865aee8c11e5af9e4bf65c55ade65c12 100644
(file)
--- a/
lib/pleroma/web/web_finger/web_finger_controller.ex
+++ b/
lib/pleroma/web/web_finger/web_finger_controller.ex
@@
-7,7
+7,7
@@
defmodule Pleroma.Web.WebFinger.WebFingerController do
alias Pleroma.Web.WebFinger
alias Pleroma.Web.WebFinger
- plug(Pleroma.Plugs.SetFormatPlug)
+ plug(Pleroma.
Web.
Plugs.SetFormatPlug)
plug(Pleroma.Web.FederatingPlug)
def host_meta(conn, _params) do
plug(Pleroma.Web.FederatingPlug)
def host_meta(conn, _params) do
diff --git
a/test/pleroma/web/plugs/set_format_plug_test.exs
b/test/pleroma/web/plugs/set_format_plug_test.exs
index 1b9ba16b1f0682f683739deeef69f0cf597920f5..e95d751fac8fd72ca8f149395edfae1d4f38ed08 100644
(file)
--- a/
test/pleroma/web/plugs/set_format_plug_test.exs
+++ b/
test/pleroma/web/plugs/set_format_plug_test.exs
@@
-6,7
+6,7
@@
defmodule Pleroma.Web.Plugs.SetFormatPlugTest do
use ExUnit.Case, async: true
use Plug.Test
use ExUnit.Case, async: true
use Plug.Test
- alias Pleroma.Plugs.SetFormatPlug
+ alias Pleroma.
Web.
Plugs.SetFormatPlug
test "set format from params" do
conn =
test "set format from params" do
conn =