X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fconversation.ex;h=aa73edd75574876190b0a183bc0cbc5ed48b5f1b;hb=a4598b5e8bc640ffc1a052438e21f3573ff837ee;hp=5a2a3fc6de302ff0e311918532c679f4c58c5261;hpb=c1ebb38d3adc1d222be832405ec0d7497b61f94a;p=akkoma

diff --git a/lib/pleroma/conversation.ex b/lib/pleroma/conversation.ex
index 5a2a3fc6d..aa73edd75 100644
--- a/lib/pleroma/conversation.ex
+++ b/lib/pleroma/conversation.ex
@@ -13,6 +13,7 @@ defmodule Pleroma.Conversation do
     # This is the context ap id.
     field(:ap_id, :string)
     has_many(:participations, Participation)
+    has_many(:users, through: [:participations, :user])
 
     timestamps()
   end
@@ -46,9 +47,10 @@ defmodule Pleroma.Conversation do
   """
   def create_or_bump_for(activity) do
     with true <- Pleroma.Web.ActivityPub.Visibility.is_direct?(activity),
+         object <- Pleroma.Object.normalize(activity),
          "Create" <- activity.data["type"],
-         "Note" <- activity.data["object"]["type"],
-         ap_id when is_binary(ap_id) <- activity.data["object"]["context"] do
+         "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)
@@ -61,10 +63,27 @@ defmodule Pleroma.Conversation do
           participation
         end)
 
-      %{
-        conversation
-        | participations: participations
-      }
+      {:ok,
+       %{
+         conversation
+         | participations: participations
+       }}
+    else
+      e -> {:error, e}
     end
   end
+
+  @doc """
+  This is only meant to be run by a mix task. It creates conversations/participations for all direct messages in the database.
+  """
+  def bump_for_all_activities() do
+    stream =
+      Pleroma.Web.ActivityPub.ActivityPub.fetch_direct_messages_query()
+      |> Repo.stream()
+
+    Repo.transaction(fn ->
+      stream
+      |> Enum.each(&create_or_bump_for/1)
+    end)
+  end
 end