Switch things over to using scrubl

[mudsync.git] / mudsync / networking.scm

diff --git a/mudsync/networking.scm b/mudsync/networking.scm
index 1a8ece5002b4e47fad5c433e3e9cace5cdc8863c..33ad424f3234c497f01e8de21bf0580bad128af0 100644 (file)
--- a/mudsync/networking.scm
+++ b/mudsync/networking.scm
@@ -26,6 +26,9 @@
   #:use-module (ice-9 receive)
   #:use-module (oop goops)
 
+  ;; Formatting
+  #:use-module (mudsync scrubl)
+
   ;; used by web server only
   #:use-module (sxml simple)
   #:use-module (web request)
@@ -190,16 +193,18 @@
 
 (define* (nm-send-to-client-id nm message #:key client data)
   "Send DATA to TO-CLIENT id"
+  (define formatted-data
+    (scrubl-write scrubl-sxml data))
   (define client-obj (hash-ref (nm-clients nm) client))
   (match client-obj
     (#f (throw 'no-such-client
                "Asked to send data to client but that client doesn't exist"
                #:client-id client
-               #:data data))
+               #:data formatted-data))
     (('socket . client-socket)
-     (display data client-socket))
+     (display formatted-data client-socket))
     (('websocket . ws-client-id)
-     (<- (.web-server nm) 'ws-send ws-client-id data))))
+     (<- (.web-server nm) 'ws-send ws-client-id formatted-data))))
 
 (define (nm-incoming-line-action nm message client-id line)
   "Handle LINE coming in, probably from an external message handler,