projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Chat: Add views, don't return them in timeline queries.
[akkoma]
/
lib
/
pleroma
/
chat.ex
diff --git
a/lib/pleroma/chat.ex
b/lib/pleroma/chat.ex
index b61bc4c0e741b8eacfa7df5106b721572c902a5d..c2044881f7463cfb3fc7d3a9f3e7163d752ae372 100644
(file)
--- a/
lib/pleroma/chat.ex
+++ b/
lib/pleroma/chat.ex
@@
-26,6
+26,13
@@
defmodule Pleroma.Chat do
def creation_cng(struct, params) do
struct
|> cast(params, [:user_id, :recipient, :unread])
def creation_cng(struct, params) do
struct
|> cast(params, [:user_id, :recipient, :unread])
+ |> validate_change(:recipient, fn
+ :recipient, recipient ->
+ case User.get_cached_by_ap_id(recipient) do
+ nil -> [recipient: "must a an existing user"]
+ _ -> []
+ end
+ end)
|> validate_required([:user_id, :recipient])
|> unique_constraint(:user_id, name: :chats_user_id_recipient_index)
end
|> validate_required([:user_id, :recipient])
|> unique_constraint(:user_id, name: :chats_user_id_recipient_index)
end
@@
-35,6
+42,16
@@
defmodule Pleroma.Chat do
|> Repo.get_by(user_id: user_id, recipient: recipient)
end
|> Repo.get_by(user_id: user_id, recipient: recipient)
end
+ def get_or_create(user_id, recipient) do
+ %__MODULE__{}
+ |> creation_cng(%{user_id: user_id, recipient: recipient})
+ |> Repo.insert(
+ on_conflict: :nothing,
+ returning: true,
+ conflict_target: [:user_id, :recipient]
+ )
+ end
+
def bump_or_create(user_id, recipient) do
%__MODULE__{}
|> creation_cng(%{user_id: user_id, recipient: recipient, unread: 1})
def bump_or_create(user_id, recipient) do
%__MODULE__{}
|> creation_cng(%{user_id: user_id, recipient: recipient, unread: 1})