forked from AkkomaGang/akkoma
Chat: Fix wrong query.
This commit is contained in:
parent
1b1dfb54eb
commit
fdb98715b8
2 changed files with 18 additions and 0 deletions
|
@ -29,6 +29,7 @@ defmodule Pleroma.Chat do
|
||||||
def last_message_for_chat(chat) do
|
def last_message_for_chat(chat) do
|
||||||
messages_for_chat_query(chat)
|
messages_for_chat_query(chat)
|
||||||
|> order_by(desc: :id)
|
|> order_by(desc: :id)
|
||||||
|
|> limit(1)
|
||||||
|> Repo.one()
|
|> Repo.one()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -6,9 +6,26 @@ defmodule Pleroma.ChatTest do
|
||||||
use Pleroma.DataCase, async: true
|
use Pleroma.DataCase, async: true
|
||||||
|
|
||||||
alias Pleroma.Chat
|
alias Pleroma.Chat
|
||||||
|
alias Pleroma.Web.CommonAPI
|
||||||
|
|
||||||
import Pleroma.Factory
|
import Pleroma.Factory
|
||||||
|
|
||||||
|
describe "messages" do
|
||||||
|
test "it returns the last message in a chat" do
|
||||||
|
user = insert(:user)
|
||||||
|
recipient = insert(:user)
|
||||||
|
|
||||||
|
{:ok, _message_1} = CommonAPI.post_chat_message(user, recipient, "hey")
|
||||||
|
{:ok, _message_2} = CommonAPI.post_chat_message(recipient, user, "ho")
|
||||||
|
|
||||||
|
{:ok, chat} = Chat.get_or_create(user.id, recipient.ap_id)
|
||||||
|
|
||||||
|
message = Chat.last_message_for_chat(chat)
|
||||||
|
|
||||||
|
assert message.data["content"] == "ho"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
describe "creation and getting" do
|
describe "creation and getting" do
|
||||||
test "it only works if the recipient is a valid user (for now)" do
|
test "it only works if the recipient is a valid user (for now)" do
|
||||||
user = insert(:user)
|
user = insert(:user)
|
||||||
|
|
Loading…
Reference in a new issue