Merge branch 'fix/truncate-remote-user-fields' into 'develop'

[akkoma] / lib / pleroma / conversation / participation.ex

diff --git a/lib/pleroma/conversation/participation.ex b/lib/pleroma/conversation/participation.ex
index d17b6f7c5a045c63032cb8d118a1b0ffc1a21e88..ea5b9fe17ba0526647d78caf03f2f167fa130720 100644 (file)
--- a/lib/pleroma/conversation/participation.ex
+++ b/lib/pleroma/conversation/participation.ex
@@ -94,10 +94,20 @@ defmodule Pleroma.Conversation.Participation do
     |> Enum.filter(& &1.last_activity_id)
   end
 
-  def get(nil), do: nil
+  def get(_, _ \\ [])
+  def get(nil, _), do: nil
+
+  def get(id, params) do
+    query =
+      if preload = params[:preload] do
+        from(p in __MODULE__,
+          preload: ^preload
+        )
+      else
+        __MODULE__
+      end
 
-  def get(id) do
-    Repo.get(__MODULE__, id)
+    Repo.get(query, id)
   end
 
   def set_recipients(participation, user_ids) do