From: rinpatch <rinpatch@sdf.org>
Date: Thu, 3 Jan 2019 17:04:27 +0000 (+0000)
Subject: Merge branch 'captcha' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=b73a1a33de76dc848037a5d0e951866bd21f92c4;p=akkoma

Merge branch 'captcha' into 'develop'

Make captcha (kocaptcha) stateless

See merge request pleroma/pleroma!585
---

b73a1a33de76dc848037a5d0e951866bd21f92c4
diff --cc lib/pleroma/captcha/captcha.ex
index 133a9fd68,424ad4add..0207bcbea
--- a/lib/pleroma/captcha/captcha.ex
+++ b/lib/pleroma/captcha/captcha.ex
@@@ -1,11 -1,9 +1,13 @@@
 +# Pleroma: A lightweight social networking server
 +# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
 +# SPDX-License-Identifier: AGPL-3.0-only
 +
  defmodule Pleroma.Captcha do
-   use GenServer
+   alias Plug.Crypto.KeyGenerator
+   alias Plug.Crypto.MessageEncryptor
+   alias Calendar.DateTime
  
-   @ets_options [:ordered_set, :private, :named_table, {:read_concurrency, true}]
+   use GenServer
  
    @doc false
    def start_link() do
diff --cc lib/pleroma/captcha/kocaptcha.ex
index 66f9ce754,cd0eb6f21..34a611492
--- a/lib/pleroma/captcha/kocaptcha.ex
+++ b/lib/pleroma/captcha/kocaptcha.ex
@@@ -1,10 -1,4 +1,8 @@@
 +# Pleroma: A lightweight social networking server
 +# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
 +# SPDX-License-Identifier: AGPL-3.0-only
 +
  defmodule Pleroma.Captcha.Kocaptcha do
-   alias Calendar.DateTime
- 
    alias Pleroma.Captcha.Service
    @behaviour Service