From 0114754db2d9dde25b31729644f898f20121de27 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sat, 17 Jul 2021 20:35:35 -0500
Subject: MastodonAPI: Support poll notification

---
 test/support/factory.ex | 57 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

(limited to 'test/support')

diff --git a/test/support/factory.ex b/test/support/factory.ex
index af4fff45b..e87e54e7b 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -201,6 +201,36 @@ defmodule Pleroma.Factory do
     }
   end
 
+  def question_factory(attrs \\ %{}) do
+    user = attrs[:user] || insert(:user)
+
+    data = %{
+      "id" => Pleroma.Web.ActivityPub.Utils.generate_object_id(),
+      "type" => "Question",
+      "actor" => user.ap_id,
+      "attachment" => [],
+      "to" => ["https://www.w3.org/ns/activitystreams#Public"],
+      "cc" => [user.follower_address],
+      "context" => Pleroma.Web.ActivityPub.Utils.generate_context_id(),
+      "oneOf" => [
+        %{
+          "type" => "Note",
+          "name" => "chocolate",
+          "replies" => %{"totalItems" => 0, "type" => "Collection"}
+        },
+        %{
+          "type" => "Note",
+          "name" => "vanilla",
+          "replies" => %{"totalItems" => 0, "type" => "Collection"}
+        }
+      ]
+    }
+
+    %Pleroma.Object{
+      data: merge_attributes(data, Map.get(attrs, :data, %{}))
+    }
+  end
+
   def direct_note_activity_factory do
     dm = insert(:direct_note)
 
@@ -350,6 +380,33 @@ defmodule Pleroma.Factory do
     }
   end
 
+  def question_activity_factory(attrs \\ %{}) do
+    user = attrs[:user] || insert(:user)
+    question = attrs[:question] || insert(:question, user: user)
+
+    data_attrs = attrs[:data_attrs] || %{}
+    attrs = Map.drop(attrs, [:user, :question, :data_attrs])
+
+    data =
+      %{
+        "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
+        "type" => "Create",
+        "actor" => question.data["actor"],
+        "to" => question.data["to"],
+        "object" => question.data["id"],
+        "published" => DateTime.utc_now() |> DateTime.to_iso8601(),
+        "context" => question.data["context"]
+      }
+      |> Map.merge(data_attrs)
+
+    %Pleroma.Activity{
+      data: data,
+      actor: data["actor"],
+      recipients: data["to"]
+    }
+    |> Map.merge(attrs)
+  end
+
   def oauth_app_factory do
     %Pleroma.Web.OAuth.App{
       client_name: sequence(:client_name, &"Some client #{&1}"),
-- 
cgit v1.2.3


From 0b1c05ca1e387d4a929dce3cac7214fdaf1c2444 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 18 Jul 2021 10:49:57 -0500
Subject: Poll notification: trigger PollWorker through common_pipeline

---
 test/support/factory.ex | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'test/support')

diff --git a/test/support/factory.ex b/test/support/factory.ex
index e87e54e7b..b5232a1c8 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -208,10 +208,12 @@ defmodule Pleroma.Factory do
       "id" => Pleroma.Web.ActivityPub.Utils.generate_object_id(),
       "type" => "Question",
       "actor" => user.ap_id,
+      "attributedTo" => user.ap_id,
       "attachment" => [],
       "to" => ["https://www.w3.org/ns/activitystreams#Public"],
       "cc" => [user.follower_address],
       "context" => Pleroma.Web.ActivityPub.Utils.generate_context_id(),
+      "closed" => DateTime.utc_now() |> DateTime.add(86_400) |> DateTime.to_iso8601(),
       "oneOf" => [
         %{
           "type" => "Note",
-- 
cgit v1.2.3


From dd947d9bc8320ec828df97353733bed4d4e2b5b8 Mon Sep 17 00:00:00 2001
From: Ilja <domainepublic@spectraltheorem.be>
Date: Fri, 25 Sep 2020 23:36:19 +0200
Subject: Add tests for setting `:instance, :quarantined_instances`

No test was done for quarantined instances yet. I added a factory for followers_only notes and checked
* That no followers only post is send when the target server is quarantined
* That a followers only post is send when the target server is not quarantined
---
 test/support/factory.ex | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(limited to 'test/support')

diff --git a/test/support/factory.ex b/test/support/factory.ex
index c267dba4e..f31f64a50 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -142,6 +142,11 @@ defmodule Pleroma.Factory do
     }
   end
 
+  def followers_only_note_factory(attrs \\ %{}) do
+    %Pleroma.Object{data: data} = note_factory(attrs)
+    %Pleroma.Object{data: Map.merge(data, %{"to" => [data["actor"] <> "/followers"]})}
+  end
+
   def audio_factory(attrs \\ %{}) do
     text = sequence(:text, &"lain radio episode #{&1}")
 
@@ -267,6 +272,33 @@ defmodule Pleroma.Factory do
     |> Map.merge(attrs)
   end
 
+  def followers_only_note_activity_factory(attrs \\ %{}) do
+    user = attrs[:user] || insert(:user)
+    note = insert(:followers_only_note, user: user)
+
+    data_attrs = attrs[:data_attrs] || %{}
+    attrs = Map.drop(attrs, [:user, :note, :data_attrs])
+
+    data =
+      %{
+        "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
+        "type" => "Create",
+        "actor" => note.data["actor"],
+        "to" => note.data["to"],
+        "object" => note.data,
+        "published" => DateTime.utc_now() |> DateTime.to_iso8601(),
+        "context" => note.data["context"]
+      }
+      |> Map.merge(data_attrs)
+
+    %Pleroma.Activity{
+      data: data,
+      actor: data["actor"],
+      recipients: data["to"]
+    }
+    |> Map.merge(attrs)
+  end
+
   def note_activity_factory(attrs \\ %{}) do
     user = attrs[:user] || insert(:user)
     note = attrs[:note] || insert(:note, user: user)
-- 
cgit v1.2.3


From a17910a6c6dca88d98218bf9782b05b70b69446f Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Wed, 6 Oct 2021 08:08:21 +0200
Subject: CI: Bump lint stage to elixir-1.12

Elixir 1.12 changed formatting rules, this allows to avoid having to rollback to run `mix format`
---
 test/support/api_spec_helpers.ex  |  4 +---
 test/support/conn_case.ex         |  4 +---
 test/support/http_request_mock.ex | 12 +++---------
 3 files changed, 5 insertions(+), 15 deletions(-)

(limited to 'test/support')

diff --git a/test/support/api_spec_helpers.ex b/test/support/api_spec_helpers.ex
index 36d6a8b81..886e72d73 100644
--- a/test/support/api_spec_helpers.ex
+++ b/test/support/api_spec_helpers.ex
@@ -29,9 +29,7 @@ defmodule Pleroma.Tests.ApiSpecHelpers do
           end)
 
         flunk(
-          "Value does not conform to schema #{schema.title}: #{Enum.join(errors, "\n")}\n#{
-            inspect(value)
-          }"
+          "Value does not conform to schema #{schema.title}: #{Enum.join(errors, "\n")}\n#{inspect(value)}"
         )
     end
   end
diff --git a/test/support/conn_case.ex b/test/support/conn_case.ex
index deee98599..eab469833 100644
--- a/test/support/conn_case.ex
+++ b/test/support/conn_case.ex
@@ -102,9 +102,7 @@ defmodule Pleroma.Web.ConnCase do
               end)
 
             flunk(
-              "Response does not conform to schema of #{op_id} operation: #{
-                Enum.join(errors, "\n")
-              }\n#{inspect(json)}"
+              "Response does not conform to schema of #{op_id} operation: #{Enum.join(errors, "\n")}\n#{inspect(json)}"
             )
         end
       end
diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex
index 8807c2d14..94900dc14 100644
--- a/test/support/http_request_mock.ex
+++ b/test/support/http_request_mock.ex
@@ -1313,9 +1313,7 @@ defmodule HttpRequestMock do
 
   def get(url, query, body, headers) do
     {:error,
-     "Mock response not implemented for GET #{inspect(url)}, #{query}, #{inspect(body)}, #{
-       inspect(headers)
-     }"}
+     "Mock response not implemented for GET #{inspect(url)}, #{query}, #{inspect(body)}, #{inspect(headers)}"}
   end
 
   # POST Requests
@@ -1381,9 +1379,7 @@ defmodule HttpRequestMock do
 
   def post(url, query, body, headers) do
     {:error,
-     "Mock response not implemented for POST #{inspect(url)}, #{query}, #{inspect(body)}, #{
-       inspect(headers)
-     }"}
+     "Mock response not implemented for POST #{inspect(url)}, #{query}, #{inspect(body)}, #{inspect(headers)}"}
   end
 
   # Most of the rich media mocks are missing HEAD requests, so we just return 404.
@@ -1398,8 +1394,6 @@ defmodule HttpRequestMock do
 
   def head(url, query, body, headers) do
     {:error,
-     "Mock response not implemented for HEAD #{inspect(url)}, #{query}, #{inspect(body)}, #{
-       inspect(headers)
-     }"}
+     "Mock response not implemented for HEAD #{inspect(url)}, #{query}, #{inspect(body)}, #{inspect(headers)}"}
   end
 end
-- 
cgit v1.2.3


From eb383ef8d366c1656494278dfe6d2a6afdc04bc6 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Wed, 22 Sep 2021 16:26:22 -0400
Subject: Make move_account endpoint process non-existent users properly

Ref: emit-move
---
 test/support/http_request_mock.ex | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'test/support')

diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex
index 94900dc14..7d5ebd2de 100644
--- a/test/support/http_request_mock.ex
+++ b/test/support/http_request_mock.ex
@@ -725,6 +725,15 @@ defmodule HttpRequestMock do
      }}
   end
 
+  def get(
+        "https://mastodon.social/.well-known/webfinger?resource=acct:not_found@mastodon.social",
+        _,
+        _,
+        [{"accept", "application/xrd+xml,application/jrd+json"}]
+      ) do
+    {:ok, %Tesla.Env{status: 404}}
+  end
+
   def get("http://gs.example.org/.well-known/host-meta", _, _, _) do
     {:ok,
      %Tesla.Env{
-- 
cgit v1.2.3


From 3fd13b70ec7c8e9faca46550fe02b51ccbeaebd0 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Wed, 22 Sep 2021 18:26:55 -0400
Subject: Test that the target account is re-fetched in move_account

Ref: emit-move
---
 test/support/http_request_mock.ex | 51 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

(limited to 'test/support')

diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex
index 7d5ebd2de..dfac773de 100644
--- a/test/support/http_request_mock.ex
+++ b/test/support/http_request_mock.ex
@@ -1133,6 +1133,57 @@ defmodule HttpRequestMock do
      }}
   end
 
+  def get("http://lm.kazv.moe/.well-known/host-meta", _, _, _) do
+    {:ok,
+     %Tesla.Env{
+       status: 200,
+       body: File.read!("test/fixtures/tesla_mock/lm.kazv.moe_host_meta")
+     }}
+  end
+
+  def get("https://lm.kazv.moe/.well-known/host-meta", _, _, _) do
+    {:ok,
+     %Tesla.Env{
+       status: 200,
+       body: File.read!("test/fixtures/tesla_mock/lm.kazv.moe_host_meta")
+     }}
+  end
+
+  def get(
+        "https://lm.kazv.moe/.well-known/webfinger?resource=acct:mewmew@lm.kazv.moe",
+        _,
+        _,
+        [{"accept", "application/xrd+xml,application/jrd+json"}]
+      ) do
+    {:ok,
+     %Tesla.Env{
+       status: 200,
+       body: File.read!("test/fixtures/tesla_mock/https___lm.kazv.moe_users_mewmew.xml"),
+       headers: [{"content-type", "application/xrd+xml"}]
+     }}
+  end
+
+  def get("https://lm.kazv.moe/users/mewmew", _, _, _) do
+    {:ok,
+     %Tesla.Env{
+       status: 200,
+       body: File.read!("test/fixtures/tesla_mock/mewmew@lm.kazv.moe.json"),
+       headers: activitypub_object_headers()
+     }}
+  end
+
+  def get("https://lm.kazv.moe/users/mewmew/collections/featured", _, _, _) do
+    {:ok,
+     %Tesla.Env{
+       status: 200,
+       body:
+         File.read!("test/fixtures/users_mock/masto_featured.json")
+         |> String.replace("{{domain}}", "lm.kazv.moe")
+         |> String.replace("{{nickname}}", "mewmew"),
+       headers: [{"content-type", "application/activity+json"}]
+     }}
+  end
+
   def get("https://info.pleroma.site/activity.json", _, _, [
         {"accept", "application/activity+json"}
       ]) do
-- 
cgit v1.2.3


From 2d779763055ebfe02ffb1ffced5c10dbc0baa63b Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 2 Feb 2022 12:19:35 -0600
Subject: Add tests for mismatched context in replies

---
 test/support/http_request_mock.ex | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'test/support')

diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex
index 94900dc14..b99d70cda 100644
--- a/test/support/http_request_mock.ex
+++ b/test/support/http_request_mock.ex
@@ -1311,6 +1311,36 @@ defmodule HttpRequestMock do
      }}
   end
 
+  def get("https://gleasonator.com/objects/102eb097-a18b-4cd5-abfc-f952efcb70bb", _, _, _) do
+    {:ok,
+     %Tesla.Env{
+       status: 200,
+       body: File.read!("test/fixtures/tesla_mock/gleasonator-AG3RzWfwEKKrY63qj2.json"),
+       headers: activitypub_object_headers()
+     }}
+  end
+
+  def get("https://gleasonator.com/users/macgirvin", _, _, _) do
+    {:ok,
+     %Tesla.Env{
+       status: 200,
+       body: File.read!("test/fixtures/tesla_mock/macgirvin@gleasonator.com.json"),
+       headers: activitypub_object_headers()
+     }}
+  end
+
+  def get("https://gleasonator.com/users/macgirvin/collections/featured", _, _, _) do
+    {:ok,
+     %Tesla.Env{
+       status: 200,
+       body:
+         File.read!("test/fixtures/users_mock/masto_featured.json")
+         |> String.replace("{{domain}}", "gleasonator.com")
+         |> String.replace("{{nickname}}", "macgirvin"),
+       headers: activitypub_object_headers()
+     }}
+  end
+
   def get(url, query, body, headers) do
     {:error,
      "Mock response not implemented for GET #{inspect(url)}, #{query}, #{inspect(body)}, #{inspect(headers)}"}
-- 
cgit v1.2.3


From 17aa3644be13a31ff0e8da0275de049b58780470 Mon Sep 17 00:00:00 2001
From: Sean King <seanking2919@protonmail.com>
Date: Fri, 25 Feb 2022 23:11:42 -0700
Subject: Copyright bump for 2022

---
 test/support/api_spec_helpers.ex          | 2 +-
 test/support/builders/activity_builder.ex | 4 ++++
 test/support/builders/user_builder.ex     | 4 ++++
 test/support/cachex_proxy.ex              | 2 +-
 test/support/captcha/mock.ex              | 2 +-
 test/support/channel_case.ex              | 2 +-
 test/support/cluster.ex                   | 4 ++++
 test/support/conn_case.ex                 | 2 +-
 test/support/data_case.ex                 | 2 +-
 test/support/factory.ex                   | 2 +-
 test/support/helpers.ex                   | 2 +-
 test/support/http_request_mock.ex         | 2 +-
 test/support/mocks.ex                     | 2 +-
 test/support/mrf_module_mock.ex           | 2 +-
 test/support/null_cache.ex                | 2 +-
 test/support/oban_helpers.ex              | 2 +-
 test/support/websocket_client.ex          | 2 +-
 17 files changed, 26 insertions(+), 14 deletions(-)

(limited to 'test/support')

diff --git a/test/support/api_spec_helpers.ex b/test/support/api_spec_helpers.ex
index 886e72d73..df5132357 100644
--- a/test/support/api_spec_helpers.ex
+++ b/test/support/api_spec_helpers.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Tests.ApiSpecHelpers do
diff --git a/test/support/builders/activity_builder.ex b/test/support/builders/activity_builder.ex
index 7c4950bfa..f1ca3951b 100644
--- a/test/support/builders/activity_builder.ex
+++ b/test/support/builders/activity_builder.ex
@@ -1,3 +1,7 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Builders.ActivityBuilder do
   alias Pleroma.Web.ActivityPub.ActivityPub
 
diff --git a/test/support/builders/user_builder.ex b/test/support/builders/user_builder.ex
index 6bccbb35a..d6af30612 100644
--- a/test/support/builders/user_builder.ex
+++ b/test/support/builders/user_builder.ex
@@ -1,3 +1,7 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Builders.UserBuilder do
   alias Pleroma.Repo
   alias Pleroma.User
diff --git a/test/support/cachex_proxy.ex b/test/support/cachex_proxy.ex
index de1f1c766..83ae5610f 100644
--- a/test/support/cachex_proxy.ex
+++ b/test/support/cachex_proxy.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.CachexProxy do
diff --git a/test/support/captcha/mock.ex b/test/support/captcha/mock.ex
index 175ade131..53e000ed6 100644
--- a/test/support/captcha/mock.ex
+++ b/test/support/captcha/mock.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Captcha.Mock do
diff --git a/test/support/channel_case.ex b/test/support/channel_case.ex
index 1fbf6f100..8cb23f5ab 100644
--- a/test/support/channel_case.ex
+++ b/test/support/channel_case.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ChannelCase do
diff --git a/test/support/cluster.ex b/test/support/cluster.ex
index 524194cf4..1c923fb0c 100644
--- a/test/support/cluster.ex
+++ b/test/support/cluster.ex
@@ -1,3 +1,7 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Cluster do
   @moduledoc """
   Facilities for managing a cluster of slave VM's for federated testing.
diff --git a/test/support/conn_case.ex b/test/support/conn_case.ex
index eab469833..f010fec33 100644
--- a/test/support/conn_case.ex
+++ b/test/support/conn_case.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ConnCase do
diff --git a/test/support/data_case.ex b/test/support/data_case.ex
index 0ee2aa4a2..3c9cab061 100644
--- a/test/support/data_case.ex
+++ b/test/support/data_case.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.DataCase do
diff --git a/test/support/factory.ex b/test/support/factory.ex
index 4a78425ce..09456debf 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Factory do
diff --git a/test/support/helpers.ex b/test/support/helpers.ex
index 34f1505d0..0bd487f39 100644
--- a/test/support/helpers.ex
+++ b/test/support/helpers.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Tests.Helpers do
diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex
index b99d70cda..ad4925a5c 100644
--- a/test/support/http_request_mock.ex
+++ b/test/support/http_request_mock.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule HttpRequestMock do
diff --git a/test/support/mocks.ex b/test/support/mocks.ex
index fd8f825b3..d167996bd 100644
--- a/test/support/mocks.ex
+++ b/test/support/mocks.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 Mox.defmock(Pleroma.CachexMock, for: Pleroma.Caching)
diff --git a/test/support/mrf_module_mock.ex b/test/support/mrf_module_mock.ex
index 4d21d7fe0..616fc720e 100644
--- a/test/support/mrf_module_mock.ex
+++ b/test/support/mrf_module_mock.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule MRFModuleMock do
diff --git a/test/support/null_cache.ex b/test/support/null_cache.ex
index 47c10ebb6..9f1d45f1d 100644
--- a/test/support/null_cache.ex
+++ b/test/support/null_cache.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.NullCache do
diff --git a/test/support/oban_helpers.ex b/test/support/oban_helpers.ex
index 9b6e5256e..94170a0f8 100644
--- a/test/support/oban_helpers.ex
+++ b/test/support/oban_helpers.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Tests.ObanHelpers do
diff --git a/test/support/websocket_client.ex b/test/support/websocket_client.ex
index 34b955474..d149b324e 100644
--- a/test/support/websocket_client.ex
+++ b/test/support/websocket_client.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Integration.WebsocketClient do
-- 
cgit v1.2.3


From d7af67012f64d09bb50259188473c1c94418b3a2 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Tue, 8 Mar 2022 00:06:07 -0500
Subject: Implement first pass of announcement admin api

CCBUG: https://git.pleroma.social/pleroma/pleroma/-/issues/2836
CCBUG: https://git.pleroma.social/pleroma/pleroma/-/issues/1470
---
 test/support/factory.ex | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'test/support')

diff --git a/test/support/factory.ex b/test/support/factory.ex
index 09456debf..85ea49cb2 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -627,4 +627,12 @@ defmodule Pleroma.Factory do
       context: ["home"]
     }
   end
+
+  def announcement_factory do
+    %Pleroma.Announcement{
+      data: %{
+        "content" => "test announcement"
+      }
+    }
+  end
 end
-- 
cgit v1.2.3


From fcf3c9057ec1c49a0c9a400985c1dde4a5d7e9db Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Tue, 8 Mar 2022 18:21:20 -0500
Subject: Implement visibility filtering for announcements

---
 test/support/factory.ex | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'test/support')

diff --git a/test/support/factory.ex b/test/support/factory.ex
index 85ea49cb2..620102bbb 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -628,11 +628,10 @@ defmodule Pleroma.Factory do
     }
   end
 
-  def announcement_factory do
+  def announcement_factory(params \\ %{}, data \\ %{}) do
     %Pleroma.Announcement{
-      data: %{
-        "content" => "test announcement"
-      }
+      data: Map.merge(%{"content" => "test announcement"}, data)
     }
+    |> Map.merge(params)
   end
 end
-- 
cgit v1.2.3


From cf8334dbc153eed7d65febb4ae4fd3c03bb106b2 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Tue, 8 Mar 2022 19:12:01 -0500
Subject: Add starts_at, ends_at and all_day parameters

---
 test/support/factory.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/support')

diff --git a/test/support/factory.ex b/test/support/factory.ex
index 620102bbb..64b0049ac 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -630,7 +630,7 @@ defmodule Pleroma.Factory do
 
   def announcement_factory(params \\ %{}, data \\ %{}) do
     %Pleroma.Announcement{
-      data: Map.merge(%{"content" => "test announcement"}, data)
+      data: Map.merge(%{"content" => "test announcement", "all_day" => false}, data)
     }
     |> Map.merge(params)
   end
-- 
cgit v1.2.3


From 11a1996bf5f283099fd9ecbb5c64e051ec46a5df Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Tue, 8 Mar 2022 20:55:41 -0500
Subject: Implement update announcement admin api

---
 test/support/factory.ex | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'test/support')

diff --git a/test/support/factory.ex b/test/support/factory.ex
index 64b0049ac..d28a56345 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -628,7 +628,11 @@ defmodule Pleroma.Factory do
     }
   end
 
-  def announcement_factory(params \\ %{}, data \\ %{}) do
+  def announcement_factory(params \\ %{}) do
+    data = Map.get(params, :data, %{})
+
+    {_, params} = Map.pop(params, :data)
+
     %Pleroma.Announcement{
       data: Map.merge(%{"content" => "test announcement", "all_day" => false}, data)
     }
-- 
cgit v1.2.3


From ebcda5265b9c82be26eae65b5ab39629a525c3fa Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Tue, 8 Mar 2022 23:00:51 -0500
Subject: Format announcements into html

---
 test/support/factory.ex | 1 +
 1 file changed, 1 insertion(+)

(limited to 'test/support')

diff --git a/test/support/factory.ex b/test/support/factory.ex
index d28a56345..efbf3df2e 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -637,5 +637,6 @@ defmodule Pleroma.Factory do
       data: Map.merge(%{"content" => "test announcement", "all_day" => false}, data)
     }
     |> Map.merge(params)
+    |> Pleroma.Announcement.add_rendered_properties()
   end
 end
-- 
cgit v1.2.3


From d0c1997d483f918b46bdf45cecef82d8aabcb5f1 Mon Sep 17 00:00:00 2001
From: Sean King <seanking2919@protonmail.com>
Date: Sat, 19 Mar 2022 23:33:37 -0600
Subject: Rewrite integration-test websocket client with Mint.WebSocket

---
 test/support/websocket_client.ex | 193 +++++++++++++++++++++++++++++++++------
 1 file changed, 166 insertions(+), 27 deletions(-)

(limited to 'test/support')

diff --git a/test/support/websocket_client.ex b/test/support/websocket_client.ex
index d149b324e..afcd0e8c7 100644
--- a/test/support/websocket_client.ex
+++ b/test/support/websocket_client.ex
@@ -3,60 +3,199 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Integration.WebsocketClient do
-  # https://github.com/phoenixframework/phoenix/blob/master/test/support/websocket_client.exs
+  @moduledoc """
+  A WebSocket client used to test Mastodon API streaming
 
-  @doc """
-  Starts the WebSocket server for given ws URL. Received Socket.Message's
-  are forwarded to the sender pid
+  Based on Phoenix Framework's WebsocketClient
+  https://github.com/phoenixframework/phoenix/blob/master/test/support/websocket_client.exs
   """
-  def start_link(sender, url, headers \\ []) do
-    :crypto.start()
-    :ssl.start()
 
-    :websocket_client.start_link(
-      String.to_charlist(url),
-      __MODULE__,
-      [sender],
-      extra_headers: headers
-    )
+  use GenServer
+  import Kernel, except: [send: 2]
+
+  defstruct [
+    :conn,
+    :request_ref,
+    :websocket,
+    :caller,
+    :status,
+    :resp_headers,
+    :sender,
+    closing?: false
+  ]
+
+  @doc """
+  Starts the WebSocket client for given ws URL. `Phoenix.Socket.Message`s
+  received from the server are forwarded to the sender pid.
+  """
+  def connect(sender, url, headers \\ []) do
+    with {:ok, socket} <- GenServer.start_link(__MODULE__, {sender}),
+         {:ok, :connected} <- GenServer.call(socket, {:connect, url, headers}) do
+      {:ok, socket}
+    end
   end
 
   @doc """
   Closes the socket
   """
   def close(socket) do
-    send(socket, :close)
+    GenServer.cast(socket, :close)
   end
 
   @doc """
   Sends a low-level text message to the client.
   """
   def send_text(server_pid, msg) do
-    send(server_pid, {:text, msg})
+    GenServer.call(server_pid, {:text, msg})
   end
 
   @doc false
-  def init([sender], _conn_state) do
-    {:ok, %{sender: sender}}
+  def init({sender}) do
+    state = %__MODULE__{sender: sender}
+
+    {:ok, state}
   end
 
   @doc false
-  def websocket_handle(frame, _conn_state, state) do
-    send(state.sender, frame)
-    {:ok, state}
+  def handle_call({:connect, url, headers}, from, state) do
+    uri = URI.parse(url)
+
+    http_scheme =
+      case uri.scheme do
+        "ws" -> :http
+        "wss" -> :https
+      end
+
+    ws_scheme =
+      case uri.scheme do
+        "ws" -> :ws
+        "wss" -> :wss
+      end
+
+    path =
+      case uri.query do
+        nil -> uri.path
+        query -> uri.path <> "?" <> query
+      end
+
+    with {:ok, conn} <- Mint.HTTP.connect(http_scheme, uri.host, uri.port),
+         {:ok, conn, ref} <- Mint.WebSocket.upgrade(ws_scheme, conn, path, headers) do
+      state = %{state | conn: conn, request_ref: ref, caller: from}
+      {:noreply, state}
+    else
+      {:error, reason} ->
+        {:reply, {:error, reason}, state}
+
+      {:error, conn, reason} ->
+        {:reply, {:error, reason}, put_in(state.conn, conn)}
+    end
   end
 
   @doc false
-  def websocket_info({:text, msg}, _conn_state, state) do
-    {:reply, {:text, msg}, state}
+  def handle_info(message, state) do
+    case Mint.WebSocket.stream(state.conn, message) do
+      {:ok, conn, responses} ->
+        state = put_in(state.conn, conn) |> handle_responses(responses)
+        if state.closing?, do: do_close(state), else: {:noreply, state}
+
+      {:error, conn, reason, _responses} ->
+        state = put_in(state.conn, conn) |> reply({:error, reason})
+        {:noreply, state}
+
+      :unknown ->
+        {:noreply, state}
+    end
   end
 
-  def websocket_info(:close, _conn_state, _state) do
-    {:close, <<>>, "done"}
+  defp do_close(state) do
+    # Streaming a close frame may fail if the server has already closed
+    # for writing.
+    _ = stream_frame(state, :close)
+    Mint.HTTP.close(state.conn)
+    {:stop, :normal, state}
   end
 
-  @doc false
-  def websocket_terminate(_reason, _conn_state, _state) do
-    :ok
+  defp handle_responses(state, responses)
+
+  defp handle_responses(%{request_ref: ref} = state, [{:status, ref, status} | rest]) do
+    put_in(state.status, status)
+    |> handle_responses(rest)
+  end
+
+  defp handle_responses(%{request_ref: ref} = state, [{:headers, ref, resp_headers} | rest]) do
+    put_in(state.resp_headers, resp_headers)
+    |> handle_responses(rest)
+  end
+
+  defp handle_responses(%{request_ref: ref} = state, [{:done, ref} | rest]) do
+    case Mint.WebSocket.new(state.conn, ref, state.status, state.resp_headers) do
+      {:ok, conn, websocket} ->
+        %{state | conn: conn, websocket: websocket, status: nil, resp_headers: nil}
+        |> reply({:ok, :connected})
+        |> handle_responses(rest)
+
+      {:error, conn, reason} ->
+        put_in(state.conn, conn)
+        |> reply({:error, reason})
+    end
+  end
+
+  defp handle_responses(%{request_ref: ref, websocket: websocket} = state, [
+         {:data, ref, data} | rest
+       ])
+       when websocket != nil do
+    case Mint.WebSocket.decode(websocket, data) do
+      {:ok, websocket, frames} ->
+        put_in(state.websocket, websocket)
+        |> handle_frames(frames)
+        |> handle_responses(rest)
+
+      {:error, websocket, reason} ->
+        put_in(state.websocket, websocket)
+        |> reply({:error, reason})
+    end
+  end
+
+  defp handle_responses(state, [_response | rest]) do
+    handle_responses(state, rest)
+  end
+
+  defp handle_responses(state, []), do: state
+
+  defp handle_frames(state, frames) do
+    {frames, state} =
+      Enum.flat_map_reduce(frames, state, fn
+        # prepare to close the connection when a close frame is received
+        {:close, _code, _data}, state ->
+          {[], put_in(state.closing?, true)}
+
+        frame, state ->
+          {[frame], state}
+      end)
+
+    Enum.each(frames, &Kernel.send(state.sender, &1))
+
+    state
+  end
+
+  defp reply(state, response) do
+    if state.caller, do: GenServer.reply(state.caller, response)
+    put_in(state.caller, nil)
+  end
+
+  # Encodes a frame as a binary and sends it along the wire, keeping `conn`
+  # and `websocket` up to date in `state`.
+  defp stream_frame(state, frame) do
+    with {:ok, websocket, data} <- Mint.WebSocket.encode(state.websocket, frame),
+         state = put_in(state.websocket, websocket),
+        {:ok, conn} <- Mint.WebSocket.stream_request_body(state.conn, state.request_ref, data) do
+          {:ok, put_in(state.conn, conn)}
+    else
+      {:error, %Mint.WebSocket{} = websocket, reason} ->
+        {:error, put_in(state.websocket, websocket), reason}
+
+      {:error, conn, reason} ->
+        {:error, put_in(state.conn, conn), reason}
+    end
   end
 end
-- 
cgit v1.2.3


From 4194559ea6d3e0f219ae8e77b468782ac115d134 Mon Sep 17 00:00:00 2001
From: Sean King <seanking2919@protonmail.com>
Date: Sun, 20 Mar 2022 17:26:07 -0600
Subject: Fix lint errors

---
 test/support/websocket_client.ex | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'test/support')

diff --git a/test/support/websocket_client.ex b/test/support/websocket_client.ex
index afcd0e8c7..43f2854de 100644
--- a/test/support/websocket_client.ex
+++ b/test/support/websocket_client.ex
@@ -188,8 +188,8 @@ defmodule Pleroma.Integration.WebsocketClient do
   defp stream_frame(state, frame) do
     with {:ok, websocket, data} <- Mint.WebSocket.encode(state.websocket, frame),
          state = put_in(state.websocket, websocket),
-        {:ok, conn} <- Mint.WebSocket.stream_request_body(state.conn, state.request_ref, data) do
-          {:ok, put_in(state.conn, conn)}
+         {:ok, conn} <- Mint.WebSocket.stream_request_body(state.conn, state.request_ref, data) do
+      {:ok, put_in(state.conn, conn)}
     else
       {:error, %Mint.WebSocket{} = websocket, reason} ->
         {:error, put_in(state.websocket, websocket), reason}
-- 
cgit v1.2.3


From aafd7a687dea7595ee9431451d8e170fc3ff909e Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Wed, 8 Jun 2022 11:45:24 -0400
Subject: Return the corresponding object id in attachment view

---
 test/support/factory.ex | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'test/support')

diff --git a/test/support/factory.ex b/test/support/factory.ex
index 09456debf..aaadae9bd 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -111,6 +111,18 @@ defmodule Pleroma.Factory do
     }
   end
 
+  def attachment_factory(attrs \\ %{}) do
+    user = attrs[:user] || insert(:user)
+
+    data =
+      attachment_data(user.ap_id, nil)
+      |> Map.put("id", Pleroma.Web.ActivityPub.Utils.generate_object_id())
+
+    %Pleroma.Object{
+      data: merge_attributes(data, Map.get(attrs, :data, %{}))
+    }
+  end
+
   def attachment_note_factory(attrs \\ %{}) do
     user = attrs[:user] || insert(:user)
     {length, attrs} = Map.pop(attrs, :length, 1)
-- 
cgit v1.2.3


From 3b6784b1de8454ab8c009ac688f6c62039117742 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9l=C3=A8ne?= <pleroma-dev@helene.moe>
Date: Tue, 2 Aug 2022 17:30:36 +0200
Subject: CreateGenericValidator: fix reply context fixing

Incoming Pleroma replies to a Misskey thread were rejected due to a
broken context fix, which caused them to not be visible until a
non-Pleroma user interacted with the replies.

This fix properly sets the post-fix object context to its parent Create
activity as well, if it was changed.
---
 test/support/http_request_mock.ex | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'test/support')

diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex
index eb844e469..c1f0f7af1 100644
--- a/test/support/http_request_mock.ex
+++ b/test/support/http_request_mock.ex
@@ -1401,6 +1401,42 @@ defmodule HttpRequestMock do
      }}
   end
 
+  def get("https://mk.absturztau.be/users/8ozbzjs3o8", _, _, _) do
+    {:ok,
+     %Tesla.Env{
+       status: 200,
+       body: File.read!("test/fixtures/tesla_mock/mametsuko@mk.absturztau.be.json"),
+       headers: activitypub_object_headers()
+     }}
+  end
+
+  def get("https://p.helene.moe/users/helene", _, _, _) do
+    {:ok,
+     %Tesla.Env{
+       status: 200,
+       body: File.read!("test/fixtures/tesla_mock/helene@p.helene.moe.json"),
+       headers: activitypub_object_headers()
+     }}
+  end
+
+  def get("https://mk.absturztau.be/notes/93e7nm8wqg", _, _, _) do
+    {:ok,
+     %Tesla.Env{
+       status: 200,
+       body: File.read!("test/fixtures/tesla_mock/mk.absturztau.be-93e7nm8wqg.json"),
+       headers: activitypub_object_headers()
+     }}
+  end
+
+  def get("https://p.helene.moe/objects/fd5910ac-d9dc-412e-8d1d-914b203296c4", _, _, _) do
+    {:ok,
+     %Tesla.Env{
+       status: 200,
+       body: File.read!("test/fixtures/tesla_mock/p.helene.moe-AM7S6vZQmL6pI9TgPY.json"),
+       headers: activitypub_object_headers()
+     }}
+  end
+
   def get(url, query, body, headers) do
     {:error,
      "Mock response not implemented for GET #{inspect(url)}, #{query}, #{inspect(body)}, #{inspect(headers)}"}
-- 
cgit v1.2.3


From bb02ee99f58e378e33162211f41fe5979d5da8ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9l=C3=A8ne?= <pleroma-dev@helene.moe>
Date: Wed, 10 Aug 2022 04:21:28 +0200
Subject: CommonFixes: more predictable context generation

`context` fields for objects and activities can now be generated based
on the object/activity `inReplyTo` field or its ActivityPub ID, as a
fallback method in cases where `context` fields are missing for incoming
activities and objects.
---
 test/support/http_request_mock.ex | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'test/support')

diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex
index c1f0f7af1..7f6065579 100644
--- a/test/support/http_request_mock.ex
+++ b/test/support/http_request_mock.ex
@@ -1084,6 +1084,14 @@ defmodule HttpRequestMock do
      }}
   end
 
+  def get("https://404.site" <> _, _, _, _) do
+    {:ok,
+     %Tesla.Env{
+       status: 404,
+       body: ""
+     }}
+  end
+
   def get(
         "https://zetsubou.xn--q9jyb4c/.well-known/webfinger?resource=acct:lain@zetsubou.xn--q9jyb4c",
         _,
@@ -1428,6 +1436,15 @@ defmodule HttpRequestMock do
      }}
   end
 
+  def get("https://mk.absturztau.be/notes/93e7nm8wqg/activity", _, _, _) do
+    {:ok,
+     %Tesla.Env{
+       status: 200,
+       body: File.read!("test/fixtures/tesla_mock/mk.absturztau.be-93e7nm8wqg-activity.json"),
+       headers: activitypub_object_headers()
+     }}
+  end
+
   def get("https://p.helene.moe/objects/fd5910ac-d9dc-412e-8d1d-914b203296c4", _, _, _) do
     {:ok,
      %Tesla.Env{
-- 
cgit v1.2.3


From b439e91f57d1d7f26e94acc62703a64c747773da Mon Sep 17 00:00:00 2001
From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Fri, 2 Sep 2022 22:35:40 +0000
Subject: Revert "Merge branch 'rewrite/integration-test-websocket-client' into
 'develop'"

This reverts merge request !3649
---
 test/support/websocket_client.ex | 193 ++++++---------------------------------
 1 file changed, 27 insertions(+), 166 deletions(-)

(limited to 'test/support')

diff --git a/test/support/websocket_client.ex b/test/support/websocket_client.ex
index 43f2854de..d149b324e 100644
--- a/test/support/websocket_client.ex
+++ b/test/support/websocket_client.ex
@@ -3,199 +3,60 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Integration.WebsocketClient do
-  @moduledoc """
-  A WebSocket client used to test Mastodon API streaming
-
-  Based on Phoenix Framework's WebsocketClient
-  https://github.com/phoenixframework/phoenix/blob/master/test/support/websocket_client.exs
-  """
-
-  use GenServer
-  import Kernel, except: [send: 2]
-
-  defstruct [
-    :conn,
-    :request_ref,
-    :websocket,
-    :caller,
-    :status,
-    :resp_headers,
-    :sender,
-    closing?: false
-  ]
+  # https://github.com/phoenixframework/phoenix/blob/master/test/support/websocket_client.exs
 
   @doc """
-  Starts the WebSocket client for given ws URL. `Phoenix.Socket.Message`s
-  received from the server are forwarded to the sender pid.
+  Starts the WebSocket server for given ws URL. Received Socket.Message's
+  are forwarded to the sender pid
   """
-  def connect(sender, url, headers \\ []) do
-    with {:ok, socket} <- GenServer.start_link(__MODULE__, {sender}),
-         {:ok, :connected} <- GenServer.call(socket, {:connect, url, headers}) do
-      {:ok, socket}
-    end
+  def start_link(sender, url, headers \\ []) do
+    :crypto.start()
+    :ssl.start()
+
+    :websocket_client.start_link(
+      String.to_charlist(url),
+      __MODULE__,
+      [sender],
+      extra_headers: headers
+    )
   end
 
   @doc """
   Closes the socket
   """
   def close(socket) do
-    GenServer.cast(socket, :close)
+    send(socket, :close)
   end
 
   @doc """
   Sends a low-level text message to the client.
   """
   def send_text(server_pid, msg) do
-    GenServer.call(server_pid, {:text, msg})
+    send(server_pid, {:text, msg})
   end
 
   @doc false
-  def init({sender}) do
-    state = %__MODULE__{sender: sender}
-
-    {:ok, state}
+  def init([sender], _conn_state) do
+    {:ok, %{sender: sender}}
   end
 
   @doc false
-  def handle_call({:connect, url, headers}, from, state) do
-    uri = URI.parse(url)
-
-    http_scheme =
-      case uri.scheme do
-        "ws" -> :http
-        "wss" -> :https
-      end
-
-    ws_scheme =
-      case uri.scheme do
-        "ws" -> :ws
-        "wss" -> :wss
-      end
-
-    path =
-      case uri.query do
-        nil -> uri.path
-        query -> uri.path <> "?" <> query
-      end
-
-    with {:ok, conn} <- Mint.HTTP.connect(http_scheme, uri.host, uri.port),
-         {:ok, conn, ref} <- Mint.WebSocket.upgrade(ws_scheme, conn, path, headers) do
-      state = %{state | conn: conn, request_ref: ref, caller: from}
-      {:noreply, state}
-    else
-      {:error, reason} ->
-        {:reply, {:error, reason}, state}
-
-      {:error, conn, reason} ->
-        {:reply, {:error, reason}, put_in(state.conn, conn)}
-    end
+  def websocket_handle(frame, _conn_state, state) do
+    send(state.sender, frame)
+    {:ok, state}
   end
 
   @doc false
-  def handle_info(message, state) do
-    case Mint.WebSocket.stream(state.conn, message) do
-      {:ok, conn, responses} ->
-        state = put_in(state.conn, conn) |> handle_responses(responses)
-        if state.closing?, do: do_close(state), else: {:noreply, state}
-
-      {:error, conn, reason, _responses} ->
-        state = put_in(state.conn, conn) |> reply({:error, reason})
-        {:noreply, state}
-
-      :unknown ->
-        {:noreply, state}
-    end
-  end
-
-  defp do_close(state) do
-    # Streaming a close frame may fail if the server has already closed
-    # for writing.
-    _ = stream_frame(state, :close)
-    Mint.HTTP.close(state.conn)
-    {:stop, :normal, state}
-  end
-
-  defp handle_responses(state, responses)
-
-  defp handle_responses(%{request_ref: ref} = state, [{:status, ref, status} | rest]) do
-    put_in(state.status, status)
-    |> handle_responses(rest)
-  end
-
-  defp handle_responses(%{request_ref: ref} = state, [{:headers, ref, resp_headers} | rest]) do
-    put_in(state.resp_headers, resp_headers)
-    |> handle_responses(rest)
-  end
-
-  defp handle_responses(%{request_ref: ref} = state, [{:done, ref} | rest]) do
-    case Mint.WebSocket.new(state.conn, ref, state.status, state.resp_headers) do
-      {:ok, conn, websocket} ->
-        %{state | conn: conn, websocket: websocket, status: nil, resp_headers: nil}
-        |> reply({:ok, :connected})
-        |> handle_responses(rest)
-
-      {:error, conn, reason} ->
-        put_in(state.conn, conn)
-        |> reply({:error, reason})
-    end
+  def websocket_info({:text, msg}, _conn_state, state) do
+    {:reply, {:text, msg}, state}
   end
 
-  defp handle_responses(%{request_ref: ref, websocket: websocket} = state, [
-         {:data, ref, data} | rest
-       ])
-       when websocket != nil do
-    case Mint.WebSocket.decode(websocket, data) do
-      {:ok, websocket, frames} ->
-        put_in(state.websocket, websocket)
-        |> handle_frames(frames)
-        |> handle_responses(rest)
-
-      {:error, websocket, reason} ->
-        put_in(state.websocket, websocket)
-        |> reply({:error, reason})
-    end
+  def websocket_info(:close, _conn_state, _state) do
+    {:close, <<>>, "done"}
   end
 
-  defp handle_responses(state, [_response | rest]) do
-    handle_responses(state, rest)
-  end
-
-  defp handle_responses(state, []), do: state
-
-  defp handle_frames(state, frames) do
-    {frames, state} =
-      Enum.flat_map_reduce(frames, state, fn
-        # prepare to close the connection when a close frame is received
-        {:close, _code, _data}, state ->
-          {[], put_in(state.closing?, true)}
-
-        frame, state ->
-          {[frame], state}
-      end)
-
-    Enum.each(frames, &Kernel.send(state.sender, &1))
-
-    state
-  end
-
-  defp reply(state, response) do
-    if state.caller, do: GenServer.reply(state.caller, response)
-    put_in(state.caller, nil)
-  end
-
-  # Encodes a frame as a binary and sends it along the wire, keeping `conn`
-  # and `websocket` up to date in `state`.
-  defp stream_frame(state, frame) do
-    with {:ok, websocket, data} <- Mint.WebSocket.encode(state.websocket, frame),
-         state = put_in(state.websocket, websocket),
-         {:ok, conn} <- Mint.WebSocket.stream_request_body(state.conn, state.request_ref, data) do
-      {:ok, put_in(state.conn, conn)}
-    else
-      {:error, %Mint.WebSocket{} = websocket, reason} ->
-        {:error, put_in(state.websocket, websocket), reason}
-
-      {:error, conn, reason} ->
-        {:error, put_in(state.conn, conn), reason}
-    end
+  @doc false
+  def websocket_terminate(_reason, _conn_state, _state) do
+    :ok
   end
 end
-- 
cgit v1.2.3


From 6d148b6637af5eb96435cd802886d71b461b760e Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Fri, 19 Aug 2022 13:56:39 -0400
Subject: Use Websockex to replace websocket_client

---
 test/support/websocket_client.ex | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

(limited to 'test/support')

diff --git a/test/support/websocket_client.ex b/test/support/websocket_client.ex
index d149b324e..cf2972c38 100644
--- a/test/support/websocket_client.ex
+++ b/test/support/websocket_client.ex
@@ -5,18 +5,17 @@
 defmodule Pleroma.Integration.WebsocketClient do
   # https://github.com/phoenixframework/phoenix/blob/master/test/support/websocket_client.exs
 
+  use WebSockex
+
   @doc """
   Starts the WebSocket server for given ws URL. Received Socket.Message's
   are forwarded to the sender pid
   """
   def start_link(sender, url, headers \\ []) do
-    :crypto.start()
-    :ssl.start()
-
-    :websocket_client.start_link(
-      String.to_charlist(url),
+    WebSockex.start_link(
+      url,
       __MODULE__,
-      [sender],
+      %{sender: sender},
       extra_headers: headers
     )
   end
@@ -36,27 +35,26 @@ defmodule Pleroma.Integration.WebsocketClient do
   end
 
   @doc false
-  def init([sender], _conn_state) do
-    {:ok, %{sender: sender}}
-  end
-
-  @doc false
-  def websocket_handle(frame, _conn_state, state) do
+  @impl true
+  def handle_frame(frame, state) do
     send(state.sender, frame)
     {:ok, state}
   end
 
   @doc false
-  def websocket_info({:text, msg}, _conn_state, state) do
+  @impl true
+  def handle_info({:text, msg}, state) do
     {:reply, {:text, msg}, state}
   end
 
-  def websocket_info(:close, _conn_state, _state) do
+  @impl true
+  def handle_info(:close, _state) do
     {:close, <<>>, "done"}
   end
 
   @doc false
-  def websocket_terminate(_reason, _conn_state, _state) do
+  @impl true
+  def terminate(_reason, _state) do
     :ok
   end
 end
-- 
cgit v1.2.3


From cd237d22f165edb84202154e4c6f6725f63df635 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9l=C3=A8ne?= <pleroma-dev@helene.moe>
Date: Fri, 26 Aug 2022 18:30:43 +0200
Subject: User: generate private keys on user creation

This fixes a race condition bug where keys could be regenerated
post-federation, causing activities and HTTP signatures from an user to
be dropped due to key differences.
---
 test/support/factory.ex | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'test/support')

diff --git a/test/support/factory.ex b/test/support/factory.ex
index efbf3df2e..dc8a3d3d8 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -7,6 +7,7 @@ defmodule Pleroma.Factory do
 
   require Pleroma.Constants
 
+  alias Pleroma.Keys
   alias Pleroma.Object
   alias Pleroma.User
 
@@ -28,6 +29,8 @@ defmodule Pleroma.Factory do
   end
 
   def user_factory(attrs \\ %{}) do
+    {:ok, pem} = Keys.generate_rsa_pem()
+
     user = %User{
       name: sequence(:name, &"Test テスト User #{&1}"),
       email: sequence(:email, &"user#{&1}@example.com"),
@@ -39,7 +42,8 @@ defmodule Pleroma.Factory do
       last_refreshed_at: NaiveDateTime.utc_now(),
       notification_settings: %Pleroma.User.NotificationSetting{},
       multi_factor_authentication_settings: %Pleroma.MFA.Settings{},
-      ap_enabled: true
+      ap_enabled: true,
+      keys: pem
     }
 
     urls =
-- 
cgit v1.2.3


From 6bdf451ce88646b18115c03361415a986d845c67 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Sun, 11 Sep 2022 20:14:58 +0100
Subject: Use set of pregenerated RSA keys

Randomness is a huge resource sink, so let's just use
a some that we made earlier
---
 test/support/factory.ex | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'test/support')

diff --git a/test/support/factory.ex b/test/support/factory.ex
index c54d65b62..09f02458c 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -7,10 +7,18 @@ defmodule Pleroma.Factory do
 
   require Pleroma.Constants
 
-  alias Pleroma.Keys
   alias Pleroma.Object
   alias Pleroma.User
 
+  @rsa_keys [
+              "test/fixtures/rsa_keys/key_1.pem",
+              "test/fixtures/rsa_keys/key_2.pem",
+              "test/fixtures/rsa_keys/key_3.pem",
+              "test/fixtures/rsa_keys/key_4.pem",
+              "test/fixtures/rsa_keys/key_5.pem"
+            ]
+            |> Enum.map(&File.read!/1)
+
   def participation_factory do
     conversation = insert(:conversation)
     user = insert(:user)
@@ -29,7 +37,7 @@ defmodule Pleroma.Factory do
   end
 
   def user_factory(attrs \\ %{}) do
-    {:ok, pem} = Keys.generate_rsa_pem()
+    pem = Enum.random(@rsa_keys)
 
     user = %User{
       name: sequence(:name, &"Test テスト User #{&1}"),
-- 
cgit v1.2.3


From 4121bca8957838f094ef134de4b54e492517e527 Mon Sep 17 00:00:00 2001
From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Thu, 4 Mar 2021 13:06:12 +0300
Subject: expanding WebFinger

---
 test/support/http_request_mock.ex | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'test/support')

diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex
index 7f6065579..b0cf613ac 100644
--- a/test/support/http_request_mock.ex
+++ b/test/support/http_request_mock.ex
@@ -424,14 +424,6 @@ defmodule HttpRequestMock do
     {:error, :nxdomain}
   end
 
-  def get("http://osada.macgirvin.com/.well-known/host-meta", _, _, _) do
-    {:ok,
-     %Tesla.Env{
-       status: 404,
-       body: ""
-     }}
-  end
-
   def get("https://osada.macgirvin.com/.well-known/host-meta", _, _, _) do
     {:ok,
      %Tesla.Env{
@@ -765,7 +757,7 @@ defmodule HttpRequestMock do
     {:ok, %Tesla.Env{status: 406, body: ""}}
   end
 
-  def get("http://squeet.me/.well-known/host-meta", _, _, _) do
+  def get("https://squeet.me/.well-known/host-meta", _, _, _) do
     {:ok,
      %Tesla.Env{status: 200, body: File.read!("test/fixtures/tesla_mock/squeet.me_host_meta")}}
   end
@@ -806,7 +798,7 @@ defmodule HttpRequestMock do
     {:ok, %Tesla.Env{status: 200, body: "", headers: [{"content-type", "application/jrd+json"}]}}
   end
 
-  def get("http://framatube.org/.well-known/host-meta", _, _, _) do
+  def get("https://framatube.org/.well-known/host-meta", _, _, _) do
     {:ok,
      %Tesla.Env{
        status: 200,
@@ -815,7 +807,7 @@ defmodule HttpRequestMock do
   end
 
   def get(
-        "http://framatube.org/main/xrd?uri=acct:framasoft@framatube.org",
+        "https://framatube.org/main/xrd?uri=acct:framasoft@framatube.org",
         _,
         _,
         [{"accept", "application/xrd+xml,application/jrd+json"}]
@@ -850,7 +842,7 @@ defmodule HttpRequestMock do
      }}
   end
 
-  def get("http://status.alpicola.com/.well-known/host-meta", _, _, _) do
+  def get("https://status.alpicola.com/.well-known/host-meta", _, _, _) do
     {:ok,
      %Tesla.Env{
        status: 200,
@@ -858,7 +850,7 @@ defmodule HttpRequestMock do
      }}
   end
 
-  def get("http://macgirvin.com/.well-known/host-meta", _, _, _) do
+  def get("https://macgirvin.com/.well-known/host-meta", _, _, _) do
     {:ok,
      %Tesla.Env{
        status: 200,
@@ -866,7 +858,7 @@ defmodule HttpRequestMock do
      }}
   end
 
-  def get("http://gerzilla.de/.well-known/host-meta", _, _, _) do
+  def get("https://gerzilla.de/.well-known/host-meta", _, _, _) do
     {:ok,
      %Tesla.Env{
        status: 200,
-- 
cgit v1.2.3