a1batross
/
pleroma
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Chat: creation_cng -> changeset 

Make our usage of this more uniform.
This commit is contained in:
lain 2020-06-06 10:38:45 +02:00
parent c5e3f2454c
commit 239d03499e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pleroma/chat.ex
View File

@ -23,7 +23,7 @@ defmodule Pleroma.Chat do
timestamps() timestamps()
end end
def creation_cng(struct, params) do def changeset(struct, params) do
struct struct
|> cast(params, [:user_id, :recipient]) |> cast(params, [:user_id, :recipient])
|> validate_change(:recipient, fn |> validate_change(:recipient, fn
@ -49,7 +49,7 @@ defmodule Pleroma.Chat do
def get_or_create(user_id, recipient) do def get_or_create(user_id, recipient) do
%__MODULE__{} %__MODULE__{}
|> creation_cng(%{user_id: user_id, recipient: recipient}) |> changeset(%{user_id: user_id, recipient: recipient})
|> Repo.insert( |> Repo.insert(
# Need to set something, otherwise we get nothing back at all # Need to set something, otherwise we get nothing back at all
on_conflict: [set: [recipient: recipient]], on_conflict: [set: [recipient: recipient]],
@ -60,7 +60,7 @@ defmodule Pleroma.Chat do
def bump_or_create(user_id, recipient) do def bump_or_create(user_id, recipient) do
%__MODULE__{} %__MODULE__{}
|> creation_cng(%{user_id: user_id, recipient: recipient}) |> changeset(%{user_id: user_id, recipient: recipient})
|> Repo.insert( |> Repo.insert(
on_conflict: [set: [updated_at: NaiveDateTime.utc_now()]], on_conflict: [set: [updated_at: NaiveDateTime.utc_now()]],
conflict_target: [:user_id, :recipient] conflict_target: [:user_id, :recipient]