From ed33fd2a327207a5d68cb65eee5506642f68c71f Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Wed, 5 Apr 2023 09:44:21 +0100
Subject: [PATCH] Fix event stream image URLs

---
 docker-compose.yml         | 4 ++--
 src/cli/presence-server.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index cced5c2..7fdbdca 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -47,11 +47,11 @@ services:
     labels:
       traefik.enable: true
       traefik.http.routers.nxapi-presence.entrypoints: websecure
-      traefik.http.routers.nxapi-presence.rule: Host(`${TRAEFIK_HOST:-nxapi.ta.fancy.org.uk}`) && (Path(`/api/presence`) || PathPrefix(`/api/presence/`))
+      traefik.http.routers.nxapi-presence.rule: Host(`${TRAEFIK_HOST:-nxapi.ta.fancy.org.uk}`) && (Path(`/api/presence`) || PathPrefix(`/api/presence/`) || PathPrefix(`/api/splatnet3/resources/`))
       traefik.http.routers.nxapi-presence.tls: true
       traefik.http.services.nxapi-presence.loadbalancer.server.port: 80
     environment:
-      DEBUG: '*,-express:*'
+      DEBUG: '*,-express:*,-send'
       ZNC_PROXY_URL: http://znc-proxy/api/znc
       NXAPI_PRESENCE_SERVER_USER: ${NXAPI_PRESENCE_SERVER_USER:-}
       NXAPI_PRESENCE_SERVER_SPLATNET3_PROXY_URL: http://presence-splatnet3-proxy/api/splatnet3-presence
diff --git a/src/cli/presence-server.ts b/src/cli/presence-server.ts
index 9747579..f90038b 100644
--- a/src/cli/presence-server.ts
+++ b/src/cli/presence-server.ts
@@ -1064,7 +1064,7 @@ class Server extends HttpServer {
             [keyof typeof result, typeof result[keyof typeof result]][]
         ) {
             if (typeof key !== 'string') continue;
-            stream.sendEvent(key, value);
+            stream.sendEvent(key, {...value, [ResourceUrlMapSymbol]: result[ResourceUrlMapSymbol]});
         }
 
         await new Promise(rs => setTimeout(rs, this.update_interval));
@@ -1083,7 +1083,7 @@ class Server extends HttpServer {
                 ) {
                     if (typeof key !== 'string') continue;
                     if (JSON.stringify(value) === JSON.stringify(last_result[key])) continue;
-                    stream.sendEvent(key, value);
+                    stream.sendEvent(key, {...value, [ResourceUrlMapSymbol]: result[ResourceUrlMapSymbol]});
                 }
 
                 last_result = result;