Remove (8sync agenda) as an import from actors.scm and add wrap-apply.

[8sync.git] / demos / ircbot.scm

diff --git a/demos/ircbot.scm b/demos/ircbot.scm
index ec381f0b83ea3b03b356fdc9e3b6eaed85a270a6..c8571561d9582285c24e5601fae9c181e76a9342 100755 (executable)
--- a/demos/ircbot.scm
+++ b/demos/ircbot.scm
@@ -3,7 +3,7 @@
 !#
 
 ;;; 8sync --- Asynchronous programming for Guile
-;;; Copyright (C) 2015 Christopher Allan Webber <cwebber@dustycloud.org>
+;;; Copyright © 2015, 2016, 2017 Christopher Allan Webber <cwebber@dustycloud.org>
 ;;;
 ;;; This file is part of 8sync.
 ;;;
@@ -22,10 +22,17 @@
 
 (use-modules (8sync)
              (8sync systems irc)
+             (8sync repl)
+             (oop goops)
              (srfi srfi-37)
-             (ice-9 match))
+             (ice-9 format)
+             (ice-9 match)
+             (fibers conditions))
 
-(define (handle-line irc-bot speaker channel line emote?)
+(define-class <my-irc-bot> (<irc-bot>))
+
+(define-method (handle-line (irc-bot <my-irc-bot>) message
+                            speaker channel line emote?)
   (define my-name (irc-bot-username irc-bot))
   (define (looks-like-me? str)
     (or (equal? str my-name)
@@ -35,19 +42,19 @@
      (match action
        ;; The classic botsnack!
        ("botsnack"
-        (<- irc-bot (actor-id irc-bot) 'send-line channel
+        (<- (actor-id irc-bot) 'send-line channel
             "Yippie! *does a dance!*"))
        ;; Return greeting
        ((or "hello" "hello!" "hello." "greetings" "greetings." "greetings!"
             "hei" "hei." "hei!" "hi" "hi!")
-        (<- irc-bot (actor-id irc-bot) 'send-line channel
+        (<- (actor-id irc-bot) 'send-line channel
             (format #f "Oh hi ~a!" speaker)))
 
        ;; --->  Add yours here <---
 
        ;; Default
        (_
-        (<- irc-bot (actor-id irc-bot) 'send-line channel
+        (<- (actor-id irc-bot) 'send-line channel
             "*stupid puppy look*"))))
     ;; Otherwise... just spit the output to current-output-port or whatever
     (_
@@ -81,7 +88,10 @@
                    (option '("channels") #t #f
                            (lambda (opt name arg result)
                              `(#:channels ,(string-split arg #\,)
-                               ,@result))))
+                               ,@result)))
+                   (option '("repl") #f #t
+                           (lambda (opt name arg result)
+                             `(#:repl ,(or arg #t) ,@result))))
              (lambda (opt name arg result)
                (format #t "Unrecognized option `~a'\n" name)
                (exit 1))
@@ -93,19 +103,25 @@
                   (server "irc.freenode.net")
                   (channels '("##botchat"))
                   (repl #f))
-  (define hive (make-hive))
-  (define irc-bot
-    (hive-create-actor* hive <irc-bot> "irc-bot"
-                        #:line-handler handle-line
-                        ;; TODO: move these to argument parsing
-                        #:username username
-                        #:server server
-                        #:channels channels))
-  ;; TODO: load REPL
-  (ez-run-hive hive (list (bootstrap-message hive irc-bot 'init))))
+  (run-hive
+   (lambda (hive)
+     (define irc-bot
+       (bootstrap-actor* hive <my-irc-bot> "irc-bot"
+                         #:username username
+                         #:server server
+                         #:channels channels))
+     (define repl-manager
+       (cond
+        ((string? repl)
+         (bootstrap-actor* hive <repl-manager> "repl"
+                           #:path repl))
+        (repl
+         (bootstrap-actor* hive <repl-manager> "repl"))))
+
+     (wait (make-condition)))))
 
 (define (main args)
-  (define parsed-args (parse-args "ircbot.scm" (pk 'args args)))
+  (define parsed-args (parse-args "ircbot.scm" args))
   (apply (lambda* (#:key username #:allow-other-keys)
            (when (not username)
              (display "Error: username not specified!")