X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=8sync%2Fsystems%2Firc.scm;h=5d2b66bc679e260d111658ebb9a2bb4f91984283;hb=6c17108201b3fe15bc3818d42a7100cd0513dd50;hp=40d02eb6eb1a6a34c4464e43e25d7fb15c9fd9f5;hpb=dc2155083a90de90e24f5341b837d4d96ce2898c;p=8sync.git diff --git a/8sync/systems/irc.scm b/8sync/systems/irc.scm index 40d02eb..5d2b66b 100755 --- a/8sync/systems/irc.scm +++ b/8sync/systems/irc.scm @@ -1,9 +1,5 @@ -#!/usr/bin/guile \ --e main -s -!# - ;;; 8sync --- Asynchronous programming for Guile -;;; Copyright (C) 2015 Christopher Allan Webber +;;; Copyright © 2015, 2016, 2017 Christopher Allan Webber ;;; ;;; This file is part of 8sync. ;;; @@ -164,8 +160,10 @@ (socket #:accessor irc-bot-socket) (actions #:allocation #:each-subclass #:init-value (build-actions - (init irc-bot-init) + (*init* irc-bot-init) + (*cleanup* irc-bot-cleanup) (main-loop irc-bot-main-loop) + (handle-line handle-line) (send-line irc-bot-send-line-action)))) (define (irc-bot-realname irc-bot) @@ -191,6 +189,9 @@ (<- (actor-id irc-bot) 'main-loop)) +(define (irc-bot-cleanup irc-bot message) + (close (irc-bot-socket irc-bot))) + (define (irc-bot-main-loop irc-bot message) (define socket (irc-bot-socket irc-bot)) (define line (string-trim-right (read-line socket) #\return)) @@ -240,12 +241,13 @@ irc-bot-send-line." (receive (channel-name line-text emote?) (condense-privmsg-line line-params) (let ((username (irc-line-username line-prefix))) - (handle-line irc-bot username channel-name - line-text emote?)))) + (<- (actor-id irc-bot) 'handle-line + username channel-name + line-text emote?)))) (_ (handle-misc-input irc-bot raw-line))))) -(define-method (handle-line (irc-bot ) username channel-name - line-text emote?) +(define-method (handle-line (irc-bot ) message + username channel-name line-text emote?) (echo-message irc-bot username channel-name line-text emote?)) (define-method (handle-misc-input (irc-bot ) raw-line)