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:
abc3c76
)
FederatingPlug module name
author
Alexander Strizhakov
<alex.strizhakov@gmail.com>
Wed, 24 Jun 2020 07:41:09 +0000
(10:41 +0300)
committer
Alexander Strizhakov
<alex.strizhakov@gmail.com>
Tue, 13 Oct 2020 13:43:55 +0000
(16:43 +0300)
lib/pleroma/web/activity_pub/activity_pub_controller.ex
patch
|
blob
|
history
lib/pleroma/web/o_status/o_status_controller.ex
patch
|
blob
|
history
lib/pleroma/web/plugs/federating_plug.ex
patch
|
blob
|
history
lib/pleroma/web/static_fe/static_fe_controller.ex
patch
|
blob
|
history
lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
patch
|
blob
|
history
lib/pleroma/web/twitter_api/controllers/util_controller.ex
patch
|
blob
|
history
lib/pleroma/web/web_finger/web_finger_controller.ex
patch
|
blob
|
history
test/pleroma/web/plugs/federating_plug_test.exs
patch
|
blob
|
history
diff --git
a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 732c442710bb62bb29549bdfbd3bb13a146c6d87..5de51c0c765384c18fe3d3e78c7b339544e13c55 100644
(file)
--- a/
lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/
lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@
-23,7
+23,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubController do
alias Pleroma.Web.ActivityPub.Visibility
alias Pleroma.Web.ControllerHelper
alias Pleroma.Web.Endpoint
alias Pleroma.Web.ActivityPub.Visibility
alias Pleroma.Web.ControllerHelper
alias Pleroma.Web.Endpoint
- alias Pleroma.Web.FederatingPlug
+ alias Pleroma.Web.
Plugs.
FederatingPlug
alias Pleroma.Web.Federator
require Logger
alias Pleroma.Web.Federator
require Logger
diff --git
a/lib/pleroma/web/o_status/o_status_controller.ex
b/lib/pleroma/web/o_status/o_status_controller.ex
index 5bd767c96a95e4cc5d957ac5e73dda086ab03ae8..f6069e4f3ee70f7d0f1c44200da1d3096218f14e 100644
(file)
--- a/
lib/pleroma/web/o_status/o_status_controller.ex
+++ b/
lib/pleroma/web/o_status/o_status_controller.ex
@@
-17,7
+17,7
@@
defmodule Pleroma.Web.OStatus.OStatusController do
alias Pleroma.Web.Router
plug(Pleroma.Plugs.EnsureAuthenticatedPlug,
alias Pleroma.Web.Router
plug(Pleroma.Plugs.EnsureAuthenticatedPlug,
- unless_func: &Pleroma.Web.FederatingPlug.federating?/1
+ unless_func: &Pleroma.Web.
Plugs.
FederatingPlug.federating?/1
)
plug(
)
plug(
diff --git
a/lib/pleroma/web/plugs/federating_plug.ex
b/lib/pleroma/web/plugs/federating_plug.ex
index 09038f3c6142f87b4e6c0e5174418bc20bdba6e2..3c90a7644bc053fb1266baab74c485b0caa2c4d6 100644
(file)
--- a/
lib/pleroma/web/plugs/federating_plug.ex
+++ b/
lib/pleroma/web/plugs/federating_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.Web.FederatingPlug do
+defmodule Pleroma.Web.
Plugs.
FederatingPlug do
import Plug.Conn
def init(options) do
import Plug.Conn
def init(options) do
diff --git
a/lib/pleroma/web/static_fe/static_fe_controller.ex
b/lib/pleroma/web/static_fe/static_fe_controller.ex
index a7a891b133ea6e8fd28b7601cb7d31385803f7f0..cc408ab5c376d04c4f1283d5a593aa2b7dddc3e7 100644
(file)
--- a/
lib/pleroma/web/static_fe/static_fe_controller.ex
+++ b/
lib/pleroma/web/static_fe/static_fe_controller.ex
@@
-18,7
+18,7
@@
defmodule Pleroma.Web.StaticFE.StaticFEController do
plug(:assign_id)
plug(Pleroma.Plugs.EnsureAuthenticatedPlug,
plug(:assign_id)
plug(Pleroma.Plugs.EnsureAuthenticatedPlug,
- unless_func: &Pleroma.Web.FederatingPlug.federating?/1
+ unless_func: &Pleroma.Web.
Plugs.
FederatingPlug.federating?/1
)
@page_keys ["max_id", "min_id", "limit", "since_id", "order"]
)
@page_keys ["max_id", "min_id", "limit", "since_id", "order"]
diff --git
a/lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
b/lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
index 0e39f28127c08a6e1b12734e3519e0c725105f91..4480a4922b2801a35c3d7c1c74f462219ebe594c 100644
(file)
--- a/
lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
+++ b/
lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
@@
-17,7
+17,7
@@
defmodule Pleroma.Web.TwitterAPI.RemoteFollowController do
@status_types ["Article", "Event", "Note", "Video", "Page", "Question"]
@status_types ["Article", "Event", "Note", "Video", "Page", "Question"]
- plug(Pleroma.Web.FederatingPlug)
+ plug(Pleroma.Web.
Plugs.
FederatingPlug)
# Note: follower can submit the form (with password auth) not being signed in (having no token)
plug(
# Note: follower can submit the form (with password auth) not being signed in (having no token)
plug(
diff --git
a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
index db5684a910e63d0f360c985212bc33d439c1afc7..f97bd482333c438c41f6af57c8a2de792ef9fffe 100644
(file)
--- a/
lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/
lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@
-16,7
+16,7
@@
defmodule Pleroma.Web.TwitterAPI.UtilController do
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.WebFinger
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.WebFinger
- plug(Pleroma.Web.FederatingPlug when action == :remote_subscribe)
+ plug(Pleroma.Web.
Plugs.
FederatingPlug when action == :remote_subscribe)
plug(
OAuthScopesPlug,
plug(
OAuthScopesPlug,
diff --git
a/lib/pleroma/web/web_finger/web_finger_controller.ex
b/lib/pleroma/web/web_finger/web_finger_controller.ex
index 14cb87df865aee8c11e5af9e4bf65c55ade65c12..9f0938fc0004f7fce42bef86c4319d56b7a8b5ed 100644
(file)
--- a/
lib/pleroma/web/web_finger/web_finger_controller.ex
+++ b/
lib/pleroma/web/web_finger/web_finger_controller.ex
@@
-8,7
+8,7
@@
defmodule Pleroma.Web.WebFinger.WebFingerController do
alias Pleroma.Web.WebFinger
plug(Pleroma.Web.Plugs.SetFormatPlug)
alias Pleroma.Web.WebFinger
plug(Pleroma.Web.Plugs.SetFormatPlug)
- plug(Pleroma.Web.FederatingPlug)
+ plug(Pleroma.Web.
Plugs.
FederatingPlug)
def host_meta(conn, _params) do
xml = WebFinger.host_meta()
def host_meta(conn, _params) do
xml = WebFinger.host_meta()
diff --git
a/test/pleroma/web/plugs/federating_plug_test.exs
b/test/pleroma/web/plugs/federating_plug_test.exs
index a39fe8adb52f4c722aa567214f7250be37c5dfc8..a4652f6c5e008a411bcc550c41bc601e9854c74e 100644
(file)
--- a/
test/pleroma/web/plugs/federating_plug_test.exs
+++ b/
test/pleroma/web/plugs/federating_plug_test.exs
@@
-12,7
+12,7
@@
defmodule Pleroma.Web.Plugs.FederatingPlugTest do
conn =
build_conn()
conn =
build_conn()
- |> Pleroma.Web.FederatingPlug.call(%{})
+ |> Pleroma.Web.
Plugs.
FederatingPlug.call(%{})
assert conn.status == 404
assert conn.halted
assert conn.status == 404
assert conn.halted
@@
-23,7
+23,7
@@
defmodule Pleroma.Web.Plugs.FederatingPlugTest do
conn =
build_conn()
conn =
build_conn()
- |> Pleroma.Web.FederatingPlug.call(%{})
+ |> Pleroma.Web.
Plugs.
FederatingPlug.call(%{})
refute conn.status
refute conn.halted
refute conn.status
refute conn.halted