diff options
| author | Ilja <domainepublic@spectraltheorem.be> | 2020-10-23 11:11:51 +0200 |
|---|---|---|
| committer | Ilja <domainepublic@spectraltheorem.be> | 2020-10-23 11:11:51 +0200 |
| commit | 3ca8feb24648dcee766cef958e84f758b0acec64 (patch) | |
| tree | a1b59cae266fa808aadbdf234146ede4aaa06b58 /lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex | |
| parent | 513103829641faca5501d1d3123ce3c077d7da25 (diff) | |
| parent | 096e4518adf176c3f9cee0e38319340249083a48 (diff) | |
| download | pleroma-3ca8feb24648dcee766cef958e84f758b0acec64.tar.gz | |
fix merge conflict
Diffstat (limited to 'lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex | 5 |
1 files changed, 2 insertions, 3 deletions
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 072d889e2..4480a4922 100644 --- a/lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex +++ b/lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex @@ -10,7 +10,6 @@ defmodule Pleroma.Web.TwitterAPI.RemoteFollowController do alias Pleroma.Activity alias Pleroma.MFA alias Pleroma.Object.Fetcher - alias Pleroma.Plugs.OAuthScopesPlug alias Pleroma.User alias Pleroma.Web.Auth.Authenticator alias Pleroma.Web.Auth.TOTPAuthenticator @@ -18,11 +17,11 @@ defmodule Pleroma.Web.TwitterAPI.RemoteFollowController do @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( - OAuthScopesPlug, + Pleroma.Web.Plugs.OAuthScopesPlug, %{fallback: :proceed_unauthenticated, scopes: ["follow", "write:follows"]} when action in [:do_follow] ) |