Merge branch 'develop' into feature/polls-2-electric-boogalo

[akkoma] / lib / pleroma / conversation.ex

diff --git a/lib/pleroma/conversation.ex b/lib/pleroma/conversation.ex
index 5f6ab902c1ebb1bf4d2ba6abe0dc9f45b82ff632..bc97b39ca6e6229d888f6fd721747e48f3579115 100644 (file)
--- a/lib/pleroma/conversation.ex
+++ b/lib/pleroma/conversation.ex
@@ -47,9 +47,9 @@ defmodule Pleroma.Conversation do
   """
   def create_or_bump_for(activity, opts \\ []) do
     with true <- Pleroma.Web.ActivityPub.Visibility.is_direct?(activity),
-         object <- Pleroma.Object.normalize(activity),
          "Create" <- activity.data["type"],
-         "Note" <- object.data["type"],
+         object <- Pleroma.Object.normalize(activity),
+         true <- object.data["type"] in ["Note", "Question"],
          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)