fix(renderer/api/nt): don't throw error when no message available

FlysoftBeta · Jun 18, 2023 · 373eb23 · 373eb23
1 parent 34b6e39
commit 373eb23
Showing 1 changed file with 21 additions and 17 deletions.
diff --git a/src/renderer/api/nt/index.ts b/src/renderer/api/nt/index.ts
@@ -251,23 +251,27 @@ class NT extends (EventEmitter as new () => TypedEmitter<NTEvents>) {
     }
 
     async getPreviousMessages(peer: Peer, count: number = 20, startMsgId = "0") {
-        const msgs = await ntCall(
-            "ns-ntApi-2",
-            "nodeIKernelMsgService/getMsgsIncludeSelf",
-            [
-                {
-                    peer: destructPeer(peer),
-                    msgId: startMsgId,
-                    cnt: count,
-                    queryOrder: true,
-                },
-                undefined,
-            ]
-        );
-        const messages = (msgs[1][0].msgList as any[]).map((msg) =>
-            constructMessage(msg, this.pendingMediaDownloads)
-        );
-        return messages;
+        try {
+            const msgs = await ntCall(
+                "ns-ntApi-2",
+                "nodeIKernelMsgService/getMsgsIncludeSelf",
+                [
+                    {
+                        peer: destructPeer(peer),
+                        msgId: startMsgId,
+                        cnt: count,
+                        queryOrder: true,
+                    },
+                    undefined,
+                ]
+            );
+            const messages = (msgs.msgList as any[]).map((msg) =>
+                constructMessage(msg, this.pendingMediaDownloads)
+            );
+            return messages;
+        } catch {
+            return [];
+        }
     }
 }