diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-04-17 09:19:35 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-04-17 09:19:35 +0000 |
| commit | a17bfb5fababbe25fa2abcfccd013c9f3edc2ef7 (patch) | |
| tree | ca3e3f1fd04795615158e08821a024847078c55a /lib/pleroma/web/twitter_api | |
| parent | d8142ee6fee52529f610c58ba15a39b3e841cdc8 (diff) | |
| parent | a6ee6784bc74b311d454112c427f41b1fdec6ce0 (diff) | |
| download | pleroma-a17bfb5fababbe25fa2abcfccd013c9f3edc2ef7.tar.gz | |
Merge branch 'feature/1584-client-captcha-options' into 'develop'
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
Diffstat (limited to 'lib/pleroma/web/twitter_api')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex index f9c0994da..7a1ba6936 100644 --- a/lib/pleroma/web/twitter_api/twitter_api.ex +++ b/lib/pleroma/web/twitter_api/twitter_api.ex @@ -13,6 +13,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do def register_user(params, opts \\ []) do token = params["token"] + trusted_app? = params["trusted_app"] params = %{ nickname: params["nickname"], @@ -29,7 +30,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do captcha_enabled = Pleroma.Config.get([Pleroma.Captcha, :enabled]) # true if captcha is disabled or enabled and valid, false otherwise captcha_ok = - if not captcha_enabled do + if trusted_app? || not captcha_enabled do :ok else Pleroma.Captcha.validate( |