diff options
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api.ex')
-rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api.ex | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex index 37be48b5a..cf1d9c74c 100644 --- 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, - :email + :email, + :trusted_app ]) |> 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 - 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 ) - else - :ok end end |