hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Chats: Remove unread from the db, calculate from unseen messages.

Browse source
This commit is contained in:
lain 2020-06-03 14:26:50 +02:00
commit 7f5c5b11a5
9 changed files with 40 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/chat_test.exs
View file

@ -6,7 +6,6 @@ defmodule Pleroma.ChatTest do
use Pleroma.DataCase, async: true
alias Pleroma.Chat
alias Pleroma.Web.CommonAPI
import Pleroma.Factory
@ -35,7 +34,6 @@ defmodule Pleroma.ChatTest do
{: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
@ -48,15 +46,13 @@ defmodule Pleroma.ChatTest do
assert chat.id == chat_two.id
end
test "a returning chat will have an updated `update_at` field and an incremented unread count" do
test "a returning chat will have an updated `update_at` field" do
user = insert(:user)
other_user = insert(:user)
{:ok, chat} = Chat.bump_or_create(user.id, other_user.ap_id)
assert chat.unread == 1
:timer.sleep(1500)
{:ok, chat_two} = Chat.bump_or_create(user.id, other_user.ap_id)
assert chat_two.unread == 2
assert chat.id == chat_two.id
assert chat.updated_at != chat_two.updated_at

2
test/web/activity_pub/side_effects_test.exs
View file

@ -346,7 +346,6 @@ defmodule Pleroma.Web.ActivityPub.SideEffectsTest do
SideEffects.handle(create_activity, local: false, object_data: chat_message_data)
chat = Chat.get(author.id, recipient.ap_id)
assert chat.unread == 0
[cm_ref] = ChatMessageReference.for_chat_query(chat) |> Repo.all()
@ -354,7 +353,6 @@ defmodule Pleroma.Web.ActivityPub.SideEffectsTest do
assert cm_ref.seen == true
chat = Chat.get(recipient.id, author.ap_id)
assert chat.unread == 1
[cm_ref] = ChatMessageReference.for_chat_query(chat) |> Repo.all()

11
test/web/pleroma_api/controllers/chat_controller_test.exs
View file

@ -19,9 +19,12 @@ defmodule Pleroma.Web.PleromaAPI.ChatControllerTest do
test "it marks all messages in a chat as read", %{conn: conn, user: user} do
other_user = insert(:user)
{:ok, chat} = Chat.bump_or_create(user.id, other_user.ap_id)
{:ok, create} = CommonAPI.post_chat_message(other_user, user, "sup")
{:ok, chat} = Chat.get_or_create(user.id, other_user.ap_id)
object = Object.normalize(create, false)
cm_ref = ChatMessageReference.for_chat_and_object(chat, object)
assert chat.unread == 1
assert cm_ref.seen == false
result =
conn
@ -30,9 +33,9 @@ defmodule Pleroma.Web.PleromaAPI.ChatControllerTest do
assert result["unread"] == 0
{:ok, chat} = Chat.get_or_create(user.id, other_user.ap_id)
cm_ref = ChatMessageReference.for_chat_and_object(chat, object)
assert chat.unread == 0
assert cm_ref.seen == true
end
end