(fix) Force names to send synchronously

Closes #60

pages/api/_helpers.ts

@@ -47,7 +47,7 @@ export interface Member {
 }
 
 const draftBody = (
-  text: string,
+  prefix: string,
   chat_id: number,
   reply_to_message_id: number = null,
   disable_notification: boolean = false,
@@ -65,7 +65,7 @@ const draftBody = (
     entities: body?.message?.entities,
     media: file_id,
     caption_entities: body?.message?.caption_entities,
-    [type]: file_id || text,
+    [type]: file_id || prefix,
     type,
   };
 
@@ -83,28 +83,27 @@ const draftBody = (
   } else if (type === 'text' && body?.message?.[type]) {
     data = {
       ...data,
-      [type]: `${body?.message?.[type]}`,
+      [type]: `${prefix}\n\n${body.message[type]}`,
     };
   }
 
   return data;
 };
 
 export const sendMsg = async (
-  text: string,
+  prefix: string,
   chat_id: number,
   reply_to_message_id: number = null,
   disable_notification: boolean = false,
   theUpdate: any = {}
 ) => {
-  console.log(theUpdate);
   const body = theUpdate?.body || {};
   const groupId = body?.message?.media_group_id;
   const type = groupId ? 'group' : theUpdate?.type || 'text';
   const apiEndpoint = telegramTypes[type] || telegramTypes.text;
 
   let data = draftBody(
-    text,
+    prefix,
     chat_id,
     reply_to_message_id,
     disable_notification,
@@ -136,31 +135,21 @@ export const sendMsg = async (
       mediaGroup.length &&
       mediaGroup?.[0]?.updateArchive.length
     ) {
-      console.log('Using full group', mediaGroup[0].updateArchive);
       data.media = [];
       mediaGroup[0].updateArchive.forEach((u) => {
         data.media.push(
-          draftBody(text, chat_id, reply_to_message_id, disable_notification, u)
+          draftBody(
+            prefix,
+            chat_id,
+            reply_to_message_id,
+            disable_notification,
+            u
+          )
         );
       });
-
-      console.log('data.media', data.media);
     }
   }
 
-  console.log({
-    text,
-    chat_id,
-    reply_to_message_id,
-    disable_notification,
-    theUpdate,
-    telegramTypes,
-    apiEndpoint,
-    type,
-    body,
-    data,
-  });
-
   const url = `https://api.telegram.org/bot${process.env.TELEGRAM_API_KEY}/${apiEndpoint}`;
 
   return fetch(url, {

pages/api/send.ts

@@ -1,6 +1,6 @@
 import { VercelRequest, VercelResponse } from '@vercel/node';
 import { connectToDatabase } from './_connectToDatabase';
-import { sendMsg, StandupGroup, Member, About } from './_helpers';
+import { sendMsg, StandupGroup, Member } from './_helpers';
 
 module.exports = async (req: VercelRequest, res: VercelResponse) => {
   if (
@@ -23,37 +23,18 @@ module.exports = async (req: VercelRequest, res: VercelResponse) => {
     .find({ submitted: true })
     .toArray();
 
-  const sentStandup = [];
+  const sendPromises = [];
   users
     .filter((g) => !!g.groups.length)
     .forEach((user: Member) => {
-      user.groups.forEach((group: StandupGroup) => {
+      user.groups.forEach(async (group: StandupGroup) => {
         const theUpdate = user.updateArchive.slice(-1)[0];
-        const type = theUpdate?.type;
-        const hasEntities =
-          theUpdate?.body?.message?.entities ||
-          theUpdate?.body?.message?.caption_entities;
-
-        if (!hasEntities && type === 'text') {
-          sentStandup.push(
-            sendMsg(
-              `${user.about.first_name}:`,
-              group.chatId,
-              null,
-              true,
-              theUpdate
-            )
-          );
-        } else {
-          sentStandup.push(
-            sendMsg(`${user.about.first_name}:`, group.chatId, null, true),
-            sendMsg(``, group.chatId, null, true, theUpdate)
-          );
-        }
+
+        await sendMsg(`${user.about.first_name}:`, group.chatId, null, true);
+        await sendMsg(``, group.chatId, null, true, theUpdate);
       });
     });
 
-  await Promise.all(sentStandup);
   if (process.env.NODE_ENV === 'production') {
     await markAllSent();
   }