Merge branch 'changelog/adminfe' into 'develop'

[akkoma] / lib / pleroma / conversation.ex

diff --git a/lib/pleroma/conversation.ex b/lib/pleroma/conversation.ex
index d9c84cb1b62d4375770b9f45726457ce29f59f02..0db1959889ab08cb568f64646b9c48c79969bf24 100644 (file)
--- a/lib/pleroma/conversation.ex
+++ b/lib/pleroma/conversation.ex
@@ -48,8 +48,9 @@ defmodule Pleroma.Conversation do
   def create_or_bump_for(activity) do
     with true <- Pleroma.Web.ActivityPub.Visibility.is_direct?(activity),
          "Create" <- activity.data["type"],
-         "Note" <- activity.data["object"]["type"],
-         ap_id when is_binary(ap_id) <- activity.data["object"]["context"] do
+         object <- Pleroma.Object.normalize(activity),
+         "Note" <- object.data["type"],
+         ap_id when is_binary(ap_id) and byte_size(ap_id) > 0 <- object.data["context"] do
       {:ok, conversation} = create_for_ap_id(ap_id)
 
       users = User.get_users_from_set(activity.recipients, false)
@@ -62,10 +63,13 @@ defmodule Pleroma.Conversation do
           participation
         end)
 
-      %{
-        conversation
-        | participations: participations
-      }
+      {:ok,
+       %{
+         conversation
+         | participations: participations
+       }}
+    else
+      e -> {:error, e}
     end
   end
 end