From d2da9fcd250533bee5df17bd182648a8cea0d7b0 Mon Sep 17 00:00:00 2001
From: Zoffix Znet <cpan@zoffix.com>
Date: Sun, 6 Dec 2015 18:07:19 -0500
Subject: Prerelease

---
 lib/IRC/Grammar/Actions.pm6 | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'lib/IRC/Grammar/Actions.pm6')

diff --git a/lib/IRC/Grammar/Actions.pm6 b/lib/IRC/Grammar/Actions.pm6
index 7093b99..74a8f11 100644
--- a/lib/IRC/Grammar/Actions.pm6
+++ b/lib/IRC/Grammar/Actions.pm6
@@ -3,12 +3,11 @@ method TOP ($/) { $/.make: $<message>>>.made }
 method message ($/) {
     my $pref = $/<prefix>;
     my %args = command => ~$/<command>;
-    if ( $pref<servername>.defined ) {
-        %args<who><host> = ~$pref<servername>;
-    }
-    else {
-        %args<who><nick user host> = $pref<nick  user  host>».Str;
+    for qw/nick user host/ {
+        $pref{$_}.defined or next;
+        %args<who>{$_} = $pref{$_}.Str;
     }
+    %args<who><host> = ~$pref<servername> if $pref<servername>.defined;
 
     my $p = $/<params>;
     loop {
-- 
cgit v1.1