X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fchat.ex;h=24a86371e7801594caa18acc33b7b9eb999f73b6;hb=b867f9d7aebc4e5b8832228a54f928b9f92dad0e;hp=5aefddc5e6895dc62d1cabe4439520e1888507ee;hpb=a8ca030d85368285af1b960e14dab5b847ecb35a;p=akkoma

diff --git a/lib/pleroma/chat.ex b/lib/pleroma/chat.ex
index 5aefddc5e..24a86371e 100644
--- a/lib/pleroma/chat.ex
+++ b/lib/pleroma/chat.ex
@@ -16,6 +16,8 @@ defmodule Pleroma.Chat do
   It is a helper only, to make it easy to display a list of chats with other people, ordered by last bump. The actual messages are retrieved by querying the recipients of the ChatMessages.
   """
 
+  @primary_key {:id, FlakeId.Ecto.CompatType, autogenerate: true}
+
   schema "chats" do
     belongs_to(:user, User, type: FlakeId.Ecto.CompatType)
     field(:recipient, :string)
@@ -23,7 +25,7 @@ defmodule Pleroma.Chat do
     timestamps()
   end
 
-  def creation_cng(struct, params) do
+  def changeset(struct, params) do
     struct
     |> cast(params, [:user_id, :recipient])
     |> validate_change(:recipient, fn
@@ -49,7 +51,7 @@ defmodule Pleroma.Chat do
 
   def get_or_create(user_id, recipient) do
     %__MODULE__{}
-    |> creation_cng(%{user_id: user_id, recipient: recipient})
+    |> changeset(%{user_id: user_id, recipient: recipient})
     |> Repo.insert(
       # Need to set something, otherwise we get nothing back at all
       on_conflict: [set: [recipient: recipient]],
@@ -60,9 +62,10 @@ defmodule Pleroma.Chat do
 
   def bump_or_create(user_id, recipient) do
     %__MODULE__{}
-    |> creation_cng(%{user_id: user_id, recipient: recipient})
+    |> changeset(%{user_id: user_id, recipient: recipient})
     |> Repo.insert(
       on_conflict: [set: [updated_at: NaiveDateTime.utc_now()]],
+      returning: true,
       conflict_target: [:user_id, :recipient]
     )
   end