irc.client: Forward messages before processing for now. Change text for

some log lines

diff --git a/extra/irc/client/internals/internals.factor b/extra/irc/client/internals/internals.factor
index 5d7cca4bfaa84701eeb430d00dd4b747ba60ec86..89c8423f512ccb95f49310a848dd47a77bc5fcde 100644 (file)
--- a/extra/irc/client/internals/internals.factor
+++ b/extra/irc/client/internals/internals.factor
@@ -112,9 +112,10 @@ M: f      handle-input handle-disconnect ;
 
 ! Processing loops
 
+! FIXME: should get forward channels, process the message, and then forward
 : in-multiplexer-loop ( -- ? )
     irc> in-messages>> mailbox-get
-    [ process-message ] [ forward-message ] [ irc-end? not ] tri ;
+    [ forward-message ] [ process-message ] [ irc-end? not ] tri ;
 
 : strings>privmsg ( name string -- privmsg )
     " :" prepend append "PRIVMSG " prepend string>irc-message ;

diff --git a/extra/irc/logbot/log-line/log-line.factor b/extra/irc/logbot/log-line/log-line.factor
index 6119e8e81c2fc2172f8f35b3234329a0780fa0ba..b3af41ad3de34e8e0e53f807b6d83f26ef8900b0 100644 (file)
--- a/extra/irc/logbot/log-line/log-line.factor
+++ b/extra/irc/logbot/log-line/log-line.factor
@@ -15,14 +15,14 @@ M: privmsg >log-line
     [ "<" % dup sender>> % "> " % text>> % ] "" make ;
 
 M: join >log-line
-    [ "* " % sender>> % " has entered the channel." % ] "" make ;
+    [ "* " % sender>> % " has joined the channel." % ] "" make ;
 
 M: part >log-line
     [ "* " % dup sender>> % " has left the channel" %
       comment>> dot-or-parens % ] "" make ;
 
 M: quit >log-line
-    [ "* " % dup sender>> % " has left IRC" %
+    [ "* " % dup sender>> % " has quit" %
       comment>> dot-or-parens % ] "" make ;
 
 M: kick >log-line