From 075e98771e55ff073873ffb5e7ca3b2d158ac25a Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Mon, 23 Nov 2015 16:10:54 -0600 Subject: [PATCH] easier passing in of line handler things --- eightsync/systems/irc.scm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/eightsync/systems/irc.scm b/eightsync/systems/irc.scm index a802167..bf450b9 100755 --- a/eightsync/systems/irc.scm +++ b/eightsync/systems/irc.scm @@ -234,19 +234,22 @@ (_ #f)))) irc-handler)) +(define default-line-handler (make-handle-line)) (define* (queue-and-start-irc-agenda! agenda socket #:key (username "syncbot") (inet-port default-irc-port) - (handler (make-basic-irc-handler - (lambda args - (apply (make-handle-line) args)) - username)) + (line-handler default-line-handler) (channels '())) (dynamic-wind (lambda () #f) (lambda () - (enq! (agenda-queue agenda) (wrap (install-socket socket handler))) + (enq! (agenda-queue agenda) + (wrap (install-socket + socket + (make-basic-irc-handler + line-handler + username)))) (enq! (agenda-queue agenda) (wrap (handle-login socket username #:channels channels))) (start-agenda agenda)) @@ -270,7 +273,7 @@ (channels (value #t)) (listen))) -(define* (make-irc-bot-cli) +(define* (make-irc-bot-cli #:optional (line-handler default-line-handler)) (define (main args) (let* ((options (getopt-long args option-spec)) (hostname (option-ref options 'server #f)) @@ -290,7 +293,8 @@ (irc-socket-setup hostname port) #:inet-port port #:username username - #:channels (string-split channels #\space)))) + #:channels (string-split channels #\space) + #:line-handler line-handler))) main) (define main (make-irc-bot-cli)) -- 2.31.1