X-Git-Url: https://jxself.org/git/?p=8sync.git;a=blobdiff_plain;f=demos%2Firc.scm;h=a5e9ba4426fb6e9f1e5c5a0b0b8d558584a3f561;hp=10436be6f91d886c0e682d0dffb2ee76e2803c64;hb=9c8d37765bca38ffe643434ca154999f8e602a6a;hpb=0784ebade216f3d24c3e60602806a5955f0f572c

diff --git a/demos/irc.scm b/demos/irc.scm
index 10436be..a5e9ba4 100755
--- a/demos/irc.scm
+++ b/demos/irc.scm
@@ -22,6 +22,7 @@
 (use-modules (eightsync repl)
              (eightsync agenda)
              (ice-9 getopt-long)
+             (ice-9 format)
              (ice-9 q)
              (ice-9 match))
 
@@ -43,11 +44,91 @@
   (display "Installing socket...\n")   ; debugging :)
   (make-port-request socket #:read handler))
 
-(define (handle-line socket line)
-  (display line)
-  (newline))
+(define irc-eol "\r\n")
 
-(define (make-simple-irc-handler handle-line)
+(define (irc-line line)
+  (string-concatenate (list line irc-eol)))
+
+(define-syntax-rule (irc-format dest format-string rest ...)
+  (let ((line (string-concatenate
+               (list (format #f format-string rest ...)
+                     irc-eol))))
+    (match dest
+      (#f line)
+      (#t (display line))
+      (else
+       (display line dest)))))
+
+(define* (irc-display line #:optional dest)
+  (if dest
+      (display (irc-line line) dest)
+      (display (irc-line dest))))
+
+(define* (handle-login socket username
+                       #:key
+                       (hostname "*")
+                       (servername "*")
+                       (realname username)
+                       (channels '()))
+  (irc-format socket "USER ~a ~a ~a :~a"
+              username hostname servername realname)
+  (irc-format socket "NICK ~a" username)
+  (for-each
+   (lambda (channel)
+     (irc-format socket "JOIN ~a" channel))
+   channels))
+
+(define (startswith-colon? str)
+  (and (> (string-length str) 0)
+       (eq? (string-ref str 0)
+            #\:)))
+
+(define (parse-line line)
+  (define (parse-params pre-params)
+    ;; This is stupid and imperative but I can't wrap my brain around
+    ;; the right way to do it in a functional way :\
+    (let ((param-list '())
+          (currently-building '()))
+      (for-each
+       (lambda (param-item)
+         (cond
+          ((startswith-colon? param-item)
+           (if (not (eq? currently-building '()))
+               (set! param-list
+                     (cons
+                      (reverse currently-building)
+                      param-list)))
+           (set! currently-building (list param-item)))
+          (else
+           (set! currently-building (cons param-item currently-building)))))
+       pre-params)
+      ;; We're still building something, so tack that on there
+      (if (not (eq? currently-building '()))
+          (set! param-list
+                (cons (reverse currently-building) param-list)))
+      ;; return the reverse of the param list
+      (reverse param-list)))
+
+  (match (string-split line #\space)
+    (((? startswith-colon? prefix)
+      command
+      pre-params ...)
+     (list prefix command
+           (parse-params2 pre-params)))
+    ((command pre-params ...)
+     (list #f command (parse-params2 pre-params)))))
+
+
+(define (handle-line socket line my-username)
+  (match (string-split line #\space)
+    (("PING" rest ...)
+     (irc-display "PONG" socket)
+     (display "PONG'ed back ;)\n"))
+    (_
+     (display line)
+     (newline))))
+
+(define (make-simple-irc-handler handle-line username)
   (let ((buffer '()))
     (define (reset-buffer)
       (set! buffer '()))
@@ -60,19 +141,27 @@
           ((#\newline #\return (? char? line-chars) ...)
            (%sync (%run (handle-line
                          socket
-                         (list->string (reverse line-chars)))))
+                         (list->string (reverse line-chars))
+                         username)))
            ;; reset buffer
            (set! buffer '()))
           (_ #f))))
     irc-handler))
 
 (define* (queue-and-start-irc-agenda! agenda socket #:key
+                                      (username "syncbot")
                                       (inet-port default-irc-port)
-                                      (handler (make-simple-irc-handler handle-line)))
+                                      (handler (make-simple-irc-handler
+                                                (lambda args
+                                                  (apply handle-line args))
+                                                username))
+                                      (channels '()))
   (dynamic-wind
     (lambda () #f)
     (lambda ()
       (enq! (agenda-queue agenda) (wrap (install-socket socket handler)))
+      (enq! (agenda-queue agenda) (wrap (handle-login socket username
+                                                      #:channels channels)))
       (start-agenda agenda))
     (lambda ()
       (display "Cleaning up...\n")
@@ -91,6 +180,7 @@
            ,(lambda (s)
               (if (string->number s) #t #f))))
     (username (single-char #\u) (required? #t) (value #t))
+    (channels (value #t))
     (listen)))
 
 (define (main args)
@@ -99,12 +189,17 @@
          (port (or (option-ref options 'port #f)
                    default-irc-port))
          (username (option-ref options 'username #f))
-         (listen (option-ref options 'listen #f)))
+         (listen (option-ref options 'listen #f))
+         (channels (option-ref options 'channels ""))
+         (agenda (make-agenda)))
     (display `((server ,hostname) (port ,port) (username ,username)
-               (listen ,listen)))
+               (listen ,listen) (channels-split ,(string-split channels #\space))))
     (newline)
+    (if listen
+        (spawn-and-queue-repl-server! agenda))
     (queue-and-start-irc-agenda!
-     (make-agenda)
+     agenda
      (irc-socket-setup hostname port)
      #:inet-port port
-     #:handler (make-simple-irc-handler handle-line))))
+     #:username username
+     #:channels (string-split channels #\space))))