projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release/2.2.0' into 'stable'
[akkoma]
/
lib
/
pleroma
/
web
/
twitter_api
/
controllers
/
remote_follow_controller.ex
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 521dc9322af5a059f0cd463e6aad1a9f937d9f2c..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
@@
-10,7
+10,6
@@
defmodule Pleroma.Web.TwitterAPI.RemoteFollowController do
alias Pleroma.Activity
alias Pleroma.MFA
alias Pleroma.Object.Fetcher
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
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"]
@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(
- OAuthScopesPlug,
+
Pleroma.Web.Plugs.
OAuthScopesPlug,
%{fallback: :proceed_unauthenticated, scopes: ["follow", "write:follows"]}
when action in [:do_follow]
)
%{fallback: :proceed_unauthenticated, scopes: ["follow", "write:follows"]}
when action in [:do_follow]
)
@@
-135,7
+134,7
@@
defmodule Pleroma.Web.TwitterAPI.RemoteFollowController do
end
defp handle_follow_error(conn, {:mfa_required, followee, user, _} = _) do
end
defp handle_follow_error(conn, {:mfa_required, followee, user, _} = _) do
- {:ok, %{token: token}} = MFA.Token.create
_token
(user)
+ {:ok, %{token: token}} = MFA.Token.create(user)
render(conn, "follow_mfa.html", %{followee: followee, mfa_token: token, error: false})
end
render(conn, "follow_mfa.html", %{followee: followee, mfa_token: token, error: false})
end