From cd77f8ba503997b9894fca442dc05f2707689b15 Mon Sep 17 00:00:00 2001
From: Bruno Deferrari <utizoc@gmail.com>
Date: Thu, 7 Aug 2008 23:02:29 -0300
Subject: [PATCH] irc.client: Handle nick changes in participant lists and
forward to channels with the participant. Forward mode messages to channels.
---
extra/irc/client/client-tests.factor | 37 +++++++++++++++++++++++-----
extra/irc/client/client.factor | 31 +++++++++++++++++------
2 files changed, 55 insertions(+), 13 deletions(-)
diff --git a/extra/irc/client/client-tests.factor b/extra/irc/client/client-tests.factor
index 97532cbd95..2b4b501952 100644
--- a/extra/irc/client/client-tests.factor
+++ b/extra/irc/client/client-tests.factor
@@ -30,7 +30,7 @@ M: mb-writer stream-nl ( mb-writer -- )
! to be used inside with-irc-client quotations
: %add-named-listener ( listener -- ) [ name>> ] keep set+run-listener ;
: %join ( channel -- ) <irc-channel-listener> irc> add-listener ;
-: %push-line ( line -- ) irc> stream>> in>> push-line yield yield ;
+: %push-line ( line -- ) irc> stream>> in>> push-line yield ;
: read-matching-message ( listener quot: ( msg -- ? ) -- irc-message )
[ in-messages>> 0.1 seconds ] dip mailbox-get-timeout? ;
@@ -96,7 +96,14 @@ M: mb-writer stream-nl ( mb-writer -- )
] unit-test
] with-irc
-! Participants lists tests
+[ { mode } [
+ "#factortest" <irc-channel-listener> [ %add-named-listener ] keep
+ ":ircserver.net MODE #factortest +ns" %push-line
+ [ mode? ] read-matching-message class
+ ] unit-test
+] with-irc
+
+! Participant lists tests
[ { H{ { "somedude" +normal+ } } } [
"#factortest" <irc-channel-listener> [ %add-named-listener ] keep
":somedude!n=user@isp.net JOIN :#factortest" %push-line
@@ -134,8 +141,17 @@ M: mb-writer stream-nl ( mb-writer -- )
] unit-test
] with-irc
+[ { H{ { "somedude2" +normal+ } } } [
+ "#factortest" <irc-channel-listener>
+ H{ { "somedude" +normal+ } } clone >>participants
+ [ %add-named-listener ] keep
+ ":somedude!n=user2@isp.net NICK :somedude2" %push-line
+ participants>>
+ ] unit-test
+] with-irc
+
! Namelist change notification
-[ { T{ participant-changed f f f } } [
+[ { T{ participant-changed f f f f } } [
"#factortest" <irc-channel-listener> [ %add-named-listener ] keep
":ircserver.net 353 factorbot @ #factortest :@factorbot " %push-line
":ircserver.net 366 factorbot #factortest :End of /NAMES list." %push-line
@@ -143,11 +159,20 @@ M: mb-writer stream-nl ( mb-writer -- )
] unit-test
] with-irc
-[ { T{ participant-changed f "somedude" +part+ } } [
+[ { T{ participant-changed f "somedude" +part+ f } } [
"#factortest" <irc-channel-listener>
- H{ { "somedude" +normal+ } } clone >>participants
+ H{ { "somedude" +normal+ } } clone >>participants
[ %add-named-listener ] keep
":somedude!n=user@isp.net QUIT" %push-line
[ participant-changed? ] read-matching-message
] unit-test
-] with-irc
\ No newline at end of file
+] with-irc
+
+[ { T{ participant-changed f "somedude" +nick+ "somedude2" } } [
+ "#factortest" <irc-channel-listener>
+ H{ { "somedude" +normal+ } } clone >>participants
+ [ %add-named-listener ] keep
+ ":somedude!n=user2@isp.net NICK :somedude2" %push-line
+ [ participant-changed? ] read-matching-message
+ ] unit-test
+] with-irc
diff --git a/extra/irc/client/client.factor b/extra/irc/client/client.factor
index 07885a3f82..e91767b22d 100644
--- a/extra/irc/client/client.factor
+++ b/extra/irc/client/client.factor
@@ -41,6 +41,7 @@ SYMBOL: +normal+
SYMBOL: +join+
SYMBOL: +part+
SYMBOL: +mode+
+SYMBOL: +nick+
! listener objects
: <irc-listener> ( -- irc-listener ) <mailbox> <mailbox> irc-listener boa ;
@@ -59,7 +60,7 @@ SYMBOL: +mode+
! Message objects
! ======================================
-TUPLE: participant-changed nick action ;
+TUPLE: participant-changed nick action parameter ;
C: <participant-changed> participant-changed
SINGLETON: irc-listener-end ! send to a listener to stop its execution
@@ -111,7 +112,7 @@ M: irc-listener to-listener ( message irc-listener -- )
: (remove-participant) ( nick listener -- )
[ participants>> delete-at ]
- [ [ +part+ <participant-changed> ] dip to-listener ] 2bi ;
+ [ [ +part+ f <participant-changed> ] dip to-listener ] 2bi ;
: remove-participant ( nick channel -- )
listener> [ (remove-participant) ] [ drop ] if* ;
@@ -124,10 +125,21 @@ M: irc-listener to-listener ( message irc-listener -- )
: remove-participant-from-all ( nick -- )
dup listeners-with-participant [ (remove-participant) ] with each ;
+: notify-rename ( newnick oldnick listener -- )
+ [ participant-changed new +nick+ >>action
+ [ (>>nick) ] [ (>>parameter) ] [ ] tri ] dip to-listener ;
+
+: rename-participant ( newnick oldnick listener -- )
+ [ participants>> [ delete-at* drop ] [ [ swap ] dip set-at ] bi ]
+ [ notify-rename ] 3bi ;
+
+: rename-participant-in-all ( oldnick newnick -- )
+ swap dup listeners-with-participant [ rename-participant ] with with each ;
+
: add-participant ( mode nick channel -- )
listener> [
[ participants>> set-at ]
- [ [ +join+ <participant-changed> ] dip to-listener ] 2bi
+ [ [ +join+ f <participant-changed> ] dip to-listener ] 2bi
] [ 2drop ] if* ;
DEFER: me?
@@ -211,9 +223,14 @@ M: quit handle-incoming-irc ( quit -- )
[ prefix>> parse-name remove-participant-from-all ]
bi ;
-! FIXME: implement this
-! M: mode handle-incoming-irc ( mode -- ) call-next-method ;
-! M: nick handle-incoming-irc ( nick -- ) call-next-method ;
+M: mode handle-incoming-irc ( mode -- ) ! FIXME: modify participant list
+ dup channel>> to-listener ;
+
+M: nick handle-incoming-irc ( nick -- )
+ [ dup prefix>> parse-name listeners-with-participant
+ [ to-listener ] with each ]
+ [ [ prefix>> parse-name ] [ trailing>> ] bi rename-participant-in-all ]
+ bi ;
: >nick/mode ( string -- nick mode )
dup first "+@" member? [ unclip ] [ 0 ] if participant-mode ;
@@ -225,7 +242,7 @@ M: quit handle-incoming-irc ( quit -- )
M: names-reply handle-incoming-irc ( names-reply -- )
[ names-reply>participants ] [ channel>> listener> ] bi [
[ (>>participants) ]
- [ [ f f <participant-changed> ] dip name>> to-listener ] bi
+ [ [ f f f <participant-changed> ] dip name>> to-listener ] bi
] [ drop ] if* ;
M: irc-broadcasted-message handle-incoming-irc ( irc-broadcasted-message -- )