{{ROOM_TITLE}}

diff --git a/spidercat.scm b/spidercat.scm index 15bf2ab..bdab927 100644 --- a/spidercat.scm +++ b/spidercat.scm @@ -126,6 +126,10 @@ ("ROOM_ID" . ,(uri:uri-encode-string channel))))) +(define (room-send-html) + (html-from-template "templates/room-send.html" '())) + + ;; Generate the HTML listing a room's chat messages. (define (room-messages-html irc-dir channel) (html-from-template @@ -189,23 +193,22 @@ [(equal? sub-path "messages") (spiffy:send-response status: 'ok body: (room-messages-html irc-dir channel))] + [(equal? sub-path "send") + (spiffy:send-response status: 'ok + body: (room-send-html))] [(or (not sub-path) (string=? sub-path "")) (spiffy:send-response status: 'ok body: (room-index-html irc-dir channel))]))) - - -(define (http-send-room-message irc-dir #!optional request path) - (let ([request-data (intarweb:read-urlencoded-request-data request 50000)] - [channel (third path)]) +(define (http-post-room-dir irc-dir #!optional request path) + (let* ([channel (third path)] + [request-data (intarweb:read-urlencoded-request-data request 50000)]) (if (alist-ref 'message request-data) (begin - (send-message irc-dir channel (alist-ref 'message request-data)) - ;; We don't want the page to render before the message has been sent! - ;; Then the user might think, “uhh my message not sent¿?” - (sleep 1))) - (http-get-room-dir irc-dir request path))) + (send-message irc-dir channel (alist-ref 'message request-data)) + (sleep 1))) + (http-get-room-dir irc-dir request (list '/ "room" channel "messages")))) ;; Send response for the / index. @@ -239,7 +242,7 @@ ;; An associative list of POST handlers, to be used by assoc-by-path. (define http-post-handlers - `(((/ "room" "*") . ,http-send-room-message))) + `(((/ "room" "*") . ,http-post-room-dir))) ;; Get a pair from an associative list based on the closest match to the diff --git a/templates/room-index.html b/templates/room-index.html index 8ee00f5..b7d4f1a 100644 --- a/templates/room-index.html +++ b/templates/room-index.html @@ -7,7 +7,10 @@ - + + + + diff --git a/templates/room-messages.html b/templates/room-messages.html index 89bc08e..cd85d54 100644 --- a/templates/room-messages.html +++ b/templates/room-messages.html @@ -5,15 +5,11 @@ - + {{LIST_ITEMS}}

- diff --git a/templates/room-send.html b/templates/room-send.html new file mode 100644 index 0000000..cd44c17 --- /dev/null +++ b/templates/room-send.html @@ -0,0 +1,16 @@ + + + + {{ROOM_TITLE}} + + + + + + + + +