From 5d5c751de867fd76815ed04008d9f6bd8c824e37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20H=C3=BCttemann?= <henrik.huettemann@verdigado.com>
Date: Mon, 12 Jun 2023 16:52:41 +0200
Subject: [PATCH] Fix promises to be awaited

---
 src/app.ts            | 6 ++++--
 src/handlers/rooms.ts | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/app.ts b/src/app.ts
index dcb22bb..2146061 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -77,7 +77,7 @@ async function loadRcExport(entity: Entities) {
           log.debug('Mapping added:', mapping)
 
           // Add user to room mapping (specific to users)
-          Promise.all(
+          await Promise.all(
             rcUser.__rooms.map(async (rcRoomId: string) => {
               await createMembership(rcRoomId, rcUser._id)
               log.debug(`${rcUser.username} membership for ${rcRoomId} created`)
@@ -123,11 +123,13 @@ async function main() {
   try {
     await whoami()
     await initStorage()
+    log.info('Parsing users')
     await loadRcExport(Entities.Users)
+    log.info('Parsing rooms')
     await loadRcExport(Entities.Rooms)
     log.info('Done.')
   } catch (error) {
-    log.error(`Encountered an error while booting up: ${error}`)
+    log.error(`Encountered an error while booting up: ${error}`, error)
   }
 }
 
diff --git a/src/handlers/rooms.ts b/src/handlers/rooms.ts
index e247fbb..33165d2 100644
--- a/src/handlers/rooms.ts
+++ b/src/handlers/rooms.ts
@@ -45,7 +45,7 @@ export type MatrixRoom = {
   _creatorId?: string
 }
 
-export function mapRoom(rcRoom: RcRoom): MatrixRoom {
+export async function mapRoom(rcRoom: RcRoom): Promise<MatrixRoom> {
   const room: MatrixRoom = {
     creation_content: {
       'm.federate': false,
@@ -63,7 +63,7 @@ export function mapRoom(rcRoom: RcRoom): MatrixRoom {
       room._creatorId = rcRoom.uids?.[0] || ''
 
       if (rcRoom.uids) {
-        Promise.all(
+        await Promise.all(
           rcRoom.uids.map(async (uid) => {
             await createMembership(rcRoom._id, uid)
             log.debug(`${uid} membership in direct chat ${rcRoom._id} created`)
@@ -100,7 +100,7 @@ export function mapRoom(rcRoom: RcRoom): MatrixRoom {
 }
 
 export async function createRoom(rcRoom: RcRoom): Promise<MatrixRoom> {
-  const room: MatrixRoom = mapRoom(rcRoom)
+  const room: MatrixRoom = await mapRoom(rcRoom)
   let sessionOptions = {}
   if (room._creatorId) {
     try {