feat: group chat names and pictures

Author: Dara Hayes

server/modules/chats/index.ts

@@ -94,12 +94,27 @@ const resolvers: Resolvers = {
       const currentUser = await injector.get(Auth).currentUser();
 
       if (!currentUser) return null;
-      const participant = await injector.get(Chats).firstRecipient({
-        chatId: chat.id,
-        userId: currentUser.id
-      });
+      const participants = await injector.get(Chats).participants(chat.id)
+
+      const participantsWithoutCurrentUser = participants.filter((participant) => {
+        return participant.id !== currentUser.id
+      })
 
-      return participant ? participant.name : null;
+      
+      if (participantsWithoutCurrentUser.length === 1) {
+        const otherParticipant = participantsWithoutCurrentUser[0]
+        return otherParticipant.name || otherParticipant.username || ""
+      }
+
+      const names = participantsWithoutCurrentUser.reduce((prev, participant) => {
+        const name = participant.name || participant.username || ""
+        if (prev === "") {
+          return name
+        }
+        return `${prev}, ${name}`
+      }, "")
+
+      return names
     },
 
     // pulling details of participant of chat that is not the current user but belongs to current user chat room
@@ -108,14 +123,19 @@ const resolvers: Resolvers = {
 
       if (!currentUser) return null;
 
-      const participant = await injector.get(Chats).firstRecipient({
-        chatId: chat.id,
-        userId: currentUser.id
-      });
+      const participants = await injector.get(Chats).participants(chat.id)
+
+      const participantsWithoutCurrentUser = participants.filter((participant) => {
+        return participant.id !== currentUser.id
+      })
 
-      return participant && participant.picture
+      if (participantsWithoutCurrentUser.length === 1) {
+        const participant = participantsWithoutCurrentUser[0]
+        return participant && participant.picture
         ? participant.picture
         : injector.get(UnsplashApi).getRandomPhoto();
+      }
+      return injector.get(UnsplashApi).getRandomPhoto();
     },
 
     // pulling all messages for X chat room

server/modules/chats/unsplash.api.ts

@@ -16,34 +16,29 @@ export class UnsplashApi {
   baseURL = "https://api.unsplash.com/";
 
   async getRandomPhoto() {
-    const trackedRandomPhoto = await trackProvider(
-      async ({ query, orientation }: RandomPhotoInput) => {
-        const response = await axios.get<RandomPhoto>("photos/random", {
-          baseURL: this.baseURL,
-          headers: {
-            Authorization:
-              "Client-ID 4d048cfb4383b407eff92e4a2a5ec36c0a866be85e64caafa588c110efad350d"
-          },
-          params: {
-            query,
-            orientation
-          }
-        });
+    
+    const getPhoto = async ({ query, orientation }: RandomPhotoInput) => {
+      const response = await axios.get<RandomPhoto>("photos/random", {
+        baseURL: this.baseURL,
+        headers: {
+          Authorization:
+            "Client-ID 4d048cfb4383b407eff92e4a2a5ec36c0a866be85e64caafa588c110efad350d"
+        },
+        params: {
+          query,
+          orientation
+        }
+      });
 
-        return response.data;
-      },
-      {
-        provider: "Unsplash",
-        method: "RandomPhoto",
-        location: resolve(__dirname, "../logs/main")
-      }
-    );
+      return response.data;
+    }
 
     try {
-      return (await trackedRandomPhoto({
+      const randomPhoto = await getPhoto({
         query: "portrait",
         orientation: "squarish"
-      })).urls.small;
+      })
+      return randomPhoto.urls.small;
     } catch (err) {
       console.error("Cannot retrieve random photo:", err);
       return null;