From 2d3483dc1be4e5565f61c5e920a87477739e60a2 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 15 Jul 2023 12:35:26 +0200 Subject: [PATCH 1/3] query additional data for messages --- webapp/graphql/Messages.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js index d017f816c..1d7917bfc 100644 --- a/webapp/graphql/Messages.js +++ b/webapp/graphql/Messages.js @@ -7,11 +7,17 @@ export const messageQuery = () => { _id id indexId - senderId content + senderId author { id } + username + avatar + date + saved + distributed + seen } } ` From 775a3ddb7282fea07cc32aba9af7c33e0aa2518a Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 15 Jul 2023 12:35:44 +0200 Subject: [PATCH 2/3] strip datetime down to date in message --- webapp/components/Chat/Chat.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue index 95bf5da95..daab051de 100644 --- a/webapp/components/Chat/Chat.vue +++ b/webapp/components/Chat/Chat.vue @@ -210,6 +210,7 @@ export default { const msgs = [] ;[...this.messages, ...Message].forEach((m) => { + m.date = new Date(m.date).toDateString() msgs[m.indexId] = m }) this.messages = msgs.filter(Boolean) From 882435e54c28af8ef1f609a846c2829014e5658e Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 17 Jul 2023 11:40:07 +0200 Subject: [PATCH 3/3] lint fix --- backend/src/schema/resolvers/rooms.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/schema/resolvers/rooms.spec.ts b/backend/src/schema/resolvers/rooms.spec.ts index c4c46f00d..690572e43 100644 --- a/backend/src/schema/resolvers/rooms.spec.ts +++ b/backend/src/schema/resolvers/rooms.spec.ts @@ -374,7 +374,7 @@ describe('Room', () => { ).resolves.toMatchObject({ data: { UnreadRooms: 2, - } + }, }) }) })