From 9be66682369f1aa3c221d411073c20e10b5a3ac1 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Fri, 24 Jul 2020 12:05:42 -0500
Subject: Fix mix tasks that make HTTP calls by starting the Gun connection
 pool

---
 lib/mix/pleroma.ex | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/lib/mix/pleroma.ex b/lib/mix/pleroma.ex
index 9f0bf6ecb..c2b607fb3 100644
--- a/lib/mix/pleroma.ex
+++ b/lib/mix/pleroma.ex
@@ -24,8 +24,10 @@ defmodule Mix.Pleroma do
       Application.put_env(:logger, :console, level: :debug)
     end
 
+    adapter = Application.get_env(:tesla, :adapter)
+
     apps =
-      if Application.get_env(:tesla, :adapter) == Tesla.Adapter.Gun do
+      if adapter == Tesla.Adapter.Gun do
         [:gun | @apps]
       else
         [:hackney | @apps]
@@ -33,11 +35,13 @@ defmodule Mix.Pleroma do
 
     Enum.each(apps, &Application.ensure_all_started/1)
 
-    children = [
-      Pleroma.Repo,
-      {Pleroma.Config.TransferTask, false},
-      Pleroma.Web.Endpoint
-    ]
+    children =
+      [
+        Pleroma.Repo,
+        {Pleroma.Config.TransferTask, false},
+        Pleroma.Web.Endpoint
+      ] ++
+        http_children(adapter)
 
     cachex_children = Enum.map(@cachex_children, &Pleroma.Application.build_cachex(&1, []))
 
@@ -115,4 +119,11 @@ defmodule Mix.Pleroma do
   def escape_sh_path(path) do
     ~S(') <> String.replace(path, ~S('), ~S(\')) <> ~S(')
   end
+
+  defp http_children(Tesla.Adapter.Gun) do
+    Pleroma.Gun.ConnectionPool.children() ++
+      [{Task, &Pleroma.HTTP.AdapterHelper.Gun.limiter_setup/0}]
+  end
+
+  defp http_children(_), do: []
 end
-- 
cgit v1.2.3


From 65a1b048a8effa23eb99b1aeae3b97a7e7df3ef5 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Fri, 24 Jul 2020 12:06:56 -0500
Subject: Ensure Oban is available during mix tasks. Fixes: mix pleroma.user rm
 username

---
 lib/mix/pleroma.ex | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/mix/pleroma.ex b/lib/mix/pleroma.ex
index c2b607fb3..074492a46 100644
--- a/lib/mix/pleroma.ex
+++ b/lib/mix/pleroma.ex
@@ -39,7 +39,8 @@ defmodule Mix.Pleroma do
       [
         Pleroma.Repo,
         {Pleroma.Config.TransferTask, false},
-        Pleroma.Web.Endpoint
+        Pleroma.Web.Endpoint,
+        {Oban, Pleroma.Config.get(Oban)}
       ] ++
         http_children(adapter)
 
-- 
cgit v1.2.3


From b31844d6e01fc8bea4ecbe93b072846ca4309e88 Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Sun, 26 Jul 2020 13:54:56 +0000
Subject: OpenAPI: Replace actor_id by account_id to follow ChatMessage schema

---
 lib/pleroma/web/api_spec/operations/chat_operation.ex | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/pleroma/web/api_spec/operations/chat_operation.ex b/lib/pleroma/web/api_spec/operations/chat_operation.ex
index cf299bfc2..1a5b05899 100644
--- a/lib/pleroma/web/api_spec/operations/chat_operation.ex
+++ b/lib/pleroma/web/api_spec/operations/chat_operation.ex
@@ -300,11 +300,11 @@ defmodule Pleroma.Web.ApiSpec.ChatOperation do
           "content" => "Check this out :firefox:",
           "id" => "13",
           "chat_id" => "1",
-          "actor_id" => "someflakeid",
+          "account_id" => "someflakeid",
           "unread" => false
         },
         %{
-          "actor_id" => "someflakeid",
+          "account_id" => "someflakeid",
           "content" => "Whats' up?",
           "id" => "12",
           "chat_id" => "1",
@@ -337,7 +337,7 @@ defmodule Pleroma.Web.ApiSpec.ChatOperation do
 
   def mark_as_read do
     %Schema{
-      title: "MarkAsReadRequest",
+      title: "MarkAsReadRequest",Update chat_operation.ex
       description: "POST body for marking a number of chat messages as read",
       type: :object,
       required: [:last_read_id],
-- 
cgit v1.2.3


From 6107440ea0da3a9e59576a86a9dab50acd83936e Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Sun, 26 Jul 2020 13:59:46 +0000
Subject: OpenAPI: remove accidentally pasted buffer data

---
 lib/pleroma/web/api_spec/operations/chat_operation.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pleroma/web/api_spec/operations/chat_operation.ex b/lib/pleroma/web/api_spec/operations/chat_operation.ex
index 1a5b05899..b1a0d26ab 100644
--- a/lib/pleroma/web/api_spec/operations/chat_operation.ex
+++ b/lib/pleroma/web/api_spec/operations/chat_operation.ex
@@ -337,7 +337,7 @@ defmodule Pleroma.Web.ApiSpec.ChatOperation do
 
   def mark_as_read do
     %Schema{
-      title: "MarkAsReadRequest",Update chat_operation.ex
+      title: "MarkAsReadRequest",
       description: "POST body for marking a number of chat messages as read",
       type: :object,
       required: [:last_read_id],
-- 
cgit v1.2.3