From bb38d31922cb0490f4f0ab9c06039181011cd9a9 Mon Sep 17 00:00:00 2001
From: Bruno Deferrari <utizoc@gmail.com>
Date: Wed, 28 May 2008 21:59:49 -0300
Subject: [PATCH 01/11] irc.client: Support for listening to nicknames too.

---
 extra/irc/client/client.factor | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/extra/irc/client/client.factor b/extra/irc/client/client.factor
index 19dca48e1d..cc0b4378c7 100644
--- a/extra/irc/client/client.factor
+++ b/extra/irc/client/client.factor
@@ -110,6 +110,9 @@ TUPLE: unhandled < irc-message ;
 ! Server message handling
 ! ======================================
 
+: irc-message-origin ( irc-message -- name )
+    dup name>> irc-client> nick>> name>> = [ sender>> ] [ name>> ] if ;
+
 USE: prettyprint
 
 GENERIC: handle-incoming-irc ( irc-message -- )
@@ -127,8 +130,8 @@ M: nick-in-use handle-incoming-irc ( nick-in-use -- )
     name>> "_" append /NICK ;
 
 M: privmsg handle-incoming-irc ( privmsg -- )
-    dup name>> irc-client> listeners>> at
-    [ in-messages>> mailbox-put ] [ drop ] if* ;
+    dup dup . irc-message-origin irc-client> listeners>> at
+    [ in-messages>> mailbox-put ] [ dup "drop" . . drop ] if* ;
 
 M: join handle-incoming-irc ( join -- )
     irc-client> join-messages>> mailbox-put ;
@@ -222,13 +225,15 @@ M: privmsg handle-outgoing-irc ( privmsg -- )
 GENERIC: add-name ( name obj -- obj )
 M: object add-name nip ;
 M: privmsg add-name swap >>name ;
-    
+
 : listener-loop ( name -- ) ! FIXME: take different values from the stack?
     dup irc-client> listeners>> at [
         out-messages>> mailbox-get add-name
         irc-client> out-messages>>
         mailbox-put
-    ] [ drop ] if* ;
+    ] [
+        drop
+    ] if* ;
 
 : spawn-irc-loop ( quot name -- )
     [ [ irc-client> is-running>> ] compose ] dip
@@ -243,17 +248,26 @@ M: privmsg add-name swap >>name ;
 ! Listener join request handling
 ! ======================================
 
-: make-registered-listener ( join -- listener )
-    <irc-listener> swap trailing>>
-    dup [ listener-loop ] curry "listener" spawn-irc-loop
+: make-registered-listener ( name -- listener )
+    <irc-listener> swap dup
+    [ listener-loop ] curry "listener" spawn-irc-loop
     [ irc-client> listeners>> set-at ] curry keep ;
 
 : make-join-future ( name -- future )
     [ [ swap trailing>> = ] curry ! compare name with channel name
       irc-client> join-messages>> 60 seconds rot mailbox-get-timeout?
-      make-registered-listener ]
+      trailing>> make-registered-listener ]
     curry future ;
 
+: make-user-future ( name -- future )
+    [ make-registered-listener ] curry future ;
+
+: maybe-join ( name password -- ? )
+    over "#" head? [ /JOIN t ] [ 2drop f ] if ;
+
+: make-listener-future ( name channel? -- future )
+    [ make-join-future ] [ make-user-future ] if ;
+
 PRIVATE>
 
 : (connect-irc) ( irc-client -- )
@@ -268,7 +282,9 @@ PRIVATE>
     ] with-variable ;
 
 : listen-to ( irc-client name -- future )
-    swap current-irc-client [ [ f /JOIN ] keep make-join-future ] with-variable ;
+    swap current-irc-client [
+        dup f maybe-join make-listener-future
+    ] with-variable ;
 
 ! shorcut for privmsgs, etc
 : sender>> ( obj -- string )

From dcf89c05900d5f6e3ec4be86837de6eedc7ed05e Mon Sep 17 00:00:00 2001
From: Bruno Deferrari <utizoc@gmail.com>
Date: Wed, 28 May 2008 22:02:09 -0300
Subject: [PATCH 02/11] irc.client: Remove prettyprints.

---
 extra/irc/client/client.factor | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/extra/irc/client/client.factor b/extra/irc/client/client.factor
index cc0b4378c7..c7b9784270 100644
--- a/extra/irc/client/client.factor
+++ b/extra/irc/client/client.factor
@@ -113,12 +113,10 @@ TUPLE: unhandled < irc-message ;
 : irc-message-origin ( irc-message -- name )
     dup name>> irc-client> nick>> name>> = [ sender>> ] [ name>> ] if ;
 
-USE: prettyprint
-
 GENERIC: handle-incoming-irc ( irc-message -- )
 
 M: irc-message handle-incoming-irc ( irc-message -- )
-    . ;
+    drop ;
 
 M: logged-in handle-incoming-irc ( logged-in -- )
     name>> irc-client> nick>> (>>name) ;
@@ -130,8 +128,8 @@ M: nick-in-use handle-incoming-irc ( nick-in-use -- )
     name>> "_" append /NICK ;
 
 M: privmsg handle-incoming-irc ( privmsg -- )
-    dup dup . irc-message-origin irc-client> listeners>> at
-    [ in-messages>> mailbox-put ] [ dup "drop" . . drop ] if* ;
+    dup irc-message-origin irc-client> listeners>> at
+    [ in-messages>> mailbox-put ] [ drop ] if* ;
 
 M: join handle-incoming-irc ( join -- )
     irc-client> join-messages>> mailbox-put ;

From 8d0016d0e3e0508e406620f8d6bf84b74501613e Mon Sep 17 00:00:00 2001
From: Bruno Deferrari <utizoc@gmail.com>
Date: Fri, 30 May 2008 10:03:53 -0300
Subject: [PATCH 03/11] irc.client: Rename word

---
 extra/irc/client/client.factor | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extra/irc/client/client.factor b/extra/irc/client/client.factor
index c7b9784270..86f97f37a9 100644
--- a/extra/irc/client/client.factor
+++ b/extra/irc/client/client.factor
@@ -220,13 +220,13 @@ M: privmsg handle-outgoing-irc ( privmsg -- )
     irc-client> in-messages>> mailbox-get handle-incoming-irc ;
 
 ! FIXME: Hack, this should be handled better
-GENERIC: add-name ( name obj -- obj )
-M: object add-name nip ;
-M: privmsg add-name swap >>name ;
+GENERIC: annotate-message-with-name ( name obj -- obj )
+M: object annotate-message-with-name nip ;
+M: privmsg annotate-message-with-name swap >>name ;
 
 : listener-loop ( name -- ) ! FIXME: take different values from the stack?
     dup irc-client> listeners>> at [
-        out-messages>> mailbox-get add-name
+        out-messages>> mailbox-get annotate-message-with-name
         irc-client> out-messages>>
         mailbox-put
     ] [

From 352c9b8997487c88cc2c78a27732178f7066311e Mon Sep 17 00:00:00 2001
From: Bruno Deferrari <utizoc@gmail.com>
Date: Sun, 1 Jun 2008 20:58:53 -0300
Subject: [PATCH 04/11] irc.client: Clean code a bit, add some unit-tests

---
 extra/irc/client/client-tests.factor |  36 +++++++++
 extra/irc/client/client.factor       | 107 +++++++++++++--------------
 2 files changed, 86 insertions(+), 57 deletions(-)
 create mode 100644 extra/irc/client/client-tests.factor

diff --git a/extra/irc/client/client-tests.factor b/extra/irc/client/client-tests.factor
new file mode 100644
index 0000000000..d274f3a6b1
--- /dev/null
+++ b/extra/irc/client/client-tests.factor
@@ -0,0 +1,36 @@
+USING: kernel ;
+IN:
+irc.client.private
+: me? ( string -- ? )
+    "factorbot" = ;
+
+USING: irc.client irc.client.private kernel tools.test accessors arrays ;
+IN: irc.client.tests
+
+irc-message new
+    ":someuser!n=user@some.where PRIVMSG #factortest :hi" >>line
+    "someuser!n=user@some.where" >>prefix
+    "PRIVMSG" >>command
+    { "#factortest" } >>parameters
+    "hi" >>trailing 1array
+[ ":someuser!n=user@some.where PRIVMSG #factortest :hi"
+  string>irc-message f >>timestamp ] unit-test
+
+privmsg new
+    ":someuser!n=user@some.where PRIVMSG #factortest :hi" >>line
+    "someuser!n=user@some.where" >>prefix
+    "PRIVMSG" >>command
+    { "#factortest" } >>parameters
+    "hi" >>trailing
+    "#factortest" >>name 1array
+[ ":someuser!n=user@some.where PRIVMSG #factortest :hi"
+  parse-irc-line f >>timestamp ] unit-test
+
+{ "someuser" } [ "someuser!n=user@some.where"
+                 parse-name ] unit-test
+
+{ "#factortest" } [ ":someuser!n=user@some.where PRIVMSG #factortest :hi"
+                    parse-irc-line irc-message-origin ] unit-test
+
+{ "someuser" } [ ":someuser!n=user@some.where PRIVMSG factorbot :hi"
+                 parse-irc-line irc-message-origin ] unit-test
diff --git a/extra/irc/client/client.factor b/extra/irc/client/client.factor
index 86f97f37a9..5247f135fc 100644
--- a/extra/irc/client/client.factor
+++ b/extra/irc/client/client.factor
@@ -3,7 +3,7 @@
 USING: arrays combinators concurrency.mailboxes concurrency.futures io
        io.encodings.8-bit io.sockets kernel namespaces sequences
        sequences.lib splitting threads calendar classes.tuple
-       ascii assocs accessors destructors ;
+       classes ascii assocs accessors destructors ;
 IN: irc.client
 
 ! ======================================
@@ -106,43 +106,6 @@ TUPLE: unhandled < irc-message ;
 : /PONG ( text -- )
     "PONG " irc-write irc-print ;
 
-! ======================================
-! Server message handling
-! ======================================
-
-: irc-message-origin ( irc-message -- name )
-    dup name>> irc-client> nick>> name>> = [ sender>> ] [ name>> ] if ;
-
-GENERIC: handle-incoming-irc ( irc-message -- )
-
-M: irc-message handle-incoming-irc ( irc-message -- )
-    drop ;
-
-M: logged-in handle-incoming-irc ( logged-in -- )
-    name>> irc-client> nick>> (>>name) ;
-
-M: ping handle-incoming-irc ( ping -- )
-    trailing>> /PONG ;
-
-M: nick-in-use handle-incoming-irc ( nick-in-use -- )
-    name>> "_" append /NICK ;
-
-M: privmsg handle-incoming-irc ( privmsg -- )
-    dup irc-message-origin irc-client> listeners>> at
-    [ in-messages>> mailbox-put ] [ drop ] if* ;
-
-M: join handle-incoming-irc ( join -- )
-    irc-client> join-messages>> mailbox-put ;
-
-! ======================================
-! Client message handling
-! ======================================
-
-GENERIC: handle-outgoing-irc ( obj -- )
-
-M: privmsg handle-outgoing-irc ( privmsg -- )
-   [ name>> ] [ trailing>> ] bi /PRIVMSG ;
-
 ! ======================================
 ! Message parsing
 ! ======================================
@@ -189,6 +152,46 @@ M: privmsg handle-outgoing-irc ( privmsg -- )
     } case
     [ [ tuple-slots ] [ parameters>> ] bi append ] dip prefix >tuple ;
 
+! ======================================
+! Server message handling
+! ======================================
+
+: me? ( string -- ? )
+    irc-client> nick>> name>> = ;
+
+: irc-message-origin ( irc-message -- name )
+    dup name>> me? [ prefix>> parse-name ] [ name>> ] if ;
+
+GENERIC: handle-incoming-irc ( irc-message -- )
+
+M: irc-message handle-incoming-irc ( irc-message -- )
+    drop ;
+
+M: logged-in handle-incoming-irc ( logged-in -- )
+    name>> irc-client> nick>> (>>name) ;
+
+M: ping handle-incoming-irc ( ping -- )
+    trailing>> /PONG ;
+
+M: nick-in-use handle-incoming-irc ( nick-in-use -- )
+    name>> "_" append /NICK ;
+
+M: privmsg handle-incoming-irc ( privmsg -- )
+    dup irc-message-origin irc-client> listeners>> at
+    [ in-messages>> mailbox-put ] [ drop ] if* ;
+
+M: join handle-incoming-irc ( join -- )
+    irc-client> join-messages>> mailbox-put ;
+
+! ======================================
+! Client message handling
+! ======================================
+
+GENERIC: handle-outgoing-irc ( obj -- )
+
+M: privmsg handle-outgoing-irc ( privmsg -- )
+   [ name>> ] [ trailing>> ] bi /PRIVMSG ;
+
 ! ======================================
 ! Reader/Writer
 ! ======================================
@@ -219,19 +222,12 @@ M: privmsg handle-outgoing-irc ( privmsg -- )
 : in-multiplexer-loop ( -- )
     irc-client> in-messages>> mailbox-get handle-incoming-irc ;
 
-! FIXME: Hack, this should be handled better
-GENERIC: annotate-message-with-name ( name obj -- obj )
-M: object annotate-message-with-name nip ;
-M: privmsg annotate-message-with-name swap >>name ;
+: maybe-annotate-with-name ( name obj -- obj )
+    dup privmsg instance? [ swap >>name ] [ nip ] if ;
 
-: listener-loop ( name -- ) ! FIXME: take different values from the stack?
-    dup irc-client> listeners>> at [
-        out-messages>> mailbox-get annotate-message-with-name
-        irc-client> out-messages>>
-        mailbox-put
-    ] [
-        drop
-    ] if* ;
+: listener-loop ( name listener -- )
+    out-messages>> mailbox-get maybe-annotate-with-name
+    irc-client> out-messages>> mailbox-put ;
 
 : spawn-irc-loop ( quot name -- )
     [ [ irc-client> is-running>> ] compose ] dip
@@ -247,9 +243,10 @@ M: privmsg annotate-message-with-name swap >>name ;
 ! ======================================
 
 : make-registered-listener ( name -- listener )
-    <irc-listener> swap dup
-    [ listener-loop ] curry "listener" spawn-irc-loop
-    [ irc-client> listeners>> set-at ] curry keep ;
+    <irc-listener>
+    [ [ listener-loop ] 2curry "listener" spawn-irc-loop ]
+    [ swap [ irc-client> listeners>> set-at ] curry keep ]
+    2bi ;
 
 : make-join-future ( name -- future )
     [ [ swap trailing>> = ] curry ! compare name with channel name
@@ -283,7 +280,3 @@ PRIVATE>
     swap current-irc-client [
         dup f maybe-join make-listener-future
     ] with-variable ;
-
-! shorcut for privmsgs, etc
-: sender>> ( obj -- string )
-    prefix>> parse-name ;

From e6a4802ff858438e33cf5d53632d587ba267fd16 Mon Sep 17 00:00:00 2001
From: Bruno Deferrari <utizoc@gmail.com>
Date: Mon, 2 Jun 2008 01:33:54 -0300
Subject: [PATCH 05/11] irc.client: Some fixes and improvments, more tests

---
 extra/irc/client/client-tests.factor | 59 ++++++++++++++++++----------
 extra/irc/client/client.factor       | 19 ++++++---
 2 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/extra/irc/client/client-tests.factor b/extra/irc/client/client-tests.factor
index d274f3a6b1..9916621d47 100644
--- a/extra/irc/client/client-tests.factor
+++ b/extra/irc/client/client-tests.factor
@@ -1,36 +1,55 @@
-USING: kernel ;
-IN:
-irc.client.private
-: me? ( string -- ? )
-    "factorbot" = ;
-
-USING: irc.client irc.client.private kernel tools.test accessors arrays ;
+USING: kernel tools.test accessors arrays sequences qualified
+       io.streams.string io.streams.duplex namespaces
+       irc.client.private ;
+EXCLUDE: irc.client => join ;
 IN: irc.client.tests
 
+! Utilities
+: <test-stream> ( lines -- stream )
+  "\n" join <string-reader> <string-writer> <duplex-stream> ;
+
+: make-client ( lines -- irc-client )
+   "someserver" irc-port "factorbot" f <irc-profile> <irc-client>
+   swap [ 2nip <test-stream> f ] curry >>connect ;
+
+: with-dummy-client ( quot -- )
+     rot with-variable ; inline
+
+! Parsing tests
 irc-message new
     ":someuser!n=user@some.where PRIVMSG #factortest :hi" >>line
     "someuser!n=user@some.where" >>prefix
-    "PRIVMSG" >>command
-    { "#factortest" } >>parameters
-    "hi" >>trailing 1array
+                       "PRIVMSG" >>command
+               { "#factortest" } >>parameters
+                            "hi" >>trailing
+1array
 [ ":someuser!n=user@some.where PRIVMSG #factortest :hi"
   string>irc-message f >>timestamp ] unit-test
 
 privmsg new
     ":someuser!n=user@some.where PRIVMSG #factortest :hi" >>line
     "someuser!n=user@some.where" >>prefix
-    "PRIVMSG" >>command
-    { "#factortest" } >>parameters
-    "hi" >>trailing
-    "#factortest" >>name 1array
+                       "PRIVMSG" >>command
+               { "#factortest" } >>parameters
+                            "hi" >>trailing
+                   "#factortest" >>name
+1array
 [ ":someuser!n=user@some.where PRIVMSG #factortest :hi"
   parse-irc-line f >>timestamp ] unit-test
 
-{ "someuser" } [ "someuser!n=user@some.where"
-                 parse-name ] unit-test
+{ "" } make-client dup nick>> "factorbot" >>name drop current-irc-client [
+    { t } [ irc-client> nick>> name>> me? ] unit-test
 
-{ "#factortest" } [ ":someuser!n=user@some.where PRIVMSG #factortest :hi"
-                    parse-irc-line irc-message-origin ] unit-test
+    { "factorbot" } [ irc-client> nick>> name>> ] unit-test
 
-{ "someuser" } [ ":someuser!n=user@some.where PRIVMSG factorbot :hi"
-                 parse-irc-line irc-message-origin ] unit-test
+    { "someuser" } [ "someuser!n=user@some.where" parse-name ] unit-test
+
+    { "#factortest" } [ ":someuser!n=user@some.where PRIVMSG #factortest :hi"
+                        parse-irc-line irc-message-origin ] unit-test
+
+    { "someuser" } [ ":someuser!n=user@some.where PRIVMSG factorbot :hi"
+                     parse-irc-line irc-message-origin ] unit-test
+] with-variable
+
+! Client tests
+{ } [ { "" } make-client connect-irc ] unit-test
\ No newline at end of file
diff --git a/extra/irc/client/client.factor b/extra/irc/client/client.factor
index 5247f135fc..5c9469ddd5 100644
--- a/extra/irc/client/client.factor
+++ b/extra/irc/client/client.factor
@@ -3,7 +3,7 @@
 USING: arrays combinators concurrency.mailboxes concurrency.futures io
        io.encodings.8-bit io.sockets kernel namespaces sequences
        sequences.lib splitting threads calendar classes.tuple
-       classes ascii assocs accessors destructors ;
+       classes ascii assocs accessors destructors continuations ;
 IN: irc.client
 
 ! ======================================
@@ -26,10 +26,11 @@ TUPLE: nick name channels log ;
 C: <nick> nick
 
 TUPLE: irc-client profile nick stream in-messages out-messages join-messages
-       listeners is-running ;
+       listeners is-running connect ;
 : <irc-client> ( profile -- irc-client )
     f V{ } clone V{ } clone <nick>
-    f <mailbox> <mailbox> <mailbox> H{ } clone f irc-client boa ;
+    f <mailbox> <mailbox> <mailbox> H{ } clone f
+    [ <inet> latin1 <client> ] irc-client boa ;
 
 TUPLE: irc-listener in-messages out-messages ;
 : <irc-listener> ( -- irc-listener )
@@ -79,7 +80,7 @@ TUPLE: unhandled < irc-message ;
     " hostname servername :irc.factor" irc-print ;
 
 : /CONNECT ( server port -- stream )
-    <inet> latin1 <client> drop ;
+    irc-client> connect>> call drop ;
 
 : /JOIN ( channel password -- )
     "JOIN " irc-write
@@ -183,6 +184,9 @@ M: privmsg handle-incoming-irc ( privmsg -- )
 M: join handle-incoming-irc ( join -- )
     irc-client> join-messages>> mailbox-put ;
 
+M: irc-end handle-incoming-irc ( irc-end -- )
+    irc-client> listeners>> values [ in-messages>> mailbox-put ] with each ;
+
 ! ======================================
 ! Client message handling
 ! ======================================
@@ -196,6 +200,9 @@ M: privmsg handle-outgoing-irc ( privmsg -- )
 ! Reader/Writer
 ! ======================================
 
+: irc-mailbox-get ( mailbox quot -- )
+    swap 5 seconds  [ mailbox-get-timeout swap call ] 3curry [ drop ] recover ;
+
 : stream-readln-or-close ( stream -- str/f )
     dup stream-readln [ nip ] [ dispose f ] if* ;
 
@@ -213,14 +220,14 @@ M: privmsg handle-outgoing-irc ( privmsg -- )
     ] if* ;
 
 : writer-loop ( -- )
-    irc-client> out-messages>> mailbox-get handle-outgoing-irc ;
+    irc-client> out-messages>> [ handle-outgoing-irc ] irc-mailbox-get ;
 
 ! ======================================
 ! Processing loops
 ! ======================================
 
 : in-multiplexer-loop ( -- )
-    irc-client> in-messages>> mailbox-get handle-incoming-irc ;
+    irc-client> in-messages>> [ handle-incoming-irc ] irc-mailbox-get ;
 
 : maybe-annotate-with-name ( name obj -- obj )
     dup privmsg instance? [ swap >>name ] [ nip ] if ;

From 63089a21247d93389be2d2684fece06a50bc673b Mon Sep 17 00:00:00 2001
From: Bruno Deferrari <utizoc@gmail.com>
Date: Tue, 3 Jun 2008 19:53:27 -0300
Subject: [PATCH 06/11] irc.client: Improve tests a bit

---
 extra/irc/client/client-tests.factor | 34 ++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/extra/irc/client/client-tests.factor b/extra/irc/client/client-tests.factor
index 9916621d47..968330ee3b 100644
--- a/extra/irc/client/client-tests.factor
+++ b/extra/irc/client/client-tests.factor
@@ -1,6 +1,6 @@
 USING: kernel tools.test accessors arrays sequences qualified
-       io.streams.string io.streams.duplex namespaces
-       irc.client.private ;
+       io.streams.string io.streams.duplex namespaces threads
+       calendar irc.client.private ;
 EXCLUDE: irc.client => join ;
 IN: irc.client.tests
 
@@ -12,6 +12,9 @@ IN: irc.client.tests
    "someserver" irc-port "factorbot" f <irc-profile> <irc-client>
    swap [ 2nip <test-stream> f ] curry >>connect ;
 
+: set-nick ( irc-client nickname -- )
+     [ nick>> ] dip >>name drop ;
+
 : with-dummy-client ( quot -- )
      rot with-variable ; inline
 
@@ -37,7 +40,7 @@ privmsg new
 [ ":someuser!n=user@some.where PRIVMSG #factortest :hi"
   parse-irc-line f >>timestamp ] unit-test
 
-{ "" } make-client dup nick>> "factorbot" >>name drop current-irc-client [
+{ "" } make-client dup "factorbot" set-nick current-irc-client [
     { t } [ irc-client> nick>> name>> me? ] unit-test
 
     { "factorbot" } [ irc-client> nick>> name>> ] unit-test
@@ -51,5 +54,26 @@ privmsg new
                      parse-irc-line irc-message-origin ] unit-test
 ] with-variable
 
-! Client tests
-{ } [ { "" } make-client connect-irc ] unit-test
\ No newline at end of file
+! Test login and nickname set
+{ "factorbot" } [ { "NOTICE AUTH :*** Looking up your hostname..."
+                    "NOTICE AUTH :*** Checking ident"
+                    "NOTICE AUTH :*** Found your hostname"
+                    "NOTICE AUTH :*** No identd (auth) response"
+                    ":some.where 001 factorbot :Welcome factorbot"
+                  } make-client
+                  [ connect-irc ] keep 1 seconds sleep
+                    nick>> name>> ] unit-test
+
+! TODO: Channel join messages
+! { ":factorbot!n=factorbo@some.where JOIN :#factortest"
+!   ":ircserver.net MODE #factortest +ns"
+!   ":ircserver.net 353 factorbot @ #factortest :@factorbot "
+!   ":ircserver.net 366 factorbot #factortest :End of /NAMES list."
+!   ":ircserver.net 477 factorbot #factortest :[ircserver-info] blah blah"
+! } make-client dup "factorbot" set-nick
+! TODO: user join
+! ":somedude!n=user@isp.net JOIN :#factortest"
+! TODO: channel message
+! ":somedude!n=user@isp.net PRIVMSG #factortest :hello"
+! TODO: direct private message
+! ":somedude!n=user@isp.net PRIVMSG factorbot2 :hello"
\ No newline at end of file

From 3480a93fd5e92d3d632111a863f2f3b554209874 Mon Sep 17 00:00:00 2001
From: Bruno Deferrari <utizoc@gmail.com>
Date: Sat, 7 Jun 2008 01:15:42 -0300
Subject: [PATCH 07/11] irc.client: Some small changes, and replace listen-to
 by listener objects of different types.

---
 extra/irc/client/client.factor | 64 +++++++++++++++++++++-------------
 1 file changed, 39 insertions(+), 25 deletions(-)

diff --git a/extra/irc/client/client.factor b/extra/irc/client/client.factor
index 5c9469ddd5..6598a0f08b 100644
--- a/extra/irc/client/client.factor
+++ b/extra/irc/client/client.factor
@@ -33,14 +33,30 @@ TUPLE: irc-client profile nick stream in-messages out-messages join-messages
     [ <inet> latin1 <client> ] irc-client boa ;
 
 TUPLE: irc-listener in-messages out-messages ;
-: <irc-listener> ( -- irc-listener )
-    <mailbox> <mailbox> irc-listener boa ;
+TUPLE: irc-server-listener < irc-listener ;
+TUPLE: irc-channel-listener < irc-listener name password timeout ;
+TUPLE: irc-nick-listener < irc-listener name ;
+UNION: irc-named-listener irc-nick-listener irc-channel-listener ;
+
+: <irc-listener> ( -- irc-listener ) <mailbox> <mailbox> irc-listener boa ;
+
+: <irc-server-listener> ( -- irc-server-listener )
+     <mailbox> <mailbox> irc-server-listener boa ;
+
+: <irc-channel-listener> ( name -- irc-channel-listener )
+     <mailbox> <mailbox> rot f 60 seconds irc-channel-listener boa ;
+
+: <irc-nick-listener> ( name -- irc-nick-listener )
+     <mailbox> <mailbox> rot irc-nick-listener boa ;
 
 ! ======================================
 ! Message objects
 ! ======================================
 
-SINGLETON: irc-end ! Message used when the client isn't running anymore
+SINGLETON: irc-end  ! Message sent when the client isn't running anymore
+SINGLETON: irc-lost ! Message sent when connection was lost
+SINGLETON: irc-restore ! Message sent when connection was restored
+UNION: irc-broadcasted-message irc-end irc-lost irc-restore ;
 
 TUPLE: irc-message line prefix command parameters trailing timestamp ;
 TUPLE: logged-in < irc-message name ;
@@ -163,6 +179,9 @@ TUPLE: unhandled < irc-message ;
 : irc-message-origin ( irc-message -- name )
     dup name>> me? [ prefix>> parse-name ] [ name>> ] if ;
 
+: broadcast-message-to-listeners ( message -- )
+    irc-client> listeners>> values [ in-messages>> mailbox-put ] with each ;
+
 GENERIC: handle-incoming-irc ( irc-message -- )
 
 M: irc-message handle-incoming-irc ( irc-message -- )
@@ -184,8 +203,8 @@ M: privmsg handle-incoming-irc ( privmsg -- )
 M: join handle-incoming-irc ( join -- )
     irc-client> join-messages>> mailbox-put ;
 
-M: irc-end handle-incoming-irc ( irc-end -- )
-    irc-client> listeners>> values [ in-messages>> mailbox-put ] with each ;
+M: irc-broadcasted-message handle-incoming-irc ( irc-broadcasted-message -- )
+    broadcast-message-to-listeners ;
 
 ! ======================================
 ! Client message handling
@@ -249,26 +268,22 @@ M: privmsg handle-outgoing-irc ( privmsg -- )
 ! Listener join request handling
 ! ======================================
 
-: make-registered-listener ( name -- listener )
-    <irc-listener>
+: set+run-listener ( name irc-listener -- )
     [ [ listener-loop ] 2curry "listener" spawn-irc-loop ]
-    [ swap [ irc-client> listeners>> set-at ] curry keep ]
+    [ swap irc-client> listeners>> set-at ]
     2bi ;
 
-: make-join-future ( name -- future )
-    [ [ swap trailing>> = ] curry ! compare name with channel name
-      irc-client> join-messages>> 60 seconds rot mailbox-get-timeout?
-      trailing>> make-registered-listener ]
-    curry future ;
+GENERIC: (add-listener) ( irc-listener -- )
+M: irc-channel-listener (add-listener) ( irc-channel-listener -- )
+    [ [ name>> ] [ password>> ] bi /JOIN ]
+    [ [ [ drop irc-client> join-messages>> ]
+        [ timeout>> ]
+        [ name>> [ swap trailing>> = ] curry ]
+        tri mailbox-get-timeout? trailing>> ] keep set+run-listener
+    ] bi ;
 
-: make-user-future ( name -- future )
-    [ make-registered-listener ] curry future ;
-
-: maybe-join ( name password -- ? )
-    over "#" head? [ /JOIN t ] [ 2drop f ] if ;
-
-: make-listener-future ( name channel? -- future )
-    [ make-join-future ] [ make-user-future ] if ;
+M: irc-nick-listener (add-listener) ( irc-nick-listener -- )
+   [ name>> ] keep set+run-listener ;
 
 PRIVATE>
 
@@ -283,7 +298,6 @@ PRIVATE>
         spawn-irc
     ] with-variable ;
 
-: listen-to ( irc-client name -- future )
-    swap current-irc-client [
-        dup f maybe-join make-listener-future
-    ] with-variable ;
+GENERIC: add-listener ( irc-client irc-listener -- )
+M: irc-listener add-listener ( irc-client irc-listener -- )
+    current-irc-client swap [ (add-listener) ] curry with-variable ;

From 7126469eac652757dc8e51da6d64612f672cc739 Mon Sep 17 00:00:00 2001
From: Bruno Deferrari <utizoc@gmail.com>
Date: Sat, 7 Jun 2008 21:04:27 -0300
Subject: [PATCH 08/11] irc.client: remove unused concurrency.futures import

---
 extra/irc/client/client.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extra/irc/client/client.factor b/extra/irc/client/client.factor
index 6598a0f08b..3c45ad4d32 100644
--- a/extra/irc/client/client.factor
+++ b/extra/irc/client/client.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2007 Doug Coleman, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays combinators concurrency.mailboxes concurrency.futures io
+USING: arrays combinators concurrency.mailboxes io
        io.encodings.8-bit io.sockets kernel namespaces sequences
        sequences.lib splitting threads calendar classes.tuple
        classes ascii assocs accessors destructors continuations ;

From 6943230bf516516cf5e44105a3cf3d6bfe2dad72 Mon Sep 17 00:00:00 2001
From: Bruno Deferrari <utizoc@gmail.com>
Date: Sun, 8 Jun 2008 16:06:19 -0300
Subject: [PATCH 09/11] irc.client: better handling of disconnects

---
 extra/irc/client/client-tests.factor |  4 +-
 extra/irc/client/client.factor       | 81 +++++++++++++++++-----------
 2 files changed, 51 insertions(+), 34 deletions(-)

diff --git a/extra/irc/client/client-tests.factor b/extra/irc/client/client-tests.factor
index 968330ee3b..304ab25402 100644
--- a/extra/irc/client/client-tests.factor
+++ b/extra/irc/client/client-tests.factor
@@ -41,9 +41,9 @@ privmsg new
   parse-irc-line f >>timestamp ] unit-test
 
 { "" } make-client dup "factorbot" set-nick current-irc-client [
-    { t } [ irc-client> nick>> name>> me? ] unit-test
+    { t } [ irc> nick>> name>> me? ] unit-test
 
-    { "factorbot" } [ irc-client> nick>> name>> ] unit-test
+    { "factorbot" } [ irc> nick>> name>> ] unit-test
 
     { "someuser" } [ "someuser!n=user@some.where" parse-name ] unit-test
 
diff --git a/extra/irc/client/client.factor b/extra/irc/client/client.factor
index 3c45ad4d32..4a646e9fd8 100644
--- a/extra/irc/client/client.factor
+++ b/extra/irc/client/client.factor
@@ -26,11 +26,11 @@ TUPLE: nick name channels log ;
 C: <nick> nick
 
 TUPLE: irc-client profile nick stream in-messages out-messages join-messages
-       listeners is-running connect ;
+       listeners is-running connect reconnect-time ;
 : <irc-client> ( profile -- irc-client )
     f V{ } clone V{ } clone <nick>
     f <mailbox> <mailbox> <mailbox> H{ } clone f
-    [ <inet> latin1 <client> ] irc-client boa ;
+    [ <inet> latin1 <client> ] 15 seconds irc-client boa ;
 
 TUPLE: irc-listener in-messages out-messages ;
 TUPLE: irc-server-listener < irc-listener ;
@@ -53,10 +53,10 @@ UNION: irc-named-listener irc-nick-listener irc-channel-listener ;
 ! Message objects
 ! ======================================
 
-SINGLETON: irc-end  ! Message sent when the client isn't running anymore
-SINGLETON: irc-lost ! Message sent when connection was lost
-SINGLETON: irc-restore ! Message sent when connection was restored
-UNION: irc-broadcasted-message irc-end irc-lost irc-restore ;
+SINGLETON: irc-end          ! sent when the client isn't running anymore
+SINGLETON: irc-disconnected ! sent when connection is lost
+SINGLETON: irc-connected    ! sent when connection is instantiated
+UNION: irc-broadcasted-message irc-end irc-disconnected irc-connected ;
 
 TUPLE: irc-message line prefix command parameters trailing timestamp ;
 TUPLE: logged-in < irc-message name ;
@@ -72,14 +72,20 @@ TUPLE: notice < irc-message type ;
 TUPLE: mode < irc-message name channel mode ;
 TUPLE: unhandled < irc-message ;
 
+: terminate-irc ( irc-client -- )
+    [ stream>> dispose ]
+    [ in-messages>> irc-end swap mailbox-put ]
+    [ f >>is-running drop ]
+    tri ;
+
 <PRIVATE
 
 ! ======================================
 ! Shortcuts
 ! ======================================
 
-: irc-client> ( -- irc-client ) current-irc-client get ;
-: irc-stream> ( -- stream ) irc-client> stream>> ;
+: irc> ( -- irc-client ) current-irc-client get ;
+: irc-stream> ( -- stream ) irc> stream>> ;
 : irc-write ( s -- ) irc-stream> stream-write ;
 : irc-print ( s -- ) irc-stream> [ stream-print ] keep stream-flush ;
 
@@ -96,7 +102,7 @@ TUPLE: unhandled < irc-message ;
     " hostname servername :irc.factor" irc-print ;
 
 : /CONNECT ( server port -- stream )
-    irc-client> connect>> call drop ;
+    irc> connect>> call drop ;
 
 : /JOIN ( channel password -- )
     "JOIN " irc-write
@@ -174,13 +180,13 @@ TUPLE: unhandled < irc-message ;
 ! ======================================
 
 : me? ( string -- ? )
-    irc-client> nick>> name>> = ;
+    irc> nick>> name>> = ;
 
 : irc-message-origin ( irc-message -- name )
     dup name>> me? [ prefix>> parse-name ] [ name>> ] if ;
 
 : broadcast-message-to-listeners ( message -- )
-    irc-client> listeners>> values [ in-messages>> mailbox-put ] with each ;
+    irc> listeners>> values [ in-messages>> mailbox-put ] with each ;
 
 GENERIC: handle-incoming-irc ( irc-message -- )
 
@@ -188,7 +194,7 @@ M: irc-message handle-incoming-irc ( irc-message -- )
     drop ;
 
 M: logged-in handle-incoming-irc ( logged-in -- )
-    name>> irc-client> nick>> (>>name) ;
+    name>> irc> nick>> (>>name) ;
 
 M: ping handle-incoming-irc ( ping -- )
     trailing>> /PONG ;
@@ -197,11 +203,11 @@ M: nick-in-use handle-incoming-irc ( nick-in-use -- )
     name>> "_" append /NICK ;
 
 M: privmsg handle-incoming-irc ( privmsg -- )
-    dup irc-message-origin irc-client> listeners>> at
+    dup irc-message-origin irc> listeners>> at
     [ in-messages>> mailbox-put ] [ drop ] if* ;
 
 M: join handle-incoming-irc ( join -- )
-    irc-client> join-messages>> mailbox-put ;
+    irc> join-messages>> mailbox-put ;
 
 M: irc-broadcasted-message handle-incoming-irc ( irc-broadcasted-message -- )
     broadcast-message-to-listeners ;
@@ -226,37 +232,47 @@ M: privmsg handle-outgoing-irc ( privmsg -- )
     dup stream-readln [ nip ] [ dispose f ] if* ;
 
 : handle-reader-message ( irc-message -- )
-    irc-client> in-messages>> mailbox-put ;
+    irc> in-messages>> mailbox-put ;
 
-: handle-stream-close ( -- )
-    irc-client> f >>is-running in-messages>> irc-end swap mailbox-put ;
+DEFER: (connect-irc)
+: handle-disconnect ( error -- )
+    drop irc>
+        [ in-messages>> irc-disconnected swap mailbox-put ]
+        [ reconnect-time>> sleep (connect-irc) ]
+        [ profile>> nickname>> /LOGIN ]
+    tri ;
+
+: (reader-loop) ( -- )
+    irc> stream>> [
+        |dispose stream-readln [
+            parse-irc-line handle-reader-message
+        ] [
+            irc> terminate-irc
+        ] if*
+    ] with-destructors ;
 
 : reader-loop ( -- )
-    irc-client> stream>> stream-readln-or-close [
-        parse-irc-line handle-reader-message
-    ] [
-        handle-stream-close
-    ] if* ;
+    [ (reader-loop) ] [ handle-disconnect ] recover ;
 
 : writer-loop ( -- )
-    irc-client> out-messages>> [ handle-outgoing-irc ] irc-mailbox-get ;
+    irc> out-messages>> [ handle-outgoing-irc ] irc-mailbox-get ;
 
 ! ======================================
 ! Processing loops
 ! ======================================
 
 : in-multiplexer-loop ( -- )
-    irc-client> in-messages>> [ handle-incoming-irc ] irc-mailbox-get ;
+    irc> in-messages>> [ handle-incoming-irc ] irc-mailbox-get ;
 
 : maybe-annotate-with-name ( name obj -- obj )
     dup privmsg instance? [ swap >>name ] [ nip ] if ;
 
 : listener-loop ( name listener -- )
     out-messages>> mailbox-get maybe-annotate-with-name
-    irc-client> out-messages>> mailbox-put ;
+    irc> out-messages>> mailbox-put ;
 
 : spawn-irc-loop ( quot name -- )
-    [ [ irc-client> is-running>> ] compose ] dip
+    [ [ irc> is-running>> ] compose ] dip
     spawn-server drop ;
 
 : spawn-irc ( -- )
@@ -270,13 +286,13 @@ M: privmsg handle-outgoing-irc ( privmsg -- )
 
 : set+run-listener ( name irc-listener -- )
     [ [ listener-loop ] 2curry "listener" spawn-irc-loop ]
-    [ swap irc-client> listeners>> set-at ]
+    [ swap irc> listeners>> set-at ]
     2bi ;
 
 GENERIC: (add-listener) ( irc-listener -- )
 M: irc-channel-listener (add-listener) ( irc-channel-listener -- )
     [ [ name>> ] [ password>> ] bi /JOIN ]
-    [ [ [ drop irc-client> join-messages>> ]
+    [ [ [ drop irc> join-messages>> ]
         [ timeout>> ]
         [ name>> [ swap trailing>> = ] curry ]
         tri mailbox-get-timeout? trailing>> ] keep set+run-listener
@@ -285,12 +301,13 @@ M: irc-channel-listener (add-listener) ( irc-channel-listener -- )
 M: irc-nick-listener (add-listener) ( irc-nick-listener -- )
    [ name>> ] keep set+run-listener ;
 
-PRIVATE>
-
 : (connect-irc) ( irc-client -- )
     [ profile>> [ server>> ] keep port>> /CONNECT ] keep
-    swap >>stream
-    t >>is-running drop ;
+        swap >>stream
+        t >>is-running
+    in-messages>> irc-connected swap mailbox-put ;
+
+PRIVATE>
 
 : connect-irc ( irc-client -- )
     dup current-irc-client [

From 095506884bca829289bd502e451cf30aa0806bcd Mon Sep 17 00:00:00 2001
From: Bruno Deferrari <utizoc@gmail.com>
Date: Mon, 9 Jun 2008 15:36:44 -0300
Subject: [PATCH 10/11] irc.client: Uses fry instead of curry/compose, add
 server listeners.

---
 extra/irc/client/client.factor | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/extra/irc/client/client.factor b/extra/irc/client/client.factor
index 4a646e9fd8..c712b2672e 100644
--- a/extra/irc/client/client.factor
+++ b/extra/irc/client/client.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2007 Doug Coleman, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays combinators concurrency.mailboxes io
+USING: arrays combinators concurrency.mailboxes fry io
        io.encodings.8-bit io.sockets kernel namespaces sequences
        sequences.lib splitting threads calendar classes.tuple
        classes ascii assocs accessors destructors continuations ;
@@ -134,7 +134,7 @@ TUPLE: unhandled < irc-message ;
 ! ======================================
 
 : split-at-first ( seq separators -- before after )
-    dupd [ member? ] curry find
+    dupd '[ , member? ] find
         [ cut 1 tail ]
         [ swap ]
     if ;
@@ -191,7 +191,8 @@ TUPLE: unhandled < irc-message ;
 GENERIC: handle-incoming-irc ( irc-message -- )
 
 M: irc-message handle-incoming-irc ( irc-message -- )
-    drop ;
+    f irc> listeners>> at
+    [ in-messages>> mailbox-put ] [ drop ] if* ;
 
 M: logged-in handle-incoming-irc ( logged-in -- )
     name>> irc> nick>> (>>name) ;
@@ -203,8 +204,8 @@ M: nick-in-use handle-incoming-irc ( nick-in-use -- )
     name>> "_" append /NICK ;
 
 M: privmsg handle-incoming-irc ( privmsg -- )
-    dup irc-message-origin irc> listeners>> at
-    [ in-messages>> mailbox-put ] [ drop ] if* ;
+    dup irc-message-origin irc> listeners>> [ at ] keep
+    '[ f , at ] unless* [ in-messages>> mailbox-put ] [ drop ] if* ;
 
 M: join handle-incoming-irc ( join -- )
     irc> join-messages>> mailbox-put ;
@@ -226,7 +227,7 @@ M: privmsg handle-outgoing-irc ( privmsg -- )
 ! ======================================
 
 : irc-mailbox-get ( mailbox quot -- )
-    swap 5 seconds  [ mailbox-get-timeout swap call ] 3curry [ drop ] recover ;
+    swap 5 seconds  '[ , , , mailbox-get-timeout swap call ] [ drop ] recover ;
 
 : stream-readln-or-close ( stream -- str/f )
     dup stream-readln [ nip ] [ dispose f ] if* ;
@@ -272,7 +273,7 @@ DEFER: (connect-irc)
     irc> out-messages>> mailbox-put ;
 
 : spawn-irc-loop ( quot name -- )
-    [ [ irc> is-running>> ] compose ] dip
+    [ '[ @ irc> is-running>> ] ] dip
     spawn-server drop ;
 
 : spawn-irc ( -- )
@@ -285,7 +286,7 @@ DEFER: (connect-irc)
 ! ======================================
 
 : set+run-listener ( name irc-listener -- )
-    [ [ listener-loop ] 2curry "listener" spawn-irc-loop ]
+    [ '[ , , listener-loop ] "listener" spawn-irc-loop ]
     [ swap irc> listeners>> set-at ]
     2bi ;
 
@@ -294,12 +295,15 @@ M: irc-channel-listener (add-listener) ( irc-channel-listener -- )
     [ [ name>> ] [ password>> ] bi /JOIN ]
     [ [ [ drop irc> join-messages>> ]
         [ timeout>> ]
-        [ name>> [ swap trailing>> = ] curry ]
+        [ name>> '[ trailing>> , = ] ]
         tri mailbox-get-timeout? trailing>> ] keep set+run-listener
     ] bi ;
 
 M: irc-nick-listener (add-listener) ( irc-nick-listener -- )
-   [ name>> ] keep set+run-listener ;
+    [ name>> ] keep set+run-listener ;
+
+M: irc-server-listener (add-listener) ( irc-server-listener -- )
+    f swap set+run-listener ;
 
 : (connect-irc) ( irc-client -- )
     [ profile>> [ server>> ] keep port>> /CONNECT ] keep
@@ -317,4 +321,4 @@ PRIVATE>
 
 GENERIC: add-listener ( irc-client irc-listener -- )
 M: irc-listener add-listener ( irc-client irc-listener -- )
-    current-irc-client swap [ (add-listener) ] curry with-variable ;
+    current-irc-client swap '[ , (add-listener) ] with-variable ;

From cd998f029d6cbe81af9e4b0536e5a6fe5406545b Mon Sep 17 00:00:00 2001
From: Bruno Deferrari <utizoc@gmail.com>
Date: Mon, 9 Jun 2008 20:40:54 -0300
Subject: [PATCH 11/11] irc.client: Documentation and fixes

---
 extra/irc/client/client-docs.factor | 89 +++++++++++++++++++++++++++++
 extra/irc/client/client.factor      | 43 ++++++++------
 2 files changed, 114 insertions(+), 18 deletions(-)
 create mode 100644 extra/irc/client/client-docs.factor

diff --git a/extra/irc/client/client-docs.factor b/extra/irc/client/client-docs.factor
new file mode 100644
index 0000000000..2a66f3a701
--- /dev/null
+++ b/extra/irc/client/client-docs.factor
@@ -0,0 +1,89 @@
+USING: help.markup help.syntax quotations kernel ;
+IN: irc.client
+
+HELP: irc-client "IRC Client object"
+"blah" ;
+
+HELP: irc-server-listener "Listener for server messages unmanaged by other listeners"
+"blah" ;
+
+HELP: irc-channel-listener "Listener for irc channels"
+"blah" ;
+
+HELP: irc-nick-listener "Listener for irc users"
+"blah" ;
+
+HELP: irc-profile "IRC Client profile object"
+"blah" ;
+
+HELP: connect-irc "Connecting to an irc server"
+{ $values { "irc-client" "an irc client object" } }
+{ $description "Connects and logins " { $link irc-client } " using the settings specified on its " { $link irc-profile } "." } ;
+
+HELP: add-listener "Listening to irc channels/users/etc"
+{ $values { "irc-client" "an irc client object" } { "irc-listener" "an irc listener object" } }
+{ $description "Registers " { $snippet "irc-listener" } " with " { $snippet "irc-client" } " and starts listening." } ;
+
+HELP: terminate-irc "Terminates an irc client"
+{ $values { "irc-client" "an irc client object" } }
+{ $description "Terminates all activity by " { $link irc-client } " cleaning up resources and notifying listeners." } ;
+
+ARTICLE: "irc.client" "IRC Client"
+"An IRC Client library"
+{ $heading "IRC objects:" }
+{ $subsection irc-client }
+{ $heading "Listener objects:" }
+{ $subsection irc-server-listener }
+{ $subsection irc-channel-listener }
+{ $subsection irc-nick-listener }
+{ $heading "Setup objects:" }
+{ $subsection irc-profile }
+{ $heading "Words:" }
+{ $subsection connect-irc }
+{ $subsection terminate-irc }
+{ $subsection add-listener }
+{ $heading "IRC messages" }
+"Some of the RFC defined irc messages as objects:"
+{ $table
+  { { $link irc-message } "base of all irc messages" }
+  { { $link logged-in } "logged in to server" }
+  { { $link ping } "ping message" }
+  { { $link join } "channel join" }
+  { { $link part } "channel part" }
+  { { $link quit } "quit from irc" }
+  { { $link privmsg } "private message (to client or channel)" }
+  { { $link kick } "kick from channel" }
+  { { $link roomlist } "list of participants in channel" }
+  { { $link nick-in-use } "chosen nick is in use by another client" }
+  { { $link notice } "notice message" }
+  { { $link mode } "mode change" }
+  { { $link unhandled } "uninmplemented/unhandled message" }
+  }
+{ $heading "Special messages" }
+"Some special messages that are created by the library and not by the irc server."
+{ $table
+  { { $link irc-end } " sent when the client isn't running anymore, listeners should stop after this." }
+  { { $link irc-disconnected } " sent to notify listeners that connection was lost." }
+  { { $link irc-connected } " sent to notify listeners that a connection with the irc server was established." } }
+
+{ $heading "Example:" }
+{ $code
+  "USING: irc.client concurrency.mailboxes ;"
+  "SYMBOL: bot"
+  "SYMBOL: mychannel"
+  "! Create the profile and client objects"
+  "\"irc.freenode.org\" irc-port \"mybot123\" f <irc-profile> <irc-client> bot set"
+  "! Connect to the server"
+  "bot get connect-irc"
+  "! Create a channel listener"
+  "\"#mychannel123\" <irc-channel-listener> mychannel set"
+  "! Register and start listener (this joins the channel)"
+  "bot get mychannel get add-listener"
+  "! Send a message to the channel"
+  "\"what's up?\" mychannel get out-messages>> mailbox-put"
+  "! Read a message from the channel"
+  "mychannel get in-messages>> mailbox-get"
+}
+  ;
+
+ABOUT: "irc.client"
\ No newline at end of file
diff --git a/extra/irc/client/client.factor b/extra/irc/client/client.factor
index c712b2672e..e633f140fb 100644
--- a/extra/irc/client/client.factor
+++ b/extra/irc/client/client.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2007 Doug Coleman, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays combinators concurrency.mailboxes fry io
+USING: arrays combinators concurrency.mailboxes fry io strings
        io.encodings.8-bit io.sockets kernel namespaces sequences
        sequences.lib splitting threads calendar classes.tuple
        classes ascii assocs accessors destructors continuations ;
@@ -18,9 +18,6 @@ SYMBOL: current-irc-client
 TUPLE: irc-profile server port nickname password ;
 C: <irc-profile> irc-profile
 
-TUPLE: irc-channel-profile name password ;
-: <irc-channel-profile> ( -- irc-channel-profile ) irc-channel-profile new ;
-
 ! "live" objects
 TUPLE: nick name channels log ;
 C: <nick> nick
@@ -55,7 +52,7 @@ UNION: irc-named-listener irc-nick-listener irc-channel-listener ;
 
 SINGLETON: irc-end          ! sent when the client isn't running anymore
 SINGLETON: irc-disconnected ! sent when connection is lost
-SINGLETON: irc-connected    ! sent when connection is instantiated
+SINGLETON: irc-connected    ! sent when connection is established
 UNION: irc-broadcasted-message irc-end irc-disconnected irc-connected ;
 
 TUPLE: irc-message line prefix command parameters trailing timestamp ;
@@ -73,9 +70,9 @@ TUPLE: mode < irc-message name channel mode ;
 TUPLE: unhandled < irc-message ;
 
 : terminate-irc ( irc-client -- )
-    [ stream>> dispose ]
     [ in-messages>> irc-end swap mailbox-put ]
     [ f >>is-running drop ]
+    [ stream>> dispose ]
     tri ;
 
 <PRIVATE
@@ -227,22 +224,25 @@ M: privmsg handle-outgoing-irc ( privmsg -- )
 ! ======================================
 
 : irc-mailbox-get ( mailbox quot -- )
-    swap 5 seconds  '[ , , , mailbox-get-timeout swap call ] [ drop ] recover ;
-
-: stream-readln-or-close ( stream -- str/f )
-    dup stream-readln [ nip ] [ dispose f ] if* ;
+    swap 5 seconds
+    '[ , , , mailbox-get-timeout swap call ]
+    [ drop ] recover ; inline
 
 : handle-reader-message ( irc-message -- )
     irc> in-messages>> mailbox-put ;
 
 DEFER: (connect-irc)
-: handle-disconnect ( error -- )
-    drop irc>
+
+: (handle-disconnect) ( -- )
+    irc>
         [ in-messages>> irc-disconnected swap mailbox-put ]
-        [ reconnect-time>> sleep (connect-irc) ]
+        [ dup reconnect-time>> sleep (connect-irc) ]
         [ profile>> nickname>> /LOGIN ]
     tri ;
 
+: handle-disconnect ( error -- )
+    drop irc> is-running>> [ (handle-disconnect) ] when ;
+
 : (reader-loop) ( -- )
     irc> stream>> [
         |dispose stream-readln [
@@ -265,15 +265,22 @@ DEFER: (connect-irc)
 : in-multiplexer-loop ( -- )
     irc> in-messages>> [ handle-incoming-irc ] irc-mailbox-get ;
 
+: strings>privmsg ( name string -- privmsg )
+    privmsg new [ (>>trailing) ] keep [ (>>name) ] keep ;
+
 : maybe-annotate-with-name ( name obj -- obj )
-    dup privmsg instance? [ swap >>name ] [ nip ] if ;
+    {
+        { [ dup string? ] [ strings>privmsg ] }
+        { [ dup privmsg instance? ] [ swap >>name ] }
+    } cond ;
 
 : listener-loop ( name listener -- )
-    out-messages>> mailbox-get maybe-annotate-with-name
-    irc> out-messages>> mailbox-put ;
+    out-messages>> swap
+    '[ , swap maybe-annotate-with-name irc> out-messages>> mailbox-put ]
+    irc-mailbox-get ;
 
 : spawn-irc-loop ( quot name -- )
-    [ '[ @ irc> is-running>> ] ] dip
+    [ '[ irc> is-running>> [ @ ] when irc> is-running>> ] ] dip
     spawn-server drop ;
 
 : spawn-irc ( -- )
@@ -306,7 +313,7 @@ M: irc-server-listener (add-listener) ( irc-server-listener -- )
     f swap set+run-listener ;
 
 : (connect-irc) ( irc-client -- )
-    [ profile>> [ server>> ] keep port>> /CONNECT ] keep
+    [ profile>> [ server>> ] [ port>> ] bi /CONNECT ] keep
         swap >>stream
         t >>is-running
     in-messages>> irc-connected swap mailbox-put ;