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

lint fixes

Browse Source
This commit is contained in:
Ulf Gebhardt 2023-07-20 13:10:25 +02:00
parent 01fb28da3c
commit 70a1c52165
Signed by: ulfgebhardt
GPG Key ID: DA6B843E748679C9
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webapp/components/Chat/Chat.vue
View File

@ -406,13 +406,15 @@ export default {
const fixedRoom = { const fixedRoom = {
...room, ...room,
index: room.lastMessage?.date, index: room.lastMessage?.date,
lastMessage: room.lastMessage ? { lastMessage: room.lastMessage
? {
...room.lastMessage, ...room.lastMessage,
content: room.lastMessage?.content?.trim().substring(0, 30), content: room.lastMessage?.content?.trim().substring(0, 30),
}: null, }
: null,
users: room.users.map((u) => { users: room.users.map((u) => {
return { ...u, username: u.name, avatar: u.avatar?.url } return { ...u, username: u.name, avatar: u.avatar?.url }
}) }),
} }
if (!fixedRoom.avatar) { if (!fixedRoom.avatar) {
// as long as we cannot query avatar on CreateRoom // as long as we cannot query avatar on CreateRoom

2
webapp/graphql/Rooms.js
View File

@ -23,7 +23,7 @@ export const createRoom = () => gql`
export const roomQuery = () => gql` export const roomQuery = () => gql`
query Room($first: Int, $offset: Int, $id: ID) { query Room($first: Int, $offset: Int, $id: ID) {
Room(first: $first, offset: $offset, id: $id, orderBy: [lastMessageAt_desc createdAt_desc] ) { Room(first: $first, offset: $offset, id: $id, orderBy: [lastMessageAt_desc, createdAt_desc]) {
id id
roomId roomId
roomName roomName