projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Resolve follow activity from accept/reject without ID (#328)
[akkoma]
/
lib
/
pleroma
/
web
/
twitter_api
/
controller.ex
diff --git
a/lib/pleroma/web/twitter_api/controller.ex
b/lib/pleroma/web/twitter_api/controller.ex
index e32713311e6bb3b70231660226c10c2013bc8d47..1e78ff2c12163b86c1e5fee7f0b4714208a5ffcf 100644
(file)
--- a/
lib/pleroma/web/twitter_api/controller.ex
+++ b/
lib/pleroma/web/twitter_api/controller.ex
@@
-7,17
+7,12
@@
defmodule Pleroma.Web.TwitterAPI.Controller do
alias Pleroma.User
alias Pleroma.Web.OAuth.Token
alias Pleroma.User
alias Pleroma.Web.OAuth.Token
- alias Pleroma.Web.Plugs.EnsurePublicOrAuthenticatedPlug
alias Pleroma.Web.Plugs.OAuthScopesPlug
alias Pleroma.Web.TwitterAPI.TokenView
require Logger
alias Pleroma.Web.Plugs.OAuthScopesPlug
alias Pleroma.Web.TwitterAPI.TokenView
require Logger
- plug(
- :skip_plug,
- [OAuthScopesPlug, EnsurePublicOrAuthenticatedPlug] when action == :confirm_email
- )
-
+ plug(:skip_auth when action == :confirm_email)
plug(:skip_plug, OAuthScopesPlug when action in [:oauth_tokens, :revoke_token])
action_fallback(:errors)
plug(:skip_plug, OAuthScopesPlug when action in [:oauth_tokens, :revoke_token])
action_fallback(:errors)