mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-06-01 08:28:06 +00:00
Code Issues Projects Releases Wiki Activity

Chat: Fix missing chat id on second 'get'

Browse source
This commit is contained in:
lain 2020-05-05 20:07:47 +02:00
parent c23cb8d37a
commit 9637cded21
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/pleroma/chat.ex
View file

@ -46,7 +46,8 @@ defmodule Pleroma.Chat do
%__MODULE__{}
|> creation_cng(%{user_id: user_id, recipient: recipient})
|> Repo.insert(
on_conflict: :nothing,
# Need to set something, otherwise we get nothing back at all
on_conflict: [set: [recipient: recipient]],
returning: true,
conflict_target: [:user_id, :recipient]
)

13
test/chat_test.exs
View file

@ -26,13 +26,24 @@ defmodule Pleroma.ChatTest do
assert chat.id
end
test "it returns a chat for a user and recipient if it already exists" do
test "it returns and bumps a chat for a user and recipient if it already exists" do
user = insert(:user)
other_user = insert(:user)
{:ok, chat} = Chat.bump_or_create(user.id, other_user.ap_id)
{:ok, chat_two} = Chat.bump_or_create(user.id, other_user.ap_id)
assert chat.id == chat_two.id
assert chat_two.unread == 2
end
test "it returns a chat for a user and recipient if it already exists" do
user = insert(:user)
other_user = insert(:user)
{:ok, chat} = Chat.get_or_create(user.id, other_user.ap_id)
{:ok, chat_two} = Chat.get_or_create(user.id, other_user.ap_id)
assert chat.id == chat_two.id
end