diff --git a/extra/irc/client/internals/internals.factor b/extra/irc/client/internals/internals.factor index 5d7cca4bfa..89c8423f51 100644 --- 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 6119e8e81c..b3af41ad3d 100644 --- 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