X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=eightsync%2Fsystems%2Firc.scm;h=da39b5a8033f98a59ae81b3cad1ee7f9becfe8a8;hb=3ee18e4426de00fd9f654b37f5214388eafabf78;hp=e45db1a7c5b81be378a8327ccf4142c058be25d4;hpb=a7bc314242cab78532f2a6b18ceb5863cfc863ef;p=8sync.git

diff --git a/eightsync/systems/irc.scm b/eightsync/systems/irc.scm
index e45db1a..da39b5a 100755
--- a/eightsync/systems/irc.scm
+++ b/eightsync/systems/irc.scm
@@ -30,7 +30,7 @@
   #:use-module (ice-9 match)
   #:export (;; The only things you definitely need if writing a bot
             make-irc-bot-cli            
-            irc-format irc-display
+            irc-format irc-display irc-send-message irc-send-formatted
             
             ;; Useful things if you're making something more complicated
             irc-line
@@ -91,6 +91,14 @@
       (display (irc-line line) dest)
       (display (irc-line dest))))
 
+(define (irc-send-message socket channel message)
+  (irc-format socket "PRIVMSG ~a :~a" channel message))
+
+(define-syntax-rule (irc-send-formatted socket channel format-string
+                                        args ...)
+  (irc-format socket "PRIVMSG ~a :~a" channel
+              (format #f format-string args ...)))
+
 (define* (handle-login socket username
                        #:key
                        (hostname "*")
@@ -226,12 +234,15 @@
         (set! buffer (cons (read-char socket) buffer))
         (match buffer
           ((#\newline #\return (? char? line-chars) ...)
-           (%8sync (%run (handle-line
-                         socket
-                         (list->string (reverse line-chars))
-                         username)))
-           ;; reset buffer
-           (set! buffer '()))
+           (let ((ready-line (list->string (reverse line-chars))))
+             ;; reset buffer
+             (set! buffer '())
+             ;; run it
+             ;; @@: does this need to be %8sync?
+             (%8sync (%run (handle-line
+                            socket
+                            ready-line
+                            username)))))
           (_ #f))))
     irc-handler))
 
@@ -274,7 +285,9 @@
     (channels (value #t))
     (listen)))
 
-(define* (make-irc-bot-cli #:optional (line-handler default-line-handler))
+(define* (make-irc-bot-cli #:optional
+                           (line-handler default-line-handler)
+                           (print-and-continue-on-error #t))
   (define (main args)
     (let* ((options (getopt-long args option-spec))
            (hostname (option-ref options 'server #f))
@@ -283,7 +296,9 @@
            (username (option-ref options 'username #f))
            (listen (option-ref options 'listen #f))
            (channels (option-ref options 'channels ""))
-           (agenda (make-agenda)))
+           (agenda (if print-and-continue-on-error
+                       (make-agenda #:pre-unwind-handler print-error-and-continue)
+                       (make-agenda))))
       (display `((server ,hostname) (port ,port) (username ,username)
                  (listen ,listen) (channels-split ,(string-split channels #\space))))
       (newline)
@@ -299,4 +314,3 @@
   main)
 
 (define main (make-irc-bot-cli))
-