diff options
| author | Ekaterina Vaartis <vaartis@cock.li> | 2018-12-15 02:00:00 +0300 |
|---|---|---|
| committer | Ekaterina Vaartis <vaartis@cock.li> | 2018-12-15 03:12:47 +0300 |
| commit | 28c43a417e89ad68674f6e60d7d3025fbb4655ff (patch) | |
| tree | 174212cefea76a17fbf69766c015900f27c2167f /lib/pleroma/web | |
| parent | a2399c1c7c17ee1c8e85ae0b6095405c7cb9f6f1 (diff) | |
| download | pleroma-28c43a417e89ad68674f6e60d7d3025fbb4655ff.tar.gz | |
Add an ability to disabled captcha
Diffstat (limited to 'lib/pleroma/web')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api.ex | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex index c9e8fbcbb..9f98c43c9 100644 --- a/lib/pleroma/web/twitter_api/twitter_api.ex +++ b/lib/pleroma/web/twitter_api/twitter_api.ex @@ -137,8 +137,16 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do captcha_token: params["captcha_token"] } + captcha_enabled = Pleroma.Config.get([Pleroma.Captcha, :enabled]) + # true if captcha is disabled or enabled and valid, false otherwise + captcha_ok = if !captcha_enabled do + true + else + Pleroma.Captcha.validate(params[:captcha_token], params[:captcha_solution]) + end + # Captcha invalid - if not Pleroma.Captcha.validate(params[:captcha_token], params[:captcha_solution]) do + if not captcha_ok do # I have no idea how this error handling works {:error, %{error: Jason.encode!(%{captcha: ["Invalid CAPTCHA"]})}} else |