From cadc7a6ee5c77b35bd8b48b058e109777a6e8fd0 Mon Sep 17 00:00:00 2001
From: Byron Jones <glob@mozilla.com>
Date: Mon, 15 Jun 2015 16:28:07 +0800
Subject: Bug 1174637: a double-colon nick is detected as ":"

---
 extensions/BugModal/lib/MonkeyPatches.pm | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'extensions')

diff --git a/extensions/BugModal/lib/MonkeyPatches.pm b/extensions/BugModal/lib/MonkeyPatches.pm
index c2e24f5ce..743573f32 100644
--- a/extensions/BugModal/lib/MonkeyPatches.pm
+++ b/extensions/BugModal/lib/MonkeyPatches.pm
@@ -42,10 +42,19 @@ use warnings;
 
 sub moz_nick {
     my ($self) = @_;
-    return $1 if $self->name =~ /:(.+?)\b/;
-    return $self->name if $self->name;
-    $self->login =~ /^([^\@]+)\@/;
-    return $1;
+    if (!exists $self->{moz_nick}) {
+        if ($self->name =~ /:?:(.+?)\b/) {
+            $self->{moz_nick} = $1;
+        }
+        elsif ($self->name) {
+            $self->{moz_nick} = $self->name;
+        }
+        else {
+            $self->login =~ /^([^\@]+)\@/;
+            $self->{moz_nick} = $1;
+        }
+    }
+    return $self->{moz_nick};
 }
 
 1;
-- 
cgit v1.2.3-24-g4f1b