From 70a1c521650c84ef4c5e64cdf12051f311faaa93 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 20 Jul 2023 13:10:25 +0200
Subject: [PATCH] lint fixes

---
 webapp/components/Chat/Chat.vue | 20 +++++++++++---------
 webapp/graphql/Rooms.js         |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 9b2c28fe5..fedaeedba 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -401,20 +401,22 @@ export default {
       this.$emit('toggle-user-search')
     },
 
-    fixRoomObject(room){
+    fixRoomObject(room) {
       // This fixes the room object which arrives from the backend
       const fixedRoom = {
         ...room,
         index: room.lastMessage?.date,
-        lastMessage: room.lastMessage ? {
-          ...room.lastMessage,
-          content: room.lastMessage?.content?.trim().substring(0, 30),
-        }: null,
+        lastMessage: room.lastMessage
+          ? {
+              ...room.lastMessage,
+              content: room.lastMessage?.content?.trim().substring(0, 30),
+            }
+          : null,
         users: room.users.map((u) => {
           return { ...u, username: u.name, avatar: u.avatar?.url }
-        })
+        }),
       }
-      if(!fixedRoom.avatar){
+      if (!fixedRoom.avatar) {
         // as long as we cannot query avatar on CreateRoom
         fixedRoom.avatar = fixedRoom.users.find((u) => u.id !== this.currentUser.id).avatar
       }
@@ -433,10 +435,10 @@ export default {
           const roomIndex = this.rooms.findIndex((r) => r.id === CreateRoom.roomId)
           const room = this.fixRoomObject(CreateRoom)
 
-          if(roomIndex === -1){
+          if (roomIndex === -1) {
             this.rooms = [room, ...this.rooms]
           }
-          this.fetchMessages({room, options: { refetch: true }})
+          this.fetchMessages({ room, options: { refetch: true } })
           this.$emit('show-chat', CreateRoom.id)
         })
         .catch((error) => {
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index 34c1b2fd6..077d73f9a 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -23,7 +23,7 @@ export const createRoom = () => gql`
 
 export const roomQuery = () => gql`
   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
       roomId
       roomName