From 455cdc4bf0debbfcf9eee9fe9586c8d998f78b51 Mon Sep 17 00:00:00 2001
From: Kieran <kieran@harkin.me>
Date: Tue, 3 Jan 2023 22:24:53 +0000
Subject: [PATCH] Bug fix

---
 src/element/Note.js     | 42 ++++++++++++++++++++----------------
 src/nostr/Connection.js | 48 +++++++++++++++++++++--------------------
 2 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/src/element/Note.js b/src/element/Note.js
index 8c6a3efc..37644fd0 100644
--- a/src/element/Note.js
+++ b/src/element/Note.js
@@ -111,27 +111,31 @@ export default function Note(props) {
             if (typeof f === "string") {
                 return f.split(UrlRegex).map(a => {
                     if (a.startsWith("http")) {
-                        let url = new URL(a);
-                        let ext = url.pathname.toLowerCase().match(FileExtensionRegex);
-                        if (ext) {
-                            switch (ext[1]) {
-                                case "gif":
-                                case "jpg":
-                                case "jpeg":
-                                case "png":
-                                case "bmp":
-                                case "webp": {
-                                    return <img key={url} src={url} />;
-                                }
-                                case "mp4":
-                                case "mkv":
-                                case "avi":
-                                case "m4v": {
-                                    return <video key={url} src={url} controls />
+                        try {
+                            let url = new URL(a);
+                            let ext = url.pathname.toLowerCase().match(FileExtensionRegex);
+                            if (ext) {
+                                switch (ext[1]) {
+                                    case "gif":
+                                    case "jpg":
+                                    case "jpeg":
+                                    case "png":
+                                    case "bmp":
+                                    case "webp": {
+                                        return <img key={url} src={url} />;
+                                    }
+                                    case "mp4":
+                                    case "mkv":
+                                    case "avi":
+                                    case "m4v": {
+                                        return <video key={url} src={url} controls />
+                                    }
                                 }
+                            } else {
+                                return <a href={url}>{url.toString()}</a>
                             }
-                        } else {
-                            return <a href={url}>{url.toString()}</a>
+                        } catch (e) {
+                            console.warn(`Not a valid url: ${a}`);
                         }
                     }
                     return a;
diff --git a/src/nostr/Connection.js b/src/nostr/Connection.js
index 27cb9da0..74ea4c3a 100644
--- a/src/nostr/Connection.js
+++ b/src/nostr/Connection.js
@@ -43,29 +43,31 @@ export default class Connection {
     }
 
     OnMessage(e) {
-        let msg = JSON.parse(e.data);
-        let tag = msg[0];
-        switch (tag) {
-            case "EVENT": {
-                this._OnEvent(msg[1], msg[2]);
-                break;
-            }
-            case "EOSE": {
-                this._OnEnd(msg[1]);
-                break;
-            }
-            case "OK": {
-                // feedback to broadcast call
-                console.debug("OK: ", msg[1]);
-                break;
-            }
-            case "NOTICE": {
-                console.warn(`[${this.Address}] NOTICE: ${msg[1]}`);
-                break;
-            }
-            default: {
-                console.warn(`Unknown tag: ${tag}`);
-                break;
+        if (e.data.length > 0) {
+            let msg = JSON.parse(e.data);
+            let tag = msg[0];
+            switch (tag) {
+                case "EVENT": {
+                    this._OnEvent(msg[1], msg[2]);
+                    break;
+                }
+                case "EOSE": {
+                    this._OnEnd(msg[1]);
+                    break;
+                }
+                case "OK": {
+                    // feedback to broadcast call
+                    console.debug("OK: ", msg[1]);
+                    break;
+                }
+                case "NOTICE": {
+                    console.warn(`[${this.Address}] NOTICE: ${msg[1]}`);
+                    break;
+                }
+                default: {
+                    console.warn(`Unknown tag: ${tag}`);
+                    break;
+                }
             }
         }
     }