From: rinpatch <rinpatch@sdf.org>
Date: Thu, 18 Apr 2019 18:40:40 +0000 (+0300)
Subject: Add a guard to fetching reply activity
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=9238dccac1310fc2e281b242768a2de79f405f35;p=akkoma

Add a guard to fetching reply activity
---

diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index 9043530c9..4a2ded518 100644
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -204,12 +204,14 @@ defmodule Pleroma.Activity do
 
   def create_by_object_ap_id_with_object(_), do: nil
 
-  def get_create_by_object_ap_id_with_object(ap_id) do
+  def get_create_by_object_ap_id_with_object(ap_id) when is_binary(ap_id) do
     ap_id
     |> create_by_object_ap_id_with_object()
     |> Repo.one()
   end
 
+  def get_create_by_object_ap_id_with_object(_), do: nil
+
   defp get_in_reply_to_activity_from_object(%Object{data: %{"inReplyTo" => ap_id}}) do
     get_create_by_object_ap_id_with_object(ap_id)
   end