From 057438a657eaadb963e006b84b890ae4f8441808 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Tue, 31 Mar 2020 17:56:05 +0200
Subject: [PATCH] CommonAPI: DRY up a bit.

---
 lib/pleroma/web/common_api/common_api.ex | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
index f882f9fcb..74adcca55 100644
--- a/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@ -112,8 +112,22 @@ def unrepeat(id_or_ap_id, user) do
     end
   end
 
-  @spec favorite(User.t(), binary()) :: {:ok, Activity.t()} | {:error, any()}
+  @spec favorite(User.t(), binary()) :: {:ok, Activity.t() | :already_liked} | {:error, any()}
   def favorite(%User{} = user, id) do
+    case favorite_helper(user, id) do
+      {:ok, _} = res ->
+        res
+
+      {:error, :not_found} = res ->
+        res
+
+      {:error, e} ->
+        Logger.error("Could not favorite #{id}. Error: #{inspect(e, pretty: true)}")
+        {:error, dgettext("errors", "Could not favorite")}
+    end
+  end
+
+  def favorite_helper(user, id) do
     with {_, %Activity{object: object}} <- {:find_object, Activity.get_by_id_with_object(id)},
          {_, {:ok, like_object, meta}} <- {:build_object, Builder.like(user, object)},
          {_, {:ok, %Activity{} = activity, _meta}} <-
@@ -138,13 +152,11 @@ def favorite(%User{} = user, id) do
         if {:object, {"already liked by this actor", []}} in changeset.errors do
           {:ok, :already_liked}
         else
-          Logger.error("Could not favorite #{id}. Error: #{inspect(e, pretty: true)}")
-          {:error, dgettext("errors", "Could not favorite"), e}
+          {:error, e}
         end
 
       e ->
-        Logger.error("Could not favorite #{id}. Error: #{inspect(e, pretty: true)}")
-        {:error, dgettext("errors", "Could not favorite"), e}
+        {:error, e}
     end
   end