X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Ftwitter_api.ex;h=cf1d9c74c00ab9f60f1d10e73bb129e99c114430;hb=12bb7fc0dc94068d8337f10fc337ab23c8c7e77e;hp=37be48b5a138ab1138483bfdd4abe30e6bd161a9;hpb=b08ded6c2f5ee29c6efc8c67cfc2ce0a679f0c77;p=akkoma

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