From c56f8b4359f2730bb9e8bccd40bf2c9fa840f433 Mon Sep 17 00:00:00 2001
From: Zoffix Znet <cpan@zoffix.com>
Date: Sat, 4 Jun 2016 23:20:01 -0400
Subject: First working rewrite

---
 lib/IRC/Client/Grammar/Actions.pm6 | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'lib/IRC/Client/Grammar')

diff --git a/lib/IRC/Client/Grammar/Actions.pm6 b/lib/IRC/Client/Grammar/Actions.pm6
index 6ebe33d..cf702f8 100644
--- a/lib/IRC/Client/Grammar/Actions.pm6
+++ b/lib/IRC/Client/Grammar/Actions.pm6
@@ -40,8 +40,8 @@ method message ($match) {
         irc      => $!irc,
         nick     => %args<who><nick>//'',
         server   => $!server,
+        usermask => ~($match<prefix>//''),
         username => %args<who><user>//'';
-    .<usermask> = .<nick> ~ '!' ~ .<username> ~ '@' ~ .<host> given %msg-args;
 
     my $msg;
     given %msg-args<command> {
@@ -53,11 +53,17 @@ method message ($match) {
                 :channel( %args<params>[0] ),
                 |%msg-args;
         }
-        when 'NOTICE'  { $msg = msg-notice  %args, %msg-args }
-        when 'MODE'    { $msg = msg-mode    %args, %msg-args }
-        when 'PING'    { $msg = IRC::Client::Message::Ping.new: |%msg-args; }
-        when 'PRIVMSG' { $msg = msg-privmsg %args, %msg-args }
-        default { $msg = IRC::Client::Message::Unknown.new: |%msg-args }
+        when 'PART' {
+            $msg = IRC::Client::Message::Part.new:
+                :channel( %args<params>[0] ),
+                |%msg-args;
+        }
+        when 'NOTICE'  { $msg = msg-notice  %args, %msg-args                  }
+        when 'MODE'    { $msg = msg-mode    %args, %msg-args                  }
+        when 'PING'    { $msg = IRC::Client::Message::Ping.new: |%msg-args    }
+        when 'PRIVMSG' { $msg = msg-privmsg %args, %msg-args                  }
+        when 'QUIT'    { $msg = IRC::Client::Message::Quit.new: |%msg-args    }
+        default        { $msg = IRC::Client::Message::Unknown.new: |%msg-args }
     }
 
     $match.make: $msg;
-- 
cgit v1.1