From 06e8ece4cc3956d991d48dbd338604b7940d167c Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 7 Aug 2024 12:37:58 -0400
Subject: Fix CommonAPI.follow/2 which returned users in the reverse order they
 were provided to the function

---
 lib/pleroma/web/common_api.ex                |  2 +-
 lib/pleroma/web/mastodon_api/mastodon_api.ex | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/common_api.ex b/lib/pleroma/web/common_api.ex
index 1ed905d6c..921e414c3 100644
--- a/lib/pleroma/web/common_api.ex
+++ b/lib/pleroma/web/common_api.ex
@@ -130,7 +130,7 @@ defmodule Pleroma.Web.CommonAPI do
       if activity.data["state"] == "reject" do
         {:error, :rejected}
       else
-        {:ok, follower, followed, activity}
+        {:ok, followed, follower, activity}
       end
     end
   end
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api.ex b/lib/pleroma/web/mastodon_api/mastodon_api.ex
index 6dcbfb097..c9e045d23 100644
--- a/lib/pleroma/web/mastodon_api/mastodon_api.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api.ex
@@ -18,10 +18,10 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPI do
       if not User.following?(follower, followed) do
         CommonAPI.follow(followed, follower)
       else
-        {:ok, follower, followed, nil}
+        {:ok, followed, follower, nil}
       end
 
-    with {:ok, follower, _followed, _} <- result do
+    with {:ok, _followed, follower, _} <- result do
       options = cast_params(params)
       set_reblogs_visibility(options[:reblogs], result)
       set_subscription(options[:notify], result)
@@ -29,19 +29,19 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPI do
     end
   end
 
-  defp set_reblogs_visibility(false, {:ok, follower, followed, _}) do
+  defp set_reblogs_visibility(false, {:ok, followed, follower, _}) do
     CommonAPI.hide_reblogs(followed, follower)
   end
 
-  defp set_reblogs_visibility(_, {:ok, follower, followed, _}) do
+  defp set_reblogs_visibility(_, {:ok, followed, follower, _}) do
     CommonAPI.show_reblogs(followed, follower)
   end
 
-  defp set_subscription(true, {:ok, follower, followed, _}) do
+  defp set_subscription(true, {:ok, followed, follower, _}) do
     User.subscribe(follower, followed)
   end
 
-  defp set_subscription(false, {:ok, follower, followed, _}) do
+  defp set_subscription(false, {:ok, followed, follower, _}) do
     User.unsubscribe(follower, followed)
   end
 
-- 
cgit v1.2.3


From 721005b3126e0920ab861fcc83195f160b0ee9a0 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 7 Aug 2024 13:00:31 -0400
Subject: Fix WebPush notifications not generating jobs

Dialyzer pointed this one out.

The WorkerHelper removal in !4166 was missing this Oban.insert() and tests were not noticing any problems because we mocked the Push.send function instead of executing it and checking for the Oban job.
---
 lib/pleroma/web/push.ex | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/pleroma/web/push.ex b/lib/pleroma/web/push.ex
index d783f776a..6d777142e 100644
--- a/lib/pleroma/web/push.ex
+++ b/lib/pleroma/web/push.ex
@@ -29,5 +29,6 @@ defmodule Pleroma.Web.Push do
           {:ok, Oban.Job.t()} | {:error, Oban.Job.changeset() | term()}
   def send(notification) do
     WebPusherWorker.new(%{"op" => "web_push", "notification_id" => notification.id})
+    |> Oban.insert()
   end
 end
-- 
cgit v1.2.3