From c4c5caedd809e46542ae3632762d93f14890d51d Mon Sep 17 00:00:00 2001
From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Sun, 16 Aug 2020 21:01:38 +0300
Subject: changes after rebase

---
 lib/pleroma/http/middleware/connection_pool.ex     |  50 ++++++
 lib/pleroma/tesla/middleware/connection_pool.ex    |  50 ------
 test/gun/conneciton_pool_test.exs                  | 101 ------------
 .../20200716195806_autolinker_to_linkify_test.exs  |  72 ---------
 ...2185515_fix_malformed_formatter_config_test.exs |  70 --------
 .../20200724133313_move_welcome_settings_test.exs  | 144 -----------------
 .../20200802170532_fix_legacy_tags_test.exs        |  28 ----
 test/pleroma/gun/connection_pool_test.exs          | 101 ++++++++++++
 .../repo/migrations/autolinker_to_linkify_test.exs |  72 +++++++++
 .../repo/migrations/fix_legacy_tags_test.exs       |  28 ++++
 .../fix_malformed_formatter_config_test.exs        |  70 ++++++++
 .../repo/migrations/move_welcome_settings_test.exs | 144 +++++++++++++++++
 test/pleroma/report_note_test.exs                  |  16 ++
 test/pleroma/user/welcome_chat_message_test.exs    |  35 ++++
 test/pleroma/user/welcome_email_test.exs           |  61 +++++++
 test/pleroma/user/welcome_message_test.exs         |  34 ++++
 .../object_validators/accept_validation_test.exs   |  56 +++++++
 .../object_validators/reject_validation_test.exs   |  56 +++++++
 .../transmogrifier/accept_handling_test.exs        |  91 +++++++++++
 .../transmogrifier/answer_handling_test.exs        |  78 +++++++++
 .../transmogrifier/question_handling_test.exs      | 176 +++++++++++++++++++++
 .../transmogrifier/reject_handling_test.exs        |  67 ++++++++
 .../web/plugs/frontend_static_plug_test.exs        |  56 +++++++
 test/plugs/frontend_static_test.exs                |  57 -------
 test/report_note_test.exs                          |  16 --
 test/user/welcome_chat_massage_test.exs            |  35 ----
 test/user/welcome_email_test.exs                   |  61 -------
 test/user/welcome_message_test.exs                 |  34 ----
 .../object_validators/accept_validation_test.exs   |  56 -------
 .../object_validators/reject_validation_test.exs   |  56 -------
 .../transmogrifier/accept_handling_test.exs        |  91 -----------
 .../transmogrifier/answer_handling_test.exs        |  78 ---------
 .../transmogrifier/question_handling_test.exs      | 176 ---------------------
 .../transmogrifier/reject_handling_test.exs        |  67 --------
 34 files changed, 1191 insertions(+), 1192 deletions(-)
 create mode 100644 lib/pleroma/http/middleware/connection_pool.ex
 delete mode 100644 lib/pleroma/tesla/middleware/connection_pool.ex
 delete mode 100644 test/gun/conneciton_pool_test.exs
 delete mode 100644 test/migrations/20200716195806_autolinker_to_linkify_test.exs
 delete mode 100644 test/migrations/20200722185515_fix_malformed_formatter_config_test.exs
 delete mode 100644 test/migrations/20200724133313_move_welcome_settings_test.exs
 delete mode 100644 test/migrations/20200802170532_fix_legacy_tags_test.exs
 create mode 100644 test/pleroma/gun/connection_pool_test.exs
 create mode 100644 test/pleroma/repo/migrations/autolinker_to_linkify_test.exs
 create mode 100644 test/pleroma/repo/migrations/fix_legacy_tags_test.exs
 create mode 100644 test/pleroma/repo/migrations/fix_malformed_formatter_config_test.exs
 create mode 100644 test/pleroma/repo/migrations/move_welcome_settings_test.exs
 create mode 100644 test/pleroma/report_note_test.exs
 create mode 100644 test/pleroma/user/welcome_chat_message_test.exs
 create mode 100644 test/pleroma/user/welcome_email_test.exs
 create mode 100644 test/pleroma/user/welcome_message_test.exs
 create mode 100644 test/pleroma/web/activity_pub/object_validators/accept_validation_test.exs
 create mode 100644 test/pleroma/web/activity_pub/object_validators/reject_validation_test.exs
 create mode 100644 test/pleroma/web/activity_pub/transmogrifier/accept_handling_test.exs
 create mode 100644 test/pleroma/web/activity_pub/transmogrifier/answer_handling_test.exs
 create mode 100644 test/pleroma/web/activity_pub/transmogrifier/question_handling_test.exs
 create mode 100644 test/pleroma/web/activity_pub/transmogrifier/reject_handling_test.exs
 create mode 100644 test/pleroma/web/plugs/frontend_static_plug_test.exs
 delete mode 100644 test/plugs/frontend_static_test.exs
 delete mode 100644 test/report_note_test.exs
 delete mode 100644 test/user/welcome_chat_massage_test.exs
 delete mode 100644 test/user/welcome_email_test.exs
 delete mode 100644 test/user/welcome_message_test.exs
 delete mode 100644 test/web/activity_pub/object_validators/accept_validation_test.exs
 delete mode 100644 test/web/activity_pub/object_validators/reject_validation_test.exs
 delete mode 100644 test/web/activity_pub/transmogrifier/accept_handling_test.exs
 delete mode 100644 test/web/activity_pub/transmogrifier/answer_handling_test.exs
 delete mode 100644 test/web/activity_pub/transmogrifier/question_handling_test.exs
 delete mode 100644 test/web/activity_pub/transmogrifier/reject_handling_test.exs

diff --git a/lib/pleroma/http/middleware/connection_pool.ex b/lib/pleroma/http/middleware/connection_pool.ex
new file mode 100644
index 000000000..056e736ce
--- /dev/null
+++ b/lib/pleroma/http/middleware/connection_pool.ex
@@ -0,0 +1,50 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Tesla.Middleware.ConnectionPool do
+  @moduledoc """
+  Middleware to get/release connections from `Pleroma.Gun.ConnectionPool`
+  """
+
+  @behaviour Tesla.Middleware
+
+  alias Pleroma.Gun.ConnectionPool
+
+  @impl Tesla.Middleware
+  def call(%Tesla.Env{url: url, opts: opts} = env, next, _) do
+    uri = URI.parse(url)
+
+    # Avoid leaking connections when the middleware is called twice
+    # with body_as: :chunks. We assume only the middleware can set
+    # opts[:adapter][:conn]
+    if opts[:adapter][:conn] do
+      ConnectionPool.release_conn(opts[:adapter][:conn])
+    end
+
+    case ConnectionPool.get_conn(uri, opts[:adapter]) do
+      {:ok, conn_pid} ->
+        adapter_opts = Keyword.merge(opts[:adapter], conn: conn_pid, close_conn: false)
+        opts = Keyword.put(opts, :adapter, adapter_opts)
+        env = %{env | opts: opts}
+
+        case Tesla.run(env, next) do
+          {:ok, env} ->
+            unless opts[:adapter][:body_as] == :chunks do
+              ConnectionPool.release_conn(conn_pid)
+              {_, res} = pop_in(env.opts[:adapter][:conn])
+              {:ok, res}
+            else
+              {:ok, env}
+            end
+
+          err ->
+            ConnectionPool.release_conn(conn_pid)
+            err
+        end
+
+      err ->
+        err
+    end
+  end
+end
diff --git a/lib/pleroma/tesla/middleware/connection_pool.ex b/lib/pleroma/tesla/middleware/connection_pool.ex
deleted file mode 100644
index 056e736ce..000000000
--- a/lib/pleroma/tesla/middleware/connection_pool.ex
+++ /dev/null
@@ -1,50 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Tesla.Middleware.ConnectionPool do
-  @moduledoc """
-  Middleware to get/release connections from `Pleroma.Gun.ConnectionPool`
-  """
-
-  @behaviour Tesla.Middleware
-
-  alias Pleroma.Gun.ConnectionPool
-
-  @impl Tesla.Middleware
-  def call(%Tesla.Env{url: url, opts: opts} = env, next, _) do
-    uri = URI.parse(url)
-
-    # Avoid leaking connections when the middleware is called twice
-    # with body_as: :chunks. We assume only the middleware can set
-    # opts[:adapter][:conn]
-    if opts[:adapter][:conn] do
-      ConnectionPool.release_conn(opts[:adapter][:conn])
-    end
-
-    case ConnectionPool.get_conn(uri, opts[:adapter]) do
-      {:ok, conn_pid} ->
-        adapter_opts = Keyword.merge(opts[:adapter], conn: conn_pid, close_conn: false)
-        opts = Keyword.put(opts, :adapter, adapter_opts)
-        env = %{env | opts: opts}
-
-        case Tesla.run(env, next) do
-          {:ok, env} ->
-            unless opts[:adapter][:body_as] == :chunks do
-              ConnectionPool.release_conn(conn_pid)
-              {_, res} = pop_in(env.opts[:adapter][:conn])
-              {:ok, res}
-            else
-              {:ok, env}
-            end
-
-          err ->
-            ConnectionPool.release_conn(conn_pid)
-            err
-        end
-
-      err ->
-        err
-    end
-  end
-end
diff --git a/test/gun/conneciton_pool_test.exs b/test/gun/conneciton_pool_test.exs
deleted file mode 100644
index aea908fac..000000000
--- a/test/gun/conneciton_pool_test.exs
+++ /dev/null
@@ -1,101 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Gun.ConnectionPoolTest do
-  use Pleroma.DataCase
-
-  import Mox
-  import ExUnit.CaptureLog
-  alias Pleroma.Config
-  alias Pleroma.Gun.ConnectionPool
-
-  defp gun_mock(_) do
-    Pleroma.GunMock
-    |> stub(:open, fn _, _, _ -> Task.start_link(fn -> Process.sleep(100) end) end)
-    |> stub(:await_up, fn _, _ -> {:ok, :http} end)
-    |> stub(:set_owner, fn _, _ -> :ok end)
-
-    :ok
-  end
-
-  setup :set_mox_from_context
-  setup :gun_mock
-
-  test "gives the same connection to 2 concurrent requests" do
-    Enum.map(
-      [
-        "http://www.korean-books.com.kp/KBMbooks/en/periodic/pictorial/20200530163914.pdf",
-        "http://www.korean-books.com.kp/KBMbooks/en/periodic/pictorial/20200528183427.pdf"
-      ],
-      fn uri ->
-        uri = URI.parse(uri)
-        task_parent = self()
-
-        Task.start_link(fn ->
-          {:ok, conn} = ConnectionPool.get_conn(uri, [])
-          ConnectionPool.release_conn(conn)
-          send(task_parent, conn)
-        end)
-      end
-    )
-
-    [pid, pid] =
-      for _ <- 1..2 do
-        receive do
-          pid -> pid
-        end
-      end
-  end
-
-  test "connection limit is respected with concurrent requests" do
-    clear_config([:connections_pool, :max_connections]) do
-      Config.put([:connections_pool, :max_connections], 1)
-      # The supervisor needs a reboot to apply the new config setting
-      Process.exit(Process.whereis(Pleroma.Gun.ConnectionPool.WorkerSupervisor), :kill)
-
-      on_exit(fn ->
-        Process.exit(Process.whereis(Pleroma.Gun.ConnectionPool.WorkerSupervisor), :kill)
-      end)
-    end
-
-    capture_log(fn ->
-      Enum.map(
-        [
-          "https://ninenines.eu/",
-          "https://youtu.be/PFGwMiDJKNY"
-        ],
-        fn uri ->
-          uri = URI.parse(uri)
-          task_parent = self()
-
-          Task.start_link(fn ->
-            result = ConnectionPool.get_conn(uri, [])
-            # Sleep so that we don't end up with a situation,
-            # where request from the second process gets processed
-            # only after the first process already released the connection
-            Process.sleep(50)
-
-            case result do
-              {:ok, pid} ->
-                ConnectionPool.release_conn(pid)
-
-              _ ->
-                nil
-            end
-
-            send(task_parent, result)
-          end)
-        end
-      )
-
-      [{:error, :pool_full}, {:ok, _pid}] =
-        for _ <- 1..2 do
-          receive do
-            result -> result
-          end
-        end
-        |> Enum.sort()
-    end)
-  end
-end
diff --git a/test/migrations/20200716195806_autolinker_to_linkify_test.exs b/test/migrations/20200716195806_autolinker_to_linkify_test.exs
deleted file mode 100644
index 84f520fe4..000000000
--- a/test/migrations/20200716195806_autolinker_to_linkify_test.exs
+++ /dev/null
@@ -1,72 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Repo.Migrations.AutolinkerToLinkifyTest do
-  use Pleroma.DataCase
-  import Pleroma.Factory
-  import Pleroma.Tests.Helpers
-  alias Pleroma.ConfigDB
-
-  setup do: clear_config(Pleroma.Formatter)
-  setup_all do: require_migration("20200716195806_autolinker_to_linkify")
-
-  test "change/0 converts auto_linker opts for Pleroma.Formatter", %{migration: migration} do
-    autolinker_opts = [
-      extra: true,
-      validate_tld: true,
-      class: false,
-      strip_prefix: false,
-      new_window: false,
-      rel: "testing"
-    ]
-
-    insert(:config, group: :auto_linker, key: :opts, value: autolinker_opts)
-
-    migration.change()
-
-    assert nil == ConfigDB.get_by_params(%{group: :auto_linker, key: :opts})
-
-    %{value: new_opts} = ConfigDB.get_by_params(%{group: :pleroma, key: Pleroma.Formatter})
-
-    assert new_opts == [
-             class: false,
-             extra: true,
-             new_window: false,
-             rel: "testing",
-             strip_prefix: false
-           ]
-
-    Pleroma.Config.put(Pleroma.Formatter, new_opts)
-    assert new_opts == Pleroma.Config.get(Pleroma.Formatter)
-
-    {text, _mentions, []} =
-      Pleroma.Formatter.linkify(
-        "https://www.businessinsider.com/walmart-will-close-stores-on-thanksgiving-ending-black-friday-tradition-2020-7\n\nOmg will COVID finally end Black Friday???"
-      )
-
-    assert text ==
-             "<a href=\"https://www.businessinsider.com/walmart-will-close-stores-on-thanksgiving-ending-black-friday-tradition-2020-7\" rel=\"testing\">https://www.businessinsider.com/walmart-will-close-stores-on-thanksgiving-ending-black-friday-tradition-2020-7</a>\n\nOmg will COVID finally end Black Friday???"
-  end
-
-  test "transform_opts/1 returns a list of compatible opts", %{migration: migration} do
-    old_opts = [
-      extra: true,
-      validate_tld: true,
-      class: false,
-      strip_prefix: false,
-      new_window: false,
-      rel: "qqq"
-    ]
-
-    expected_opts = [
-      class: false,
-      extra: true,
-      new_window: false,
-      rel: "qqq",
-      strip_prefix: false
-    ]
-
-    assert migration.transform_opts(old_opts) == expected_opts
-  end
-end
diff --git a/test/migrations/20200722185515_fix_malformed_formatter_config_test.exs b/test/migrations/20200722185515_fix_malformed_formatter_config_test.exs
deleted file mode 100644
index 61528599a..000000000
--- a/test/migrations/20200722185515_fix_malformed_formatter_config_test.exs
+++ /dev/null
@@ -1,70 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Repo.Migrations.FixMalformedFormatterConfigTest do
-  use Pleroma.DataCase
-  import Pleroma.Factory
-  import Pleroma.Tests.Helpers
-  alias Pleroma.ConfigDB
-
-  setup do: clear_config(Pleroma.Formatter)
-  setup_all do: require_migration("20200722185515_fix_malformed_formatter_config")
-
-  test "change/0 converts a map into a list", %{migration: migration} do
-    incorrect_opts = %{
-      class: false,
-      extra: true,
-      new_window: false,
-      rel: "F",
-      strip_prefix: false
-    }
-
-    insert(:config, group: :pleroma, key: Pleroma.Formatter, value: incorrect_opts)
-
-    assert :ok == migration.change()
-
-    %{value: new_opts} = ConfigDB.get_by_params(%{group: :pleroma, key: Pleroma.Formatter})
-
-    assert new_opts == [
-             class: false,
-             extra: true,
-             new_window: false,
-             rel: "F",
-             strip_prefix: false
-           ]
-
-    Pleroma.Config.put(Pleroma.Formatter, new_opts)
-    assert new_opts == Pleroma.Config.get(Pleroma.Formatter)
-
-    {text, _mentions, []} =
-      Pleroma.Formatter.linkify(
-        "https://www.businessinsider.com/walmart-will-close-stores-on-thanksgiving-ending-black-friday-tradition-2020-7\n\nOmg will COVID finally end Black Friday???"
-      )
-
-    assert text ==
-             "<a href=\"https://www.businessinsider.com/walmart-will-close-stores-on-thanksgiving-ending-black-friday-tradition-2020-7\" rel=\"F\">https://www.businessinsider.com/walmart-will-close-stores-on-thanksgiving-ending-black-friday-tradition-2020-7</a>\n\nOmg will COVID finally end Black Friday???"
-  end
-
-  test "change/0 skips if Pleroma.Formatter config is already a list", %{migration: migration} do
-    opts = [
-      class: false,
-      extra: true,
-      new_window: false,
-      rel: "ugc",
-      strip_prefix: false
-    ]
-
-    insert(:config, group: :pleroma, key: Pleroma.Formatter, value: opts)
-
-    assert :skipped == migration.change()
-
-    %{value: new_opts} = ConfigDB.get_by_params(%{group: :pleroma, key: Pleroma.Formatter})
-
-    assert new_opts == opts
-  end
-
-  test "change/0 skips if Pleroma.Formatter is empty", %{migration: migration} do
-    assert :skipped == migration.change()
-  end
-end
diff --git a/test/migrations/20200724133313_move_welcome_settings_test.exs b/test/migrations/20200724133313_move_welcome_settings_test.exs
deleted file mode 100644
index 53d05a55a..000000000
--- a/test/migrations/20200724133313_move_welcome_settings_test.exs
+++ /dev/null
@@ -1,144 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Repo.Migrations.MoveWelcomeSettingsTest do
-  use Pleroma.DataCase
-  import Pleroma.Factory
-  import Pleroma.Tests.Helpers
-  alias Pleroma.ConfigDB
-
-  setup_all do: require_migration("20200724133313_move_welcome_settings")
-
-  describe "up/0" do
-    test "converts welcome settings", %{migration: migration} do
-      insert(:config,
-        group: :pleroma,
-        key: :instance,
-        value: [
-          welcome_message: "Test message",
-          welcome_user_nickname: "jimm",
-          name: "Pleroma"
-        ]
-      )
-
-      migration.up()
-      instance_config = ConfigDB.get_by_params(%{group: :pleroma, key: :instance})
-      welcome_config = ConfigDB.get_by_params(%{group: :pleroma, key: :welcome})
-
-      assert instance_config.value == [name: "Pleroma"]
-
-      assert welcome_config.value == [
-               direct_message: %{
-                 enabled: true,
-                 message: "Test message",
-                 sender_nickname: "jimm"
-               },
-               email: %{
-                 enabled: false,
-                 html: "Welcome to <%= instance_name %>",
-                 sender: nil,
-                 subject: "Welcome to <%= instance_name %>",
-                 text: "Welcome to <%= instance_name %>"
-               }
-             ]
-    end
-
-    test "does nothing when message empty", %{migration: migration} do
-      insert(:config,
-        group: :pleroma,
-        key: :instance,
-        value: [
-          welcome_message: "",
-          welcome_user_nickname: "jimm",
-          name: "Pleroma"
-        ]
-      )
-
-      migration.up()
-      instance_config = ConfigDB.get_by_params(%{group: :pleroma, key: :instance})
-      refute ConfigDB.get_by_params(%{group: :pleroma, key: :welcome})
-      assert instance_config.value == [name: "Pleroma"]
-    end
-
-    test "does nothing when welcome_message not set", %{migration: migration} do
-      insert(:config,
-        group: :pleroma,
-        key: :instance,
-        value: [welcome_user_nickname: "jimm", name: "Pleroma"]
-      )
-
-      migration.up()
-      instance_config = ConfigDB.get_by_params(%{group: :pleroma, key: :instance})
-      refute ConfigDB.get_by_params(%{group: :pleroma, key: :welcome})
-      assert instance_config.value == [name: "Pleroma"]
-    end
-  end
-
-  describe "down/0" do
-    test "revert new settings to old when instance setting not exists", %{migration: migration} do
-      insert(:config,
-        group: :pleroma,
-        key: :welcome,
-        value: [
-          direct_message: %{
-            enabled: true,
-            message: "Test message",
-            sender_nickname: "jimm"
-          },
-          email: %{
-            enabled: false,
-            html: "Welcome to <%= instance_name %>",
-            sender: nil,
-            subject: "Welcome to <%= instance_name %>",
-            text: "Welcome to <%= instance_name %>"
-          }
-        ]
-      )
-
-      migration.down()
-
-      refute ConfigDB.get_by_params(%{group: :pleroma, key: :welcome})
-      instance_config = ConfigDB.get_by_params(%{group: :pleroma, key: :instance})
-
-      assert instance_config.value == [
-               welcome_user_nickname: "jimm",
-               welcome_message: "Test message"
-             ]
-    end
-
-    test "revert new settings to old when instance setting exists", %{migration: migration} do
-      insert(:config, group: :pleroma, key: :instance, value: [name: "Pleroma App"])
-
-      insert(:config,
-        group: :pleroma,
-        key: :welcome,
-        value: [
-          direct_message: %{
-            enabled: true,
-            message: "Test message",
-            sender_nickname: "jimm"
-          },
-          email: %{
-            enabled: false,
-            html: "Welcome to <%= instance_name %>",
-            sender: nil,
-            subject: "Welcome to <%= instance_name %>",
-            text: "Welcome to <%= instance_name %>"
-          }
-        ]
-      )
-
-      migration.down()
-
-      refute ConfigDB.get_by_params(%{group: :pleroma, key: :welcome})
-      instance_config = ConfigDB.get_by_params(%{group: :pleroma, key: :instance})
-
-      assert instance_config.value == [
-               name: "Pleroma App",
-               welcome_user_nickname: "jimm",
-               welcome_message: "Test message"
-             ]
-    end
-  end
-end
diff --git a/test/migrations/20200802170532_fix_legacy_tags_test.exs b/test/migrations/20200802170532_fix_legacy_tags_test.exs
deleted file mode 100644
index 432055e45..000000000
--- a/test/migrations/20200802170532_fix_legacy_tags_test.exs
+++ /dev/null
@@ -1,28 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Repo.Migrations.FixLegacyTagsTest do
-  alias Pleroma.User
-  use Pleroma.DataCase
-  import Pleroma.Factory
-  import Pleroma.Tests.Helpers
-
-  setup_all do: require_migration("20200802170532_fix_legacy_tags")
-
-  test "change/0 converts legacy user tags into correct values", %{migration: migration} do
-    user = insert(:user, tags: ["force_nsfw", "force_unlisted", "verified"])
-    user2 = insert(:user)
-
-    assert :ok == migration.change()
-
-    fixed_user = User.get_by_id(user.id)
-    fixed_user2 = User.get_by_id(user2.id)
-
-    assert fixed_user.tags == ["mrf_tag:media-force-nsfw", "mrf_tag:force-unlisted", "verified"]
-    assert fixed_user2.tags == []
-
-    # user2 should not have been updated
-    assert fixed_user2.updated_at == fixed_user2.inserted_at
-  end
-end
diff --git a/test/pleroma/gun/connection_pool_test.exs b/test/pleroma/gun/connection_pool_test.exs
new file mode 100644
index 000000000..aea908fac
--- /dev/null
+++ b/test/pleroma/gun/connection_pool_test.exs
@@ -0,0 +1,101 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Gun.ConnectionPoolTest do
+  use Pleroma.DataCase
+
+  import Mox
+  import ExUnit.CaptureLog
+  alias Pleroma.Config
+  alias Pleroma.Gun.ConnectionPool
+
+  defp gun_mock(_) do
+    Pleroma.GunMock
+    |> stub(:open, fn _, _, _ -> Task.start_link(fn -> Process.sleep(100) end) end)
+    |> stub(:await_up, fn _, _ -> {:ok, :http} end)
+    |> stub(:set_owner, fn _, _ -> :ok end)
+
+    :ok
+  end
+
+  setup :set_mox_from_context
+  setup :gun_mock
+
+  test "gives the same connection to 2 concurrent requests" do
+    Enum.map(
+      [
+        "http://www.korean-books.com.kp/KBMbooks/en/periodic/pictorial/20200530163914.pdf",
+        "http://www.korean-books.com.kp/KBMbooks/en/periodic/pictorial/20200528183427.pdf"
+      ],
+      fn uri ->
+        uri = URI.parse(uri)
+        task_parent = self()
+
+        Task.start_link(fn ->
+          {:ok, conn} = ConnectionPool.get_conn(uri, [])
+          ConnectionPool.release_conn(conn)
+          send(task_parent, conn)
+        end)
+      end
+    )
+
+    [pid, pid] =
+      for _ <- 1..2 do
+        receive do
+          pid -> pid
+        end
+      end
+  end
+
+  test "connection limit is respected with concurrent requests" do
+    clear_config([:connections_pool, :max_connections]) do
+      Config.put([:connections_pool, :max_connections], 1)
+      # The supervisor needs a reboot to apply the new config setting
+      Process.exit(Process.whereis(Pleroma.Gun.ConnectionPool.WorkerSupervisor), :kill)
+
+      on_exit(fn ->
+        Process.exit(Process.whereis(Pleroma.Gun.ConnectionPool.WorkerSupervisor), :kill)
+      end)
+    end
+
+    capture_log(fn ->
+      Enum.map(
+        [
+          "https://ninenines.eu/",
+          "https://youtu.be/PFGwMiDJKNY"
+        ],
+        fn uri ->
+          uri = URI.parse(uri)
+          task_parent = self()
+
+          Task.start_link(fn ->
+            result = ConnectionPool.get_conn(uri, [])
+            # Sleep so that we don't end up with a situation,
+            # where request from the second process gets processed
+            # only after the first process already released the connection
+            Process.sleep(50)
+
+            case result do
+              {:ok, pid} ->
+                ConnectionPool.release_conn(pid)
+
+              _ ->
+                nil
+            end
+
+            send(task_parent, result)
+          end)
+        end
+      )
+
+      [{:error, :pool_full}, {:ok, _pid}] =
+        for _ <- 1..2 do
+          receive do
+            result -> result
+          end
+        end
+        |> Enum.sort()
+    end)
+  end
+end
diff --git a/test/pleroma/repo/migrations/autolinker_to_linkify_test.exs b/test/pleroma/repo/migrations/autolinker_to_linkify_test.exs
new file mode 100644
index 000000000..84f520fe4
--- /dev/null
+++ b/test/pleroma/repo/migrations/autolinker_to_linkify_test.exs
@@ -0,0 +1,72 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Repo.Migrations.AutolinkerToLinkifyTest do
+  use Pleroma.DataCase
+  import Pleroma.Factory
+  import Pleroma.Tests.Helpers
+  alias Pleroma.ConfigDB
+
+  setup do: clear_config(Pleroma.Formatter)
+  setup_all do: require_migration("20200716195806_autolinker_to_linkify")
+
+  test "change/0 converts auto_linker opts for Pleroma.Formatter", %{migration: migration} do
+    autolinker_opts = [
+      extra: true,
+      validate_tld: true,
+      class: false,
+      strip_prefix: false,
+      new_window: false,
+      rel: "testing"
+    ]
+
+    insert(:config, group: :auto_linker, key: :opts, value: autolinker_opts)
+
+    migration.change()
+
+    assert nil == ConfigDB.get_by_params(%{group: :auto_linker, key: :opts})
+
+    %{value: new_opts} = ConfigDB.get_by_params(%{group: :pleroma, key: Pleroma.Formatter})
+
+    assert new_opts == [
+             class: false,
+             extra: true,
+             new_window: false,
+             rel: "testing",
+             strip_prefix: false
+           ]
+
+    Pleroma.Config.put(Pleroma.Formatter, new_opts)
+    assert new_opts == Pleroma.Config.get(Pleroma.Formatter)
+
+    {text, _mentions, []} =
+      Pleroma.Formatter.linkify(
+        "https://www.businessinsider.com/walmart-will-close-stores-on-thanksgiving-ending-black-friday-tradition-2020-7\n\nOmg will COVID finally end Black Friday???"
+      )
+
+    assert text ==
+             "<a href=\"https://www.businessinsider.com/walmart-will-close-stores-on-thanksgiving-ending-black-friday-tradition-2020-7\" rel=\"testing\">https://www.businessinsider.com/walmart-will-close-stores-on-thanksgiving-ending-black-friday-tradition-2020-7</a>\n\nOmg will COVID finally end Black Friday???"
+  end
+
+  test "transform_opts/1 returns a list of compatible opts", %{migration: migration} do
+    old_opts = [
+      extra: true,
+      validate_tld: true,
+      class: false,
+      strip_prefix: false,
+      new_window: false,
+      rel: "qqq"
+    ]
+
+    expected_opts = [
+      class: false,
+      extra: true,
+      new_window: false,
+      rel: "qqq",
+      strip_prefix: false
+    ]
+
+    assert migration.transform_opts(old_opts) == expected_opts
+  end
+end
diff --git a/test/pleroma/repo/migrations/fix_legacy_tags_test.exs b/test/pleroma/repo/migrations/fix_legacy_tags_test.exs
new file mode 100644
index 000000000..432055e45
--- /dev/null
+++ b/test/pleroma/repo/migrations/fix_legacy_tags_test.exs
@@ -0,0 +1,28 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Repo.Migrations.FixLegacyTagsTest do
+  alias Pleroma.User
+  use Pleroma.DataCase
+  import Pleroma.Factory
+  import Pleroma.Tests.Helpers
+
+  setup_all do: require_migration("20200802170532_fix_legacy_tags")
+
+  test "change/0 converts legacy user tags into correct values", %{migration: migration} do
+    user = insert(:user, tags: ["force_nsfw", "force_unlisted", "verified"])
+    user2 = insert(:user)
+
+    assert :ok == migration.change()
+
+    fixed_user = User.get_by_id(user.id)
+    fixed_user2 = User.get_by_id(user2.id)
+
+    assert fixed_user.tags == ["mrf_tag:media-force-nsfw", "mrf_tag:force-unlisted", "verified"]
+    assert fixed_user2.tags == []
+
+    # user2 should not have been updated
+    assert fixed_user2.updated_at == fixed_user2.inserted_at
+  end
+end
diff --git a/test/pleroma/repo/migrations/fix_malformed_formatter_config_test.exs b/test/pleroma/repo/migrations/fix_malformed_formatter_config_test.exs
new file mode 100644
index 000000000..61528599a
--- /dev/null
+++ b/test/pleroma/repo/migrations/fix_malformed_formatter_config_test.exs
@@ -0,0 +1,70 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Repo.Migrations.FixMalformedFormatterConfigTest do
+  use Pleroma.DataCase
+  import Pleroma.Factory
+  import Pleroma.Tests.Helpers
+  alias Pleroma.ConfigDB
+
+  setup do: clear_config(Pleroma.Formatter)
+  setup_all do: require_migration("20200722185515_fix_malformed_formatter_config")
+
+  test "change/0 converts a map into a list", %{migration: migration} do
+    incorrect_opts = %{
+      class: false,
+      extra: true,
+      new_window: false,
+      rel: "F",
+      strip_prefix: false
+    }
+
+    insert(:config, group: :pleroma, key: Pleroma.Formatter, value: incorrect_opts)
+
+    assert :ok == migration.change()
+
+    %{value: new_opts} = ConfigDB.get_by_params(%{group: :pleroma, key: Pleroma.Formatter})
+
+    assert new_opts == [
+             class: false,
+             extra: true,
+             new_window: false,
+             rel: "F",
+             strip_prefix: false
+           ]
+
+    Pleroma.Config.put(Pleroma.Formatter, new_opts)
+    assert new_opts == Pleroma.Config.get(Pleroma.Formatter)
+
+    {text, _mentions, []} =
+      Pleroma.Formatter.linkify(
+        "https://www.businessinsider.com/walmart-will-close-stores-on-thanksgiving-ending-black-friday-tradition-2020-7\n\nOmg will COVID finally end Black Friday???"
+      )
+
+    assert text ==
+             "<a href=\"https://www.businessinsider.com/walmart-will-close-stores-on-thanksgiving-ending-black-friday-tradition-2020-7\" rel=\"F\">https://www.businessinsider.com/walmart-will-close-stores-on-thanksgiving-ending-black-friday-tradition-2020-7</a>\n\nOmg will COVID finally end Black Friday???"
+  end
+
+  test "change/0 skips if Pleroma.Formatter config is already a list", %{migration: migration} do
+    opts = [
+      class: false,
+      extra: true,
+      new_window: false,
+      rel: "ugc",
+      strip_prefix: false
+    ]
+
+    insert(:config, group: :pleroma, key: Pleroma.Formatter, value: opts)
+
+    assert :skipped == migration.change()
+
+    %{value: new_opts} = ConfigDB.get_by_params(%{group: :pleroma, key: Pleroma.Formatter})
+
+    assert new_opts == opts
+  end
+
+  test "change/0 skips if Pleroma.Formatter is empty", %{migration: migration} do
+    assert :skipped == migration.change()
+  end
+end
diff --git a/test/pleroma/repo/migrations/move_welcome_settings_test.exs b/test/pleroma/repo/migrations/move_welcome_settings_test.exs
new file mode 100644
index 000000000..53d05a55a
--- /dev/null
+++ b/test/pleroma/repo/migrations/move_welcome_settings_test.exs
@@ -0,0 +1,144 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Repo.Migrations.MoveWelcomeSettingsTest do
+  use Pleroma.DataCase
+  import Pleroma.Factory
+  import Pleroma.Tests.Helpers
+  alias Pleroma.ConfigDB
+
+  setup_all do: require_migration("20200724133313_move_welcome_settings")
+
+  describe "up/0" do
+    test "converts welcome settings", %{migration: migration} do
+      insert(:config,
+        group: :pleroma,
+        key: :instance,
+        value: [
+          welcome_message: "Test message",
+          welcome_user_nickname: "jimm",
+          name: "Pleroma"
+        ]
+      )
+
+      migration.up()
+      instance_config = ConfigDB.get_by_params(%{group: :pleroma, key: :instance})
+      welcome_config = ConfigDB.get_by_params(%{group: :pleroma, key: :welcome})
+
+      assert instance_config.value == [name: "Pleroma"]
+
+      assert welcome_config.value == [
+               direct_message: %{
+                 enabled: true,
+                 message: "Test message",
+                 sender_nickname: "jimm"
+               },
+               email: %{
+                 enabled: false,
+                 html: "Welcome to <%= instance_name %>",
+                 sender: nil,
+                 subject: "Welcome to <%= instance_name %>",
+                 text: "Welcome to <%= instance_name %>"
+               }
+             ]
+    end
+
+    test "does nothing when message empty", %{migration: migration} do
+      insert(:config,
+        group: :pleroma,
+        key: :instance,
+        value: [
+          welcome_message: "",
+          welcome_user_nickname: "jimm",
+          name: "Pleroma"
+        ]
+      )
+
+      migration.up()
+      instance_config = ConfigDB.get_by_params(%{group: :pleroma, key: :instance})
+      refute ConfigDB.get_by_params(%{group: :pleroma, key: :welcome})
+      assert instance_config.value == [name: "Pleroma"]
+    end
+
+    test "does nothing when welcome_message not set", %{migration: migration} do
+      insert(:config,
+        group: :pleroma,
+        key: :instance,
+        value: [welcome_user_nickname: "jimm", name: "Pleroma"]
+      )
+
+      migration.up()
+      instance_config = ConfigDB.get_by_params(%{group: :pleroma, key: :instance})
+      refute ConfigDB.get_by_params(%{group: :pleroma, key: :welcome})
+      assert instance_config.value == [name: "Pleroma"]
+    end
+  end
+
+  describe "down/0" do
+    test "revert new settings to old when instance setting not exists", %{migration: migration} do
+      insert(:config,
+        group: :pleroma,
+        key: :welcome,
+        value: [
+          direct_message: %{
+            enabled: true,
+            message: "Test message",
+            sender_nickname: "jimm"
+          },
+          email: %{
+            enabled: false,
+            html: "Welcome to <%= instance_name %>",
+            sender: nil,
+            subject: "Welcome to <%= instance_name %>",
+            text: "Welcome to <%= instance_name %>"
+          }
+        ]
+      )
+
+      migration.down()
+
+      refute ConfigDB.get_by_params(%{group: :pleroma, key: :welcome})
+      instance_config = ConfigDB.get_by_params(%{group: :pleroma, key: :instance})
+
+      assert instance_config.value == [
+               welcome_user_nickname: "jimm",
+               welcome_message: "Test message"
+             ]
+    end
+
+    test "revert new settings to old when instance setting exists", %{migration: migration} do
+      insert(:config, group: :pleroma, key: :instance, value: [name: "Pleroma App"])
+
+      insert(:config,
+        group: :pleroma,
+        key: :welcome,
+        value: [
+          direct_message: %{
+            enabled: true,
+            message: "Test message",
+            sender_nickname: "jimm"
+          },
+          email: %{
+            enabled: false,
+            html: "Welcome to <%= instance_name %>",
+            sender: nil,
+            subject: "Welcome to <%= instance_name %>",
+            text: "Welcome to <%= instance_name %>"
+          }
+        ]
+      )
+
+      migration.down()
+
+      refute ConfigDB.get_by_params(%{group: :pleroma, key: :welcome})
+      instance_config = ConfigDB.get_by_params(%{group: :pleroma, key: :instance})
+
+      assert instance_config.value == [
+               name: "Pleroma App",
+               welcome_user_nickname: "jimm",
+               welcome_message: "Test message"
+             ]
+    end
+  end
+end
diff --git a/test/pleroma/report_note_test.exs b/test/pleroma/report_note_test.exs
new file mode 100644
index 000000000..25c1d6a61
--- /dev/null
+++ b/test/pleroma/report_note_test.exs
@@ -0,0 +1,16 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.ReportNoteTest do
+  alias Pleroma.ReportNote
+  use Pleroma.DataCase
+  import Pleroma.Factory
+
+  test "create/3" do
+    user = insert(:user)
+    report = insert(:report_activity)
+    assert {:ok, note} = ReportNote.create(user.id, report.id, "naughty boy")
+    assert note.content == "naughty boy"
+  end
+end
diff --git a/test/pleroma/user/welcome_chat_message_test.exs b/test/pleroma/user/welcome_chat_message_test.exs
new file mode 100644
index 000000000..fe26d6e4d
--- /dev/null
+++ b/test/pleroma/user/welcome_chat_message_test.exs
@@ -0,0 +1,35 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.User.WelcomeChatMessageTest do
+  use Pleroma.DataCase
+
+  alias Pleroma.Config
+  alias Pleroma.User.WelcomeChatMessage
+
+  import Pleroma.Factory
+
+  setup do: clear_config([:welcome])
+
+  describe "post_message/1" do
+    test "send a chat welcome message" do
+      welcome_user = insert(:user, name: "mewmew")
+      user = insert(:user)
+
+      Config.put([:welcome, :chat_message, :enabled], true)
+      Config.put([:welcome, :chat_message, :sender_nickname], welcome_user.nickname)
+
+      Config.put(
+        [:welcome, :chat_message, :message],
+        "Hello, welcome to Blob/Cat!"
+      )
+
+      {:ok, %Pleroma.Activity{} = activity} = WelcomeChatMessage.post_message(user)
+
+      assert user.ap_id in activity.recipients
+      assert Pleroma.Object.normalize(activity).data["type"] == "ChatMessage"
+      assert Pleroma.Object.normalize(activity).data["content"] == "Hello, welcome to Blob/Cat!"
+    end
+  end
+end
diff --git a/test/pleroma/user/welcome_email_test.exs b/test/pleroma/user/welcome_email_test.exs
new file mode 100644
index 000000000..d005d11b2
--- /dev/null
+++ b/test/pleroma/user/welcome_email_test.exs
@@ -0,0 +1,61 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.User.WelcomeEmailTest do
+  use Pleroma.DataCase
+
+  alias Pleroma.Config
+  alias Pleroma.Tests.ObanHelpers
+  alias Pleroma.User.WelcomeEmail
+
+  import Pleroma.Factory
+  import Swoosh.TestAssertions
+
+  setup do: clear_config([:welcome])
+
+  describe "send_email/1" do
+    test "send a welcome email" do
+      user = insert(:user, name: "Jimm")
+
+      Config.put([:welcome, :email, :enabled], true)
+      Config.put([:welcome, :email, :sender], "welcome@pleroma.app")
+
+      Config.put(
+        [:welcome, :email, :subject],
+        "Hello, welcome to pleroma: <%= instance_name %>"
+      )
+
+      Config.put(
+        [:welcome, :email, :html],
+        "<h1>Hello <%= user.name %>.</h1> <p>Welcome to <%= instance_name %></p>"
+      )
+
+      instance_name = Config.get([:instance, :name])
+
+      {:ok, _job} = WelcomeEmail.send_email(user)
+
+      ObanHelpers.perform_all()
+
+      assert_email_sent(
+        from: {instance_name, "welcome@pleroma.app"},
+        to: {user.name, user.email},
+        subject: "Hello, welcome to pleroma: #{instance_name}",
+        html_body: "<h1>Hello #{user.name}.</h1> <p>Welcome to #{instance_name}</p>"
+      )
+
+      Config.put([:welcome, :email, :sender], {"Pleroma App", "welcome@pleroma.app"})
+
+      {:ok, _job} = WelcomeEmail.send_email(user)
+
+      ObanHelpers.perform_all()
+
+      assert_email_sent(
+        from: {"Pleroma App", "welcome@pleroma.app"},
+        to: {user.name, user.email},
+        subject: "Hello, welcome to pleroma: #{instance_name}",
+        html_body: "<h1>Hello #{user.name}.</h1> <p>Welcome to #{instance_name}</p>"
+      )
+    end
+  end
+end
diff --git a/test/pleroma/user/welcome_message_test.exs b/test/pleroma/user/welcome_message_test.exs
new file mode 100644
index 000000000..3cd6f5cb7
--- /dev/null
+++ b/test/pleroma/user/welcome_message_test.exs
@@ -0,0 +1,34 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.User.WelcomeMessageTest do
+  use Pleroma.DataCase
+
+  alias Pleroma.Config
+  alias Pleroma.User.WelcomeMessage
+
+  import Pleroma.Factory
+
+  setup do: clear_config([:welcome])
+
+  describe "post_message/1" do
+    test "send a direct welcome message" do
+      welcome_user = insert(:user)
+      user = insert(:user, name: "Jimm")
+
+      Config.put([:welcome, :direct_message, :enabled], true)
+      Config.put([:welcome, :direct_message, :sender_nickname], welcome_user.nickname)
+
+      Config.put(
+        [:welcome, :direct_message, :message],
+        "Hello. Welcome to Pleroma"
+      )
+
+      {:ok, %Pleroma.Activity{} = activity} = WelcomeMessage.post_message(user)
+      assert user.ap_id in activity.recipients
+      assert activity.data["directMessage"] == true
+      assert Pleroma.Object.normalize(activity).data["content"] =~ "Hello. Welcome to Pleroma"
+    end
+  end
+end
diff --git a/test/pleroma/web/activity_pub/object_validators/accept_validation_test.exs b/test/pleroma/web/activity_pub/object_validators/accept_validation_test.exs
new file mode 100644
index 000000000..d6111ba41
--- /dev/null
+++ b/test/pleroma/web/activity_pub/object_validators/accept_validation_test.exs
@@ -0,0 +1,56 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Web.ActivityPub.ObjectValidators.AcceptValidationTest do
+  use Pleroma.DataCase
+
+  alias Pleroma.Web.ActivityPub.Builder
+  alias Pleroma.Web.ActivityPub.ObjectValidator
+  alias Pleroma.Web.ActivityPub.Pipeline
+
+  import Pleroma.Factory
+
+  setup do
+    follower = insert(:user)
+    followed = insert(:user, local: false)
+
+    {:ok, follow_data, _} = Builder.follow(follower, followed)
+    {:ok, follow_activity, _} = Pipeline.common_pipeline(follow_data, local: true)
+
+    {:ok, accept_data, _} = Builder.accept(followed, follow_activity)
+
+    %{accept_data: accept_data, followed: followed}
+  end
+
+  test "it validates a basic 'accept'", %{accept_data: accept_data} do
+    assert {:ok, _, _} = ObjectValidator.validate(accept_data, [])
+  end
+
+  test "it fails when the actor doesn't exist", %{accept_data: accept_data} do
+    accept_data =
+      accept_data
+      |> Map.put("actor", "https://gensokyo.2hu/users/raymoo")
+
+    assert {:error, _} = ObjectValidator.validate(accept_data, [])
+  end
+
+  test "it fails when the accepted activity doesn't exist", %{accept_data: accept_data} do
+    accept_data =
+      accept_data
+      |> Map.put("object", "https://gensokyo.2hu/users/raymoo/follows/1")
+
+    assert {:error, _} = ObjectValidator.validate(accept_data, [])
+  end
+
+  test "for an accepted follow, it only validates if the actor of the accept is the followed actor",
+       %{accept_data: accept_data} do
+    stranger = insert(:user)
+
+    accept_data =
+      accept_data
+      |> Map.put("actor", stranger.ap_id)
+
+    assert {:error, _} = ObjectValidator.validate(accept_data, [])
+  end
+end
diff --git a/test/pleroma/web/activity_pub/object_validators/reject_validation_test.exs b/test/pleroma/web/activity_pub/object_validators/reject_validation_test.exs
new file mode 100644
index 000000000..370bb6e5c
--- /dev/null
+++ b/test/pleroma/web/activity_pub/object_validators/reject_validation_test.exs
@@ -0,0 +1,56 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Web.ActivityPub.ObjectValidators.RejectValidationTest do
+  use Pleroma.DataCase
+
+  alias Pleroma.Web.ActivityPub.Builder
+  alias Pleroma.Web.ActivityPub.ObjectValidator
+  alias Pleroma.Web.ActivityPub.Pipeline
+
+  import Pleroma.Factory
+
+  setup do
+    follower = insert(:user)
+    followed = insert(:user, local: false)
+
+    {:ok, follow_data, _} = Builder.follow(follower, followed)
+    {:ok, follow_activity, _} = Pipeline.common_pipeline(follow_data, local: true)
+
+    {:ok, reject_data, _} = Builder.reject(followed, follow_activity)
+
+    %{reject_data: reject_data, followed: followed}
+  end
+
+  test "it validates a basic 'reject'", %{reject_data: reject_data} do
+    assert {:ok, _, _} = ObjectValidator.validate(reject_data, [])
+  end
+
+  test "it fails when the actor doesn't exist", %{reject_data: reject_data} do
+    reject_data =
+      reject_data
+      |> Map.put("actor", "https://gensokyo.2hu/users/raymoo")
+
+    assert {:error, _} = ObjectValidator.validate(reject_data, [])
+  end
+
+  test "it fails when the rejected activity doesn't exist", %{reject_data: reject_data} do
+    reject_data =
+      reject_data
+      |> Map.put("object", "https://gensokyo.2hu/users/raymoo/follows/1")
+
+    assert {:error, _} = ObjectValidator.validate(reject_data, [])
+  end
+
+  test "for an rejected follow, it only validates if the actor of the reject is the followed actor",
+       %{reject_data: reject_data} do
+    stranger = insert(:user)
+
+    reject_data =
+      reject_data
+      |> Map.put("actor", stranger.ap_id)
+
+    assert {:error, _} = ObjectValidator.validate(reject_data, [])
+  end
+end
diff --git a/test/pleroma/web/activity_pub/transmogrifier/accept_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/accept_handling_test.exs
new file mode 100644
index 000000000..77d468f5c
--- /dev/null
+++ b/test/pleroma/web/activity_pub/transmogrifier/accept_handling_test.exs
@@ -0,0 +1,91 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Web.ActivityPub.Transmogrifier.AcceptHandlingTest do
+  use Pleroma.DataCase
+
+  alias Pleroma.User
+  alias Pleroma.Web.ActivityPub.Transmogrifier
+  alias Pleroma.Web.CommonAPI
+
+  import Pleroma.Factory
+
+  test "it works for incoming accepts which were pre-accepted" do
+    follower = insert(:user)
+    followed = insert(:user)
+
+    {:ok, follower} = User.follow(follower, followed)
+    assert User.following?(follower, followed) == true
+
+    {:ok, _, _, follow_activity} = CommonAPI.follow(follower, followed)
+
+    accept_data =
+      File.read!("test/fixtures/mastodon-accept-activity.json")
+      |> Poison.decode!()
+      |> Map.put("actor", followed.ap_id)
+
+    object =
+      accept_data["object"]
+      |> Map.put("actor", follower.ap_id)
+      |> Map.put("id", follow_activity.data["id"])
+
+    accept_data = Map.put(accept_data, "object", object)
+
+    {:ok, activity} = Transmogrifier.handle_incoming(accept_data)
+    refute activity.local
+
+    assert activity.data["object"] == follow_activity.data["id"]
+
+    assert activity.data["id"] == accept_data["id"]
+
+    follower = User.get_cached_by_id(follower.id)
+
+    assert User.following?(follower, followed) == true
+  end
+
+  test "it works for incoming accepts which are referenced by IRI only" do
+    follower = insert(:user)
+    followed = insert(:user, locked: true)
+
+    {:ok, _, _, follow_activity} = CommonAPI.follow(follower, followed)
+
+    accept_data =
+      File.read!("test/fixtures/mastodon-accept-activity.json")
+      |> Poison.decode!()
+      |> Map.put("actor", followed.ap_id)
+      |> Map.put("object", follow_activity.data["id"])
+
+    {:ok, activity} = Transmogrifier.handle_incoming(accept_data)
+    assert activity.data["object"] == follow_activity.data["id"]
+
+    follower = User.get_cached_by_id(follower.id)
+
+    assert User.following?(follower, followed) == true
+
+    follower = User.get_by_id(follower.id)
+    assert follower.following_count == 1
+
+    followed = User.get_by_id(followed.id)
+    assert followed.follower_count == 1
+  end
+
+  test "it fails for incoming accepts which cannot be correlated" do
+    follower = insert(:user)
+    followed = insert(:user, locked: true)
+
+    accept_data =
+      File.read!("test/fixtures/mastodon-accept-activity.json")
+      |> Poison.decode!()
+      |> Map.put("actor", followed.ap_id)
+
+    accept_data =
+      Map.put(accept_data, "object", Map.put(accept_data["object"], "actor", follower.ap_id))
+
+    {:error, _} = Transmogrifier.handle_incoming(accept_data)
+
+    follower = User.get_cached_by_id(follower.id)
+
+    refute User.following?(follower, followed) == true
+  end
+end
diff --git a/test/pleroma/web/activity_pub/transmogrifier/answer_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/answer_handling_test.exs
new file mode 100644
index 000000000..0f6605c3f
--- /dev/null
+++ b/test/pleroma/web/activity_pub/transmogrifier/answer_handling_test.exs
@@ -0,0 +1,78 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Web.ActivityPub.Transmogrifier.AnswerHandlingTest do
+  use Pleroma.DataCase
+
+  alias Pleroma.Activity
+  alias Pleroma.Object
+  alias Pleroma.Web.ActivityPub.Transmogrifier
+  alias Pleroma.Web.CommonAPI
+
+  import Pleroma.Factory
+
+  setup_all do
+    Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
+    :ok
+  end
+
+  test "incoming, rewrites Note to Answer and increments vote counters" do
+    user = insert(:user)
+
+    {:ok, activity} =
+      CommonAPI.post(user, %{
+        status: "suya...",
+        poll: %{options: ["suya", "suya.", "suya.."], expires_in: 10}
+      })
+
+    object = Object.normalize(activity)
+
+    data =
+      File.read!("test/fixtures/mastodon-vote.json")
+      |> Poison.decode!()
+      |> Kernel.put_in(["to"], user.ap_id)
+      |> Kernel.put_in(["object", "inReplyTo"], object.data["id"])
+      |> Kernel.put_in(["object", "to"], user.ap_id)
+
+    {:ok, %Activity{local: false} = activity} = Transmogrifier.handle_incoming(data)
+    answer_object = Object.normalize(activity)
+    assert answer_object.data["type"] == "Answer"
+    assert answer_object.data["inReplyTo"] == object.data["id"]
+
+    new_object = Object.get_by_ap_id(object.data["id"])
+    assert new_object.data["replies_count"] == object.data["replies_count"]
+
+    assert Enum.any?(
+             new_object.data["oneOf"],
+             fn
+               %{"name" => "suya..", "replies" => %{"totalItems" => 1}} -> true
+               _ -> false
+             end
+           )
+  end
+
+  test "outgoing, rewrites Answer to Note" do
+    user = insert(:user)
+
+    {:ok, poll_activity} =
+      CommonAPI.post(user, %{
+        status: "suya...",
+        poll: %{options: ["suya", "suya.", "suya.."], expires_in: 10}
+      })
+
+    poll_object = Object.normalize(poll_activity)
+    # TODO: Replace with CommonAPI vote creation when implemented
+    data =
+      File.read!("test/fixtures/mastodon-vote.json")
+      |> Poison.decode!()
+      |> Kernel.put_in(["to"], user.ap_id)
+      |> Kernel.put_in(["object", "inReplyTo"], poll_object.data["id"])
+      |> Kernel.put_in(["object", "to"], user.ap_id)
+
+    {:ok, %Activity{local: false} = activity} = Transmogrifier.handle_incoming(data)
+    {:ok, data} = Transmogrifier.prepare_outgoing(activity.data)
+
+    assert data["object"]["type"] == "Note"
+  end
+end
diff --git a/test/pleroma/web/activity_pub/transmogrifier/question_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/question_handling_test.exs
new file mode 100644
index 000000000..d2822ce75
--- /dev/null
+++ b/test/pleroma/web/activity_pub/transmogrifier/question_handling_test.exs
@@ -0,0 +1,176 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Web.ActivityPub.Transmogrifier.QuestionHandlingTest do
+  use Pleroma.DataCase
+
+  alias Pleroma.Activity
+  alias Pleroma.Object
+  alias Pleroma.Web.ActivityPub.Transmogrifier
+  alias Pleroma.Web.CommonAPI
+
+  import Pleroma.Factory
+
+  setup_all do
+    Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
+    :ok
+  end
+
+  test "Mastodon Question activity" do
+    data = File.read!("test/fixtures/mastodon-question-activity.json") |> Poison.decode!()
+
+    {:ok, %Activity{local: false} = activity} = Transmogrifier.handle_incoming(data)
+
+    object = Object.normalize(activity, false)
+
+    assert object.data["url"] == "https://mastodon.sdf.org/@rinpatch/102070944809637304"
+
+    assert object.data["closed"] == "2019-05-11T09:03:36Z"
+
+    assert object.data["context"] == activity.data["context"]
+
+    assert object.data["context"] ==
+             "tag:mastodon.sdf.org,2019-05-10:objectId=15095122:objectType=Conversation"
+
+    assert object.data["context_id"]
+
+    assert object.data["anyOf"] == []
+
+    assert Enum.sort(object.data["oneOf"]) ==
+             Enum.sort([
+               %{
+                 "name" => "25 char limit is dumb",
+                 "replies" => %{"totalItems" => 0, "type" => "Collection"},
+                 "type" => "Note"
+               },
+               %{
+                 "name" => "Dunno",
+                 "replies" => %{"totalItems" => 0, "type" => "Collection"},
+                 "type" => "Note"
+               },
+               %{
+                 "name" => "Everyone knows that!",
+                 "replies" => %{"totalItems" => 1, "type" => "Collection"},
+                 "type" => "Note"
+               },
+               %{
+                 "name" => "I can't even fit a funny",
+                 "replies" => %{"totalItems" => 1, "type" => "Collection"},
+                 "type" => "Note"
+               }
+             ])
+
+    user = insert(:user)
+
+    {:ok, reply_activity} = CommonAPI.post(user, %{status: "hewwo", in_reply_to_id: activity.id})
+
+    reply_object = Object.normalize(reply_activity, false)
+
+    assert reply_object.data["context"] == object.data["context"]
+    assert reply_object.data["context_id"] == object.data["context_id"]
+  end
+
+  test "Mastodon Question activity with HTML tags in plaintext" do
+    options = [
+      %{
+        "type" => "Note",
+        "name" => "<input type=\"date\">",
+        "replies" => %{"totalItems" => 0, "type" => "Collection"}
+      },
+      %{
+        "type" => "Note",
+        "name" => "<input type=\"date\"/>",
+        "replies" => %{"totalItems" => 0, "type" => "Collection"}
+      },
+      %{
+        "type" => "Note",
+        "name" => "<input type=\"date\" />",
+        "replies" => %{"totalItems" => 1, "type" => "Collection"}
+      },
+      %{
+        "type" => "Note",
+        "name" => "<input type=\"date\"></input>",
+        "replies" => %{"totalItems" => 1, "type" => "Collection"}
+      }
+    ]
+
+    data =
+      File.read!("test/fixtures/mastodon-question-activity.json")
+      |> Poison.decode!()
+      |> Kernel.put_in(["object", "oneOf"], options)
+
+    {:ok, %Activity{local: false} = activity} = Transmogrifier.handle_incoming(data)
+    object = Object.normalize(activity, false)
+
+    assert Enum.sort(object.data["oneOf"]) == Enum.sort(options)
+  end
+
+  test "Mastodon Question activity with custom emojis" do
+    options = [
+      %{
+        "type" => "Note",
+        "name" => ":blobcat:",
+        "replies" => %{"totalItems" => 0, "type" => "Collection"}
+      },
+      %{
+        "type" => "Note",
+        "name" => ":blobfox:",
+        "replies" => %{"totalItems" => 0, "type" => "Collection"}
+      }
+    ]
+
+    tag = [
+      %{
+        "icon" => %{
+          "type" => "Image",
+          "url" => "https://blob.cat/emoji/custom/blobcats/blobcat.png"
+        },
+        "id" => "https://blob.cat/emoji/custom/blobcats/blobcat.png",
+        "name" => ":blobcat:",
+        "type" => "Emoji",
+        "updated" => "1970-01-01T00:00:00Z"
+      },
+      %{
+        "icon" => %{"type" => "Image", "url" => "https://blob.cat/emoji/blobfox/blobfox.png"},
+        "id" => "https://blob.cat/emoji/blobfox/blobfox.png",
+        "name" => ":blobfox:",
+        "type" => "Emoji",
+        "updated" => "1970-01-01T00:00:00Z"
+      }
+    ]
+
+    data =
+      File.read!("test/fixtures/mastodon-question-activity.json")
+      |> Poison.decode!()
+      |> Kernel.put_in(["object", "oneOf"], options)
+      |> Kernel.put_in(["object", "tag"], tag)
+
+    {:ok, %Activity{local: false} = activity} = Transmogrifier.handle_incoming(data)
+    object = Object.normalize(activity, false)
+
+    assert object.data["oneOf"] == options
+
+    assert object.data["emoji"] == %{
+             "blobcat" => "https://blob.cat/emoji/custom/blobcats/blobcat.png",
+             "blobfox" => "https://blob.cat/emoji/blobfox/blobfox.png"
+           }
+  end
+
+  test "returns same activity if received a second time" do
+    data = File.read!("test/fixtures/mastodon-question-activity.json") |> Poison.decode!()
+
+    assert {:ok, %Activity{local: false} = activity} = Transmogrifier.handle_incoming(data)
+
+    assert {:ok, ^activity} = Transmogrifier.handle_incoming(data)
+  end
+
+  test "accepts a Question with no content" do
+    data =
+      File.read!("test/fixtures/mastodon-question-activity.json")
+      |> Poison.decode!()
+      |> Kernel.put_in(["object", "content"], "")
+
+    assert {:ok, %Activity{local: false}} = Transmogrifier.handle_incoming(data)
+  end
+end
diff --git a/test/pleroma/web/activity_pub/transmogrifier/reject_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/reject_handling_test.exs
new file mode 100644
index 000000000..7592fbe1c
--- /dev/null
+++ b/test/pleroma/web/activity_pub/transmogrifier/reject_handling_test.exs
@@ -0,0 +1,67 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Web.ActivityPub.Transmogrifier.RejectHandlingTest do
+  use Pleroma.DataCase
+
+  alias Pleroma.Activity
+  alias Pleroma.User
+  alias Pleroma.Web.ActivityPub.Transmogrifier
+  alias Pleroma.Web.CommonAPI
+
+  import Pleroma.Factory
+
+  test "it fails for incoming rejects which cannot be correlated" do
+    follower = insert(:user)
+    followed = insert(:user, locked: true)
+
+    accept_data =
+      File.read!("test/fixtures/mastodon-reject-activity.json")
+      |> Poison.decode!()
+      |> Map.put("actor", followed.ap_id)
+
+    accept_data =
+      Map.put(accept_data, "object", Map.put(accept_data["object"], "actor", follower.ap_id))
+
+    {:error, _} = Transmogrifier.handle_incoming(accept_data)
+
+    follower = User.get_cached_by_id(follower.id)
+
+    refute User.following?(follower, followed) == true
+  end
+
+  test "it works for incoming rejects which are referenced by IRI only" do
+    follower = insert(:user)
+    followed = insert(:user, locked: true)
+
+    {:ok, follower} = User.follow(follower, followed)
+    {:ok, _, _, follow_activity} = CommonAPI.follow(follower, followed)
+
+    assert User.following?(follower, followed) == true
+
+    reject_data =
+      File.read!("test/fixtures/mastodon-reject-activity.json")
+      |> Poison.decode!()
+      |> Map.put("actor", followed.ap_id)
+      |> Map.put("object", follow_activity.data["id"])
+
+    {:ok, %Activity{data: _}} = Transmogrifier.handle_incoming(reject_data)
+
+    follower = User.get_cached_by_id(follower.id)
+
+    assert User.following?(follower, followed) == false
+  end
+
+  test "it rejects activities without a valid ID" do
+    user = insert(:user)
+
+    data =
+      File.read!("test/fixtures/mastodon-follow-activity.json")
+      |> Poison.decode!()
+      |> Map.put("object", user.ap_id)
+      |> Map.put("id", "")
+
+    :error = Transmogrifier.handle_incoming(data)
+  end
+end
diff --git a/test/pleroma/web/plugs/frontend_static_plug_test.exs b/test/pleroma/web/plugs/frontend_static_plug_test.exs
new file mode 100644
index 000000000..f6f7d7bdb
--- /dev/null
+++ b/test/pleroma/web/plugs/frontend_static_plug_test.exs
@@ -0,0 +1,56 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Web.Plugs.FrontendStaticPlugTest do
+  use Pleroma.Web.ConnCase
+
+  @dir "test/tmp/instance_static"
+
+  setup do
+    File.mkdir_p!(@dir)
+    on_exit(fn -> File.rm_rf(@dir) end)
+  end
+
+  setup do: clear_config([:instance, :static_dir], @dir)
+
+  test "init will give a static plug config + the frontend type" do
+    opts =
+      [
+        at: "/admin",
+        frontend_type: :admin
+      ]
+      |> Pleroma.Web.Plugs.FrontendStatic.init()
+
+    assert opts[:at] == ["admin"]
+    assert opts[:frontend_type] == :admin
+  end
+
+  test "overrides existing static files", %{conn: conn} do
+    name = "pelmora"
+    ref = "uguu"
+
+    clear_config([:frontends, :primary], %{"name" => name, "ref" => ref})
+    path = "#{@dir}/frontends/#{name}/#{ref}"
+
+    File.mkdir_p!(path)
+    File.write!("#{path}/index.html", "from frontend plug")
+
+    index = get(conn, "/")
+    assert html_response(index, 200) == "from frontend plug"
+  end
+
+  test "overrides existing static files for the `pleroma/admin` path", %{conn: conn} do
+    name = "pelmora"
+    ref = "uguu"
+
+    clear_config([:frontends, :admin], %{"name" => name, "ref" => ref})
+    path = "#{@dir}/frontends/#{name}/#{ref}"
+
+    File.mkdir_p!(path)
+    File.write!("#{path}/index.html", "from frontend plug")
+
+    index = get(conn, "/pleroma/admin/")
+    assert html_response(index, 200) == "from frontend plug"
+  end
+end
diff --git a/test/plugs/frontend_static_test.exs b/test/plugs/frontend_static_test.exs
deleted file mode 100644
index 6f4923048..000000000
--- a/test/plugs/frontend_static_test.exs
+++ /dev/null
@@ -1,57 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Web.FrontendStaticPlugTest do
-  alias Pleroma.Plugs.FrontendStatic
-  use Pleroma.Web.ConnCase
-
-  @dir "test/tmp/instance_static"
-
-  setup do
-    File.mkdir_p!(@dir)
-    on_exit(fn -> File.rm_rf(@dir) end)
-  end
-
-  setup do: clear_config([:instance, :static_dir], @dir)
-
-  test "init will give a static plug config + the frontend type" do
-    opts =
-      [
-        at: "/admin",
-        frontend_type: :admin
-      ]
-      |> FrontendStatic.init()
-
-    assert opts[:at] == ["admin"]
-    assert opts[:frontend_type] == :admin
-  end
-
-  test "overrides existing static files", %{conn: conn} do
-    name = "pelmora"
-    ref = "uguu"
-
-    clear_config([:frontends, :primary], %{"name" => name, "ref" => ref})
-    path = "#{@dir}/frontends/#{name}/#{ref}"
-
-    File.mkdir_p!(path)
-    File.write!("#{path}/index.html", "from frontend plug")
-
-    index = get(conn, "/")
-    assert html_response(index, 200) == "from frontend plug"
-  end
-
-  test "overrides existing static files for the `pleroma/admin` path", %{conn: conn} do
-    name = "pelmora"
-    ref = "uguu"
-
-    clear_config([:frontends, :admin], %{"name" => name, "ref" => ref})
-    path = "#{@dir}/frontends/#{name}/#{ref}"
-
-    File.mkdir_p!(path)
-    File.write!("#{path}/index.html", "from frontend plug")
-
-    index = get(conn, "/pleroma/admin/")
-    assert html_response(index, 200) == "from frontend plug"
-  end
-end
diff --git a/test/report_note_test.exs b/test/report_note_test.exs
deleted file mode 100644
index 25c1d6a61..000000000
--- a/test/report_note_test.exs
+++ /dev/null
@@ -1,16 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.ReportNoteTest do
-  alias Pleroma.ReportNote
-  use Pleroma.DataCase
-  import Pleroma.Factory
-
-  test "create/3" do
-    user = insert(:user)
-    report = insert(:report_activity)
-    assert {:ok, note} = ReportNote.create(user.id, report.id, "naughty boy")
-    assert note.content == "naughty boy"
-  end
-end
diff --git a/test/user/welcome_chat_massage_test.exs b/test/user/welcome_chat_massage_test.exs
deleted file mode 100644
index fe26d6e4d..000000000
--- a/test/user/welcome_chat_massage_test.exs
+++ /dev/null
@@ -1,35 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.User.WelcomeChatMessageTest do
-  use Pleroma.DataCase
-
-  alias Pleroma.Config
-  alias Pleroma.User.WelcomeChatMessage
-
-  import Pleroma.Factory
-
-  setup do: clear_config([:welcome])
-
-  describe "post_message/1" do
-    test "send a chat welcome message" do
-      welcome_user = insert(:user, name: "mewmew")
-      user = insert(:user)
-
-      Config.put([:welcome, :chat_message, :enabled], true)
-      Config.put([:welcome, :chat_message, :sender_nickname], welcome_user.nickname)
-
-      Config.put(
-        [:welcome, :chat_message, :message],
-        "Hello, welcome to Blob/Cat!"
-      )
-
-      {:ok, %Pleroma.Activity{} = activity} = WelcomeChatMessage.post_message(user)
-
-      assert user.ap_id in activity.recipients
-      assert Pleroma.Object.normalize(activity).data["type"] == "ChatMessage"
-      assert Pleroma.Object.normalize(activity).data["content"] == "Hello, welcome to Blob/Cat!"
-    end
-  end
-end
diff --git a/test/user/welcome_email_test.exs b/test/user/welcome_email_test.exs
deleted file mode 100644
index d005d11b2..000000000
--- a/test/user/welcome_email_test.exs
+++ /dev/null
@@ -1,61 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.User.WelcomeEmailTest do
-  use Pleroma.DataCase
-
-  alias Pleroma.Config
-  alias Pleroma.Tests.ObanHelpers
-  alias Pleroma.User.WelcomeEmail
-
-  import Pleroma.Factory
-  import Swoosh.TestAssertions
-
-  setup do: clear_config([:welcome])
-
-  describe "send_email/1" do
-    test "send a welcome email" do
-      user = insert(:user, name: "Jimm")
-
-      Config.put([:welcome, :email, :enabled], true)
-      Config.put([:welcome, :email, :sender], "welcome@pleroma.app")
-
-      Config.put(
-        [:welcome, :email, :subject],
-        "Hello, welcome to pleroma: <%= instance_name %>"
-      )
-
-      Config.put(
-        [:welcome, :email, :html],
-        "<h1>Hello <%= user.name %>.</h1> <p>Welcome to <%= instance_name %></p>"
-      )
-
-      instance_name = Config.get([:instance, :name])
-
-      {:ok, _job} = WelcomeEmail.send_email(user)
-
-      ObanHelpers.perform_all()
-
-      assert_email_sent(
-        from: {instance_name, "welcome@pleroma.app"},
-        to: {user.name, user.email},
-        subject: "Hello, welcome to pleroma: #{instance_name}",
-        html_body: "<h1>Hello #{user.name}.</h1> <p>Welcome to #{instance_name}</p>"
-      )
-
-      Config.put([:welcome, :email, :sender], {"Pleroma App", "welcome@pleroma.app"})
-
-      {:ok, _job} = WelcomeEmail.send_email(user)
-
-      ObanHelpers.perform_all()
-
-      assert_email_sent(
-        from: {"Pleroma App", "welcome@pleroma.app"},
-        to: {user.name, user.email},
-        subject: "Hello, welcome to pleroma: #{instance_name}",
-        html_body: "<h1>Hello #{user.name}.</h1> <p>Welcome to #{instance_name}</p>"
-      )
-    end
-  end
-end
diff --git a/test/user/welcome_message_test.exs b/test/user/welcome_message_test.exs
deleted file mode 100644
index 3cd6f5cb7..000000000
--- a/test/user/welcome_message_test.exs
+++ /dev/null
@@ -1,34 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.User.WelcomeMessageTest do
-  use Pleroma.DataCase
-
-  alias Pleroma.Config
-  alias Pleroma.User.WelcomeMessage
-
-  import Pleroma.Factory
-
-  setup do: clear_config([:welcome])
-
-  describe "post_message/1" do
-    test "send a direct welcome message" do
-      welcome_user = insert(:user)
-      user = insert(:user, name: "Jimm")
-
-      Config.put([:welcome, :direct_message, :enabled], true)
-      Config.put([:welcome, :direct_message, :sender_nickname], welcome_user.nickname)
-
-      Config.put(
-        [:welcome, :direct_message, :message],
-        "Hello. Welcome to Pleroma"
-      )
-
-      {:ok, %Pleroma.Activity{} = activity} = WelcomeMessage.post_message(user)
-      assert user.ap_id in activity.recipients
-      assert activity.data["directMessage"] == true
-      assert Pleroma.Object.normalize(activity).data["content"] =~ "Hello. Welcome to Pleroma"
-    end
-  end
-end
diff --git a/test/web/activity_pub/object_validators/accept_validation_test.exs b/test/web/activity_pub/object_validators/accept_validation_test.exs
deleted file mode 100644
index d6111ba41..000000000
--- a/test/web/activity_pub/object_validators/accept_validation_test.exs
+++ /dev/null
@@ -1,56 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Web.ActivityPub.ObjectValidators.AcceptValidationTest do
-  use Pleroma.DataCase
-
-  alias Pleroma.Web.ActivityPub.Builder
-  alias Pleroma.Web.ActivityPub.ObjectValidator
-  alias Pleroma.Web.ActivityPub.Pipeline
-
-  import Pleroma.Factory
-
-  setup do
-    follower = insert(:user)
-    followed = insert(:user, local: false)
-
-    {:ok, follow_data, _} = Builder.follow(follower, followed)
-    {:ok, follow_activity, _} = Pipeline.common_pipeline(follow_data, local: true)
-
-    {:ok, accept_data, _} = Builder.accept(followed, follow_activity)
-
-    %{accept_data: accept_data, followed: followed}
-  end
-
-  test "it validates a basic 'accept'", %{accept_data: accept_data} do
-    assert {:ok, _, _} = ObjectValidator.validate(accept_data, [])
-  end
-
-  test "it fails when the actor doesn't exist", %{accept_data: accept_data} do
-    accept_data =
-      accept_data
-      |> Map.put("actor", "https://gensokyo.2hu/users/raymoo")
-
-    assert {:error, _} = ObjectValidator.validate(accept_data, [])
-  end
-
-  test "it fails when the accepted activity doesn't exist", %{accept_data: accept_data} do
-    accept_data =
-      accept_data
-      |> Map.put("object", "https://gensokyo.2hu/users/raymoo/follows/1")
-
-    assert {:error, _} = ObjectValidator.validate(accept_data, [])
-  end
-
-  test "for an accepted follow, it only validates if the actor of the accept is the followed actor",
-       %{accept_data: accept_data} do
-    stranger = insert(:user)
-
-    accept_data =
-      accept_data
-      |> Map.put("actor", stranger.ap_id)
-
-    assert {:error, _} = ObjectValidator.validate(accept_data, [])
-  end
-end
diff --git a/test/web/activity_pub/object_validators/reject_validation_test.exs b/test/web/activity_pub/object_validators/reject_validation_test.exs
deleted file mode 100644
index 370bb6e5c..000000000
--- a/test/web/activity_pub/object_validators/reject_validation_test.exs
+++ /dev/null
@@ -1,56 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Web.ActivityPub.ObjectValidators.RejectValidationTest do
-  use Pleroma.DataCase
-
-  alias Pleroma.Web.ActivityPub.Builder
-  alias Pleroma.Web.ActivityPub.ObjectValidator
-  alias Pleroma.Web.ActivityPub.Pipeline
-
-  import Pleroma.Factory
-
-  setup do
-    follower = insert(:user)
-    followed = insert(:user, local: false)
-
-    {:ok, follow_data, _} = Builder.follow(follower, followed)
-    {:ok, follow_activity, _} = Pipeline.common_pipeline(follow_data, local: true)
-
-    {:ok, reject_data, _} = Builder.reject(followed, follow_activity)
-
-    %{reject_data: reject_data, followed: followed}
-  end
-
-  test "it validates a basic 'reject'", %{reject_data: reject_data} do
-    assert {:ok, _, _} = ObjectValidator.validate(reject_data, [])
-  end
-
-  test "it fails when the actor doesn't exist", %{reject_data: reject_data} do
-    reject_data =
-      reject_data
-      |> Map.put("actor", "https://gensokyo.2hu/users/raymoo")
-
-    assert {:error, _} = ObjectValidator.validate(reject_data, [])
-  end
-
-  test "it fails when the rejected activity doesn't exist", %{reject_data: reject_data} do
-    reject_data =
-      reject_data
-      |> Map.put("object", "https://gensokyo.2hu/users/raymoo/follows/1")
-
-    assert {:error, _} = ObjectValidator.validate(reject_data, [])
-  end
-
-  test "for an rejected follow, it only validates if the actor of the reject is the followed actor",
-       %{reject_data: reject_data} do
-    stranger = insert(:user)
-
-    reject_data =
-      reject_data
-      |> Map.put("actor", stranger.ap_id)
-
-    assert {:error, _} = ObjectValidator.validate(reject_data, [])
-  end
-end
diff --git a/test/web/activity_pub/transmogrifier/accept_handling_test.exs b/test/web/activity_pub/transmogrifier/accept_handling_test.exs
deleted file mode 100644
index 77d468f5c..000000000
--- a/test/web/activity_pub/transmogrifier/accept_handling_test.exs
+++ /dev/null
@@ -1,91 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Web.ActivityPub.Transmogrifier.AcceptHandlingTest do
-  use Pleroma.DataCase
-
-  alias Pleroma.User
-  alias Pleroma.Web.ActivityPub.Transmogrifier
-  alias Pleroma.Web.CommonAPI
-
-  import Pleroma.Factory
-
-  test "it works for incoming accepts which were pre-accepted" do
-    follower = insert(:user)
-    followed = insert(:user)
-
-    {:ok, follower} = User.follow(follower, followed)
-    assert User.following?(follower, followed) == true
-
-    {:ok, _, _, follow_activity} = CommonAPI.follow(follower, followed)
-
-    accept_data =
-      File.read!("test/fixtures/mastodon-accept-activity.json")
-      |> Poison.decode!()
-      |> Map.put("actor", followed.ap_id)
-
-    object =
-      accept_data["object"]
-      |> Map.put("actor", follower.ap_id)
-      |> Map.put("id", follow_activity.data["id"])
-
-    accept_data = Map.put(accept_data, "object", object)
-
-    {:ok, activity} = Transmogrifier.handle_incoming(accept_data)
-    refute activity.local
-
-    assert activity.data["object"] == follow_activity.data["id"]
-
-    assert activity.data["id"] == accept_data["id"]
-
-    follower = User.get_cached_by_id(follower.id)
-
-    assert User.following?(follower, followed) == true
-  end
-
-  test "it works for incoming accepts which are referenced by IRI only" do
-    follower = insert(:user)
-    followed = insert(:user, locked: true)
-
-    {:ok, _, _, follow_activity} = CommonAPI.follow(follower, followed)
-
-    accept_data =
-      File.read!("test/fixtures/mastodon-accept-activity.json")
-      |> Poison.decode!()
-      |> Map.put("actor", followed.ap_id)
-      |> Map.put("object", follow_activity.data["id"])
-
-    {:ok, activity} = Transmogrifier.handle_incoming(accept_data)
-    assert activity.data["object"] == follow_activity.data["id"]
-
-    follower = User.get_cached_by_id(follower.id)
-
-    assert User.following?(follower, followed) == true
-
-    follower = User.get_by_id(follower.id)
-    assert follower.following_count == 1
-
-    followed = User.get_by_id(followed.id)
-    assert followed.follower_count == 1
-  end
-
-  test "it fails for incoming accepts which cannot be correlated" do
-    follower = insert(:user)
-    followed = insert(:user, locked: true)
-
-    accept_data =
-      File.read!("test/fixtures/mastodon-accept-activity.json")
-      |> Poison.decode!()
-      |> Map.put("actor", followed.ap_id)
-
-    accept_data =
-      Map.put(accept_data, "object", Map.put(accept_data["object"], "actor", follower.ap_id))
-
-    {:error, _} = Transmogrifier.handle_incoming(accept_data)
-
-    follower = User.get_cached_by_id(follower.id)
-
-    refute User.following?(follower, followed) == true
-  end
-end
diff --git a/test/web/activity_pub/transmogrifier/answer_handling_test.exs b/test/web/activity_pub/transmogrifier/answer_handling_test.exs
deleted file mode 100644
index 0f6605c3f..000000000
--- a/test/web/activity_pub/transmogrifier/answer_handling_test.exs
+++ /dev/null
@@ -1,78 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Web.ActivityPub.Transmogrifier.AnswerHandlingTest do
-  use Pleroma.DataCase
-
-  alias Pleroma.Activity
-  alias Pleroma.Object
-  alias Pleroma.Web.ActivityPub.Transmogrifier
-  alias Pleroma.Web.CommonAPI
-
-  import Pleroma.Factory
-
-  setup_all do
-    Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
-    :ok
-  end
-
-  test "incoming, rewrites Note to Answer and increments vote counters" do
-    user = insert(:user)
-
-    {:ok, activity} =
-      CommonAPI.post(user, %{
-        status: "suya...",
-        poll: %{options: ["suya", "suya.", "suya.."], expires_in: 10}
-      })
-
-    object = Object.normalize(activity)
-
-    data =
-      File.read!("test/fixtures/mastodon-vote.json")
-      |> Poison.decode!()
-      |> Kernel.put_in(["to"], user.ap_id)
-      |> Kernel.put_in(["object", "inReplyTo"], object.data["id"])
-      |> Kernel.put_in(["object", "to"], user.ap_id)
-
-    {:ok, %Activity{local: false} = activity} = Transmogrifier.handle_incoming(data)
-    answer_object = Object.normalize(activity)
-    assert answer_object.data["type"] == "Answer"
-    assert answer_object.data["inReplyTo"] == object.data["id"]
-
-    new_object = Object.get_by_ap_id(object.data["id"])
-    assert new_object.data["replies_count"] == object.data["replies_count"]
-
-    assert Enum.any?(
-             new_object.data["oneOf"],
-             fn
-               %{"name" => "suya..", "replies" => %{"totalItems" => 1}} -> true
-               _ -> false
-             end
-           )
-  end
-
-  test "outgoing, rewrites Answer to Note" do
-    user = insert(:user)
-
-    {:ok, poll_activity} =
-      CommonAPI.post(user, %{
-        status: "suya...",
-        poll: %{options: ["suya", "suya.", "suya.."], expires_in: 10}
-      })
-
-    poll_object = Object.normalize(poll_activity)
-    # TODO: Replace with CommonAPI vote creation when implemented
-    data =
-      File.read!("test/fixtures/mastodon-vote.json")
-      |> Poison.decode!()
-      |> Kernel.put_in(["to"], user.ap_id)
-      |> Kernel.put_in(["object", "inReplyTo"], poll_object.data["id"])
-      |> Kernel.put_in(["object", "to"], user.ap_id)
-
-    {:ok, %Activity{local: false} = activity} = Transmogrifier.handle_incoming(data)
-    {:ok, data} = Transmogrifier.prepare_outgoing(activity.data)
-
-    assert data["object"]["type"] == "Note"
-  end
-end
diff --git a/test/web/activity_pub/transmogrifier/question_handling_test.exs b/test/web/activity_pub/transmogrifier/question_handling_test.exs
deleted file mode 100644
index d2822ce75..000000000
--- a/test/web/activity_pub/transmogrifier/question_handling_test.exs
+++ /dev/null
@@ -1,176 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Web.ActivityPub.Transmogrifier.QuestionHandlingTest do
-  use Pleroma.DataCase
-
-  alias Pleroma.Activity
-  alias Pleroma.Object
-  alias Pleroma.Web.ActivityPub.Transmogrifier
-  alias Pleroma.Web.CommonAPI
-
-  import Pleroma.Factory
-
-  setup_all do
-    Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
-    :ok
-  end
-
-  test "Mastodon Question activity" do
-    data = File.read!("test/fixtures/mastodon-question-activity.json") |> Poison.decode!()
-
-    {:ok, %Activity{local: false} = activity} = Transmogrifier.handle_incoming(data)
-
-    object = Object.normalize(activity, false)
-
-    assert object.data["url"] == "https://mastodon.sdf.org/@rinpatch/102070944809637304"
-
-    assert object.data["closed"] == "2019-05-11T09:03:36Z"
-
-    assert object.data["context"] == activity.data["context"]
-
-    assert object.data["context"] ==
-             "tag:mastodon.sdf.org,2019-05-10:objectId=15095122:objectType=Conversation"
-
-    assert object.data["context_id"]
-
-    assert object.data["anyOf"] == []
-
-    assert Enum.sort(object.data["oneOf"]) ==
-             Enum.sort([
-               %{
-                 "name" => "25 char limit is dumb",
-                 "replies" => %{"totalItems" => 0, "type" => "Collection"},
-                 "type" => "Note"
-               },
-               %{
-                 "name" => "Dunno",
-                 "replies" => %{"totalItems" => 0, "type" => "Collection"},
-                 "type" => "Note"
-               },
-               %{
-                 "name" => "Everyone knows that!",
-                 "replies" => %{"totalItems" => 1, "type" => "Collection"},
-                 "type" => "Note"
-               },
-               %{
-                 "name" => "I can't even fit a funny",
-                 "replies" => %{"totalItems" => 1, "type" => "Collection"},
-                 "type" => "Note"
-               }
-             ])
-
-    user = insert(:user)
-
-    {:ok, reply_activity} = CommonAPI.post(user, %{status: "hewwo", in_reply_to_id: activity.id})
-
-    reply_object = Object.normalize(reply_activity, false)
-
-    assert reply_object.data["context"] == object.data["context"]
-    assert reply_object.data["context_id"] == object.data["context_id"]
-  end
-
-  test "Mastodon Question activity with HTML tags in plaintext" do
-    options = [
-      %{
-        "type" => "Note",
-        "name" => "<input type=\"date\">",
-        "replies" => %{"totalItems" => 0, "type" => "Collection"}
-      },
-      %{
-        "type" => "Note",
-        "name" => "<input type=\"date\"/>",
-        "replies" => %{"totalItems" => 0, "type" => "Collection"}
-      },
-      %{
-        "type" => "Note",
-        "name" => "<input type=\"date\" />",
-        "replies" => %{"totalItems" => 1, "type" => "Collection"}
-      },
-      %{
-        "type" => "Note",
-        "name" => "<input type=\"date\"></input>",
-        "replies" => %{"totalItems" => 1, "type" => "Collection"}
-      }
-    ]
-
-    data =
-      File.read!("test/fixtures/mastodon-question-activity.json")
-      |> Poison.decode!()
-      |> Kernel.put_in(["object", "oneOf"], options)
-
-    {:ok, %Activity{local: false} = activity} = Transmogrifier.handle_incoming(data)
-    object = Object.normalize(activity, false)
-
-    assert Enum.sort(object.data["oneOf"]) == Enum.sort(options)
-  end
-
-  test "Mastodon Question activity with custom emojis" do
-    options = [
-      %{
-        "type" => "Note",
-        "name" => ":blobcat:",
-        "replies" => %{"totalItems" => 0, "type" => "Collection"}
-      },
-      %{
-        "type" => "Note",
-        "name" => ":blobfox:",
-        "replies" => %{"totalItems" => 0, "type" => "Collection"}
-      }
-    ]
-
-    tag = [
-      %{
-        "icon" => %{
-          "type" => "Image",
-          "url" => "https://blob.cat/emoji/custom/blobcats/blobcat.png"
-        },
-        "id" => "https://blob.cat/emoji/custom/blobcats/blobcat.png",
-        "name" => ":blobcat:",
-        "type" => "Emoji",
-        "updated" => "1970-01-01T00:00:00Z"
-      },
-      %{
-        "icon" => %{"type" => "Image", "url" => "https://blob.cat/emoji/blobfox/blobfox.png"},
-        "id" => "https://blob.cat/emoji/blobfox/blobfox.png",
-        "name" => ":blobfox:",
-        "type" => "Emoji",
-        "updated" => "1970-01-01T00:00:00Z"
-      }
-    ]
-
-    data =
-      File.read!("test/fixtures/mastodon-question-activity.json")
-      |> Poison.decode!()
-      |> Kernel.put_in(["object", "oneOf"], options)
-      |> Kernel.put_in(["object", "tag"], tag)
-
-    {:ok, %Activity{local: false} = activity} = Transmogrifier.handle_incoming(data)
-    object = Object.normalize(activity, false)
-
-    assert object.data["oneOf"] == options
-
-    assert object.data["emoji"] == %{
-             "blobcat" => "https://blob.cat/emoji/custom/blobcats/blobcat.png",
-             "blobfox" => "https://blob.cat/emoji/blobfox/blobfox.png"
-           }
-  end
-
-  test "returns same activity if received a second time" do
-    data = File.read!("test/fixtures/mastodon-question-activity.json") |> Poison.decode!()
-
-    assert {:ok, %Activity{local: false} = activity} = Transmogrifier.handle_incoming(data)
-
-    assert {:ok, ^activity} = Transmogrifier.handle_incoming(data)
-  end
-
-  test "accepts a Question with no content" do
-    data =
-      File.read!("test/fixtures/mastodon-question-activity.json")
-      |> Poison.decode!()
-      |> Kernel.put_in(["object", "content"], "")
-
-    assert {:ok, %Activity{local: false}} = Transmogrifier.handle_incoming(data)
-  end
-end
diff --git a/test/web/activity_pub/transmogrifier/reject_handling_test.exs b/test/web/activity_pub/transmogrifier/reject_handling_test.exs
deleted file mode 100644
index 7592fbe1c..000000000
--- a/test/web/activity_pub/transmogrifier/reject_handling_test.exs
+++ /dev/null
@@ -1,67 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Web.ActivityPub.Transmogrifier.RejectHandlingTest do
-  use Pleroma.DataCase
-
-  alias Pleroma.Activity
-  alias Pleroma.User
-  alias Pleroma.Web.ActivityPub.Transmogrifier
-  alias Pleroma.Web.CommonAPI
-
-  import Pleroma.Factory
-
-  test "it fails for incoming rejects which cannot be correlated" do
-    follower = insert(:user)
-    followed = insert(:user, locked: true)
-
-    accept_data =
-      File.read!("test/fixtures/mastodon-reject-activity.json")
-      |> Poison.decode!()
-      |> Map.put("actor", followed.ap_id)
-
-    accept_data =
-      Map.put(accept_data, "object", Map.put(accept_data["object"], "actor", follower.ap_id))
-
-    {:error, _} = Transmogrifier.handle_incoming(accept_data)
-
-    follower = User.get_cached_by_id(follower.id)
-
-    refute User.following?(follower, followed) == true
-  end
-
-  test "it works for incoming rejects which are referenced by IRI only" do
-    follower = insert(:user)
-    followed = insert(:user, locked: true)
-
-    {:ok, follower} = User.follow(follower, followed)
-    {:ok, _, _, follow_activity} = CommonAPI.follow(follower, followed)
-
-    assert User.following?(follower, followed) == true
-
-    reject_data =
-      File.read!("test/fixtures/mastodon-reject-activity.json")
-      |> Poison.decode!()
-      |> Map.put("actor", followed.ap_id)
-      |> Map.put("object", follow_activity.data["id"])
-
-    {:ok, %Activity{data: _}} = Transmogrifier.handle_incoming(reject_data)
-
-    follower = User.get_cached_by_id(follower.id)
-
-    assert User.following?(follower, followed) == false
-  end
-
-  test "it rejects activities without a valid ID" do
-    user = insert(:user)
-
-    data =
-      File.read!("test/fixtures/mastodon-follow-activity.json")
-      |> Poison.decode!()
-      |> Map.put("object", user.ap_id)
-      |> Map.put("id", "")
-
-    :error = Transmogrifier.handle_incoming(data)
-  end
-end
-- 
cgit v1.2.3