Make IRC bot easier to add commands to

diff --git a/demos/ircbot.scm b/demos/ircbot.scm
index eec40faf4cfa9b30d00f35e69402fc006afde70a..0aef0d5430cc93c9849973c7f33727f76f920758 100755 (executable)
--- a/demos/ircbot.scm
+++ b/demos/ircbot.scm
@@ -19,15 +19,33 @@
 ;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ;; 02110-1301 USA
 
 ;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ;; 02110-1301 USA
 

-(use-modules (eightsync systems irc))
+(use-modules (eightsync systems irc)
+             (eightsync agenda)
+             (ice-9 match))

 
 (define (handle-message socket my-name speaker
 
 (define (handle-message socket my-name speaker

-                        channel-name message is-action)
-  (if is-action
-      (format #t "~a emoted ~s in channel ~a\n"
-              speaker message channel-name)
-      (format #t "~a said ~s in channel ~a\n"
-              speaker message channel-name)))
+                        channel message is-action)
+  (define (looks-like-me? str)
+    (or (equal? str my-name)
+        (equal? str (string-concatenate (list my-name ":")))))
+  (match (string-split message #\space)
+    (((? looks-like-me? _) action action-args ...)
+     (match action
+       ("botsnack"
+        (irc-format socket "PRIVMSG ~a :Yippie! *does a dance!*" channel))
+       ;; Add yours here
+       (_
+        (irc-format socket "PRIVMSG ~a :*stupid puppy look*" channel))))
+    (_ 
+     (cond 
+      (is-action
+       (format #t "~a emoted ~s in channel ~a\n"
+               speaker message channel))
+      (else
+       (format #t "~a said ~s in channel ~a\n"
+               speaker message channel))))))

 
 (define main
 
 (define main

-  (make-irc-bot-cli))
+  (make-irc-bot-cli (make-handle-line
+                     #:handle-privmsg (wrap-apply handle-message))))
+

diff --git a/eightsync/systems/irc.scm b/eightsync/systems/irc.scm
index bf450b94efc526ef680e9472c7804438b5386ee9..ac9c4e64b65a50672a1883df67bd33cf98860f5c 100755 (executable)
--- a/eightsync/systems/irc.scm
+++ b/eightsync/systems/irc.scm
@@ -187,7 +187,7 @@
                (string-join (cons first-word rest-message) " ")
                #f)))))
 
                (string-join (cons first-word rest-message) " ")
                #f)))))
 

-(define (echo-back-message my-name speaker
+(define (echo-back-message socket my-name speaker

                            channel-name message is-action)
   (if is-action
       (format #t "~a emoted ~s in channel ~a\n"
                            channel-name message is-action)
   (if is-action
       (format #t "~a emoted ~s in channel ~a\n"


@@ -208,7 +208,8 @@
          (receive (channel-name message is-action)
              (condense-privmsg-line (irc-line-params parsed-line))
            (let ((username (irc-line-username parsed-line)))
          (receive (channel-name message is-action)
              (condense-privmsg-line (irc-line-params parsed-line))
            (let ((username (irc-line-username parsed-line)))

-             (handle-privmsg my-username username channel-name message is-action))))
+             (handle-privmsg socket my-username username
+                             channel-name message is-action))))

         (_
          (display line)
          (newline)))))
         (_
          (display line)
          (newline)))))