ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge error

Browse Source
This commit is contained in:
Ulf Gebhardt 2023-07-17 15:59:32 +02:00
parent 94bb798d72
commit 27600f0e79
Signed by: ulfgebhardt
GPG Key ID: DA6B843E748679C9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/schema/resolvers/messages.ts
View File

@ -73,7 +73,7 @@ export default {
RETURN message { RETURN message {
.*, .*,
room: properties(room) room: properties(room)
otherUser: properties(otherUser) otherUser: properties(otherUser),
senderId: currentUser.id, senderId: currentUser.id,
username: currentUser.name, username: currentUser.name,
avatar: image.url, avatar: image.url,