projects
/
8sync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the wrap-apply surrounding websocket-client-loop in <websocket-server>
[8sync.git]
/
demos
/
ircbot.scm
diff --git
a/demos/ircbot.scm
b/demos/ircbot.scm
index eaae113f80bf07d34b391652eec024d9ca728fc7..81940fc66744e86206e9449922d1fb6dba44f3ec 100755
(executable)
--- a/
demos/ircbot.scm
+++ b/
demos/ircbot.scm
@@
-3,7
+3,7
@@
!#
;;; 8sync --- Asynchronous programming for Guile
!#
;;; 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.
;;;
;;;
;;; This file is part of 8sync.
;;;
@@
-26,12
+26,13
@@
(oop goops)
(srfi srfi-37)
(ice-9 format)
(oop goops)
(srfi srfi-37)
(ice-9 format)
- (ice-9 match))
+ (ice-9 match)
+ (fibers conditions))
(define-class <my-irc-bot> (<irc-bot>))
(define-class <my-irc-bot> (<irc-bot>))
-(define-method (handle-line (irc-bot <my-irc-bot>)
speaker channel
- line emote?)
+(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)
(define my-name (irc-bot-username irc-bot))
(define (looks-like-me? str)
(or (equal? str my-name)
@@
-41,19
+42,19
@@
(match action
;; The classic botsnack!
("botsnack"
(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!")
"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
(_
(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
(_
"*stupid puppy look*"))))
;; Otherwise... just spit the output to current-output-port or whatever
(_
@@
-102,28
+103,22
@@
(server "irc.freenode.net")
(channels '("##botchat"))
(repl #f))
(server "irc.freenode.net")
(channels '("##botchat"))
(repl #f))
- (define hive (make-hive))
- (define irc-bot
- (hive-create-actor* hive <my-irc-bot> "irc-bot"
- #:username username
- #:server server
- #:channels channels))
- (define repl-manager
- (cond
- ((string? repl)
- (hive-create-actor* hive <repl-manager> "repl"
- #:path repl))
- (repl
- (hive-create-actor* hive <repl-manager> "repl"))))
+ (run-hive
+ (lambda (hive)
+ (define irc-bot
+ (create-actor* <my-irc-bot> "irc-bot"
+ #:username username
+ #:server server
+ #:channels channels))
+ (define repl-manager
+ (cond
+ ((string? repl)
+ (create-actor* <repl-manager> "repl"
+ #:path repl))
+ (repl
+ (create-actor* <repl-manager> "repl"))))
- (define initial-messages
- (if repl
- (list (bootstrap-message hive irc-bot 'init)
- (bootstrap-message hive repl-manager 'init))
- (list (bootstrap-message hive irc-bot 'init))))
-
- ;; TODO: load REPL
- (ez-run-hive hive initial-messages))
+ (wait (make-condition)))))
(define (main args)
(define parsed-args (parse-args "ircbot.scm" args))
(define (main args)
(define parsed-args (parse-args "ircbot.scm" args))