projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'openapi/account' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
twitter_api
/
twitter_api.ex
diff --git
a/lib/pleroma/web/twitter_api/twitter_api.ex
b/lib/pleroma/web/twitter_api/twitter_api.ex
index 37be48b5a138ab1138483bfdd4abe30e6bd161a9..cf1d9c74c00ab9f60f1d10e73bb129e99c114430 100644
(file)
--- a/
lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/
lib/pleroma/web/twitter_api/twitter_api.ex
@@
-21,7
+21,8
@@
defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
:captcha_token,
:captcha_answer_data,
:token,
:captcha_token,
:captcha_answer_data,
:token,
- :email
+ :email,
+ :trusted_app
])
|> Map.put(:bio, User.parse_bio(params[:bio] || ""))
|> Map.put(:name, params.fullname)
])
|> Map.put(:bio, User.parse_bio(params[:bio] || ""))
|> Map.put(:name, params.fullname)
@@
-42,14
+43,14
@@
defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
end
defp validate_captcha(params) do
end
defp validate_captcha(params) do
- if Pleroma.Config.get([Pleroma.Captcha, :enabled]) do
+ if params[:trusted_app] || not Pleroma.Config.get([Pleroma.Captcha, :enabled]) do
+ :ok
+ else
Pleroma.Captcha.validate(
params.captcha_token,
params.captcha_solution,
params.captcha_answer_data
)
Pleroma.Captcha.validate(
params.captcha_token,
params.captcha_solution,
params.captcha_answer_data
)
- else
- :ok
end
end
end
end