operspy who

myirc/include/snote.hpp

@@ -27,6 +27,7 @@ enum class SnoteTag
     FailedChallengeTls,
     Freeze,
     IsNowOper,
+    IsNowOperGlobal,
     JoinedJuped,
     Killed,
     KilledRemote,
@@ -38,6 +39,7 @@ enum class SnoteTag
     NickCollision,
     NickCollisionServices,
     OperspyWhois,
+    OperspyWho,
     PossibleFlooder,
     PropagatedBanExpired,
     RejectingKlined,

myirc/snote.cpp

@@ -89,9 +89,15 @@ const SnotePattern static patterns[] = {
     {SnoteTag::IsNowOper,
      R"(^([^ ]+) \(([^ ]+)!([^ ]+)@([^ ]+)\) is now an operator$)"},
 
+    {SnoteTag::IsNowOperGlobal,
+     R"(^([^ ]+) \(([^ ]+)@([^ ]+)\) is now an operator$)"},
+
     {SnoteTag::OperspyWhois,
      R"(^OPERSPY ([^ ]+)!([^ ]+)@([^ ]+)\{([^ ]+)\} WHOIS ([^ ]+)!([^ ]+)@([^ ]+) ([^ ]+) $)"}, // trailing space intentional
 
+    {SnoteTag::OperspyWho,
+     R"(^OPERSPY ([^ ]+)!([^ ]+)@([^ ]+)\{([^ ]+)\} WHO ([^ ]+)$)"},
+
     {SnoteTag::Freeze,
      "^\x02([^ ]+)\x02 froze the account \x02([^ ]+)\x02 \\((.*)\\)\\.$"},
 
@@ -108,7 +114,7 @@ const SnotePattern static patterns[] = {
      R"(^Nick collision due to services forced nick change on ([^ ]+)$)"},
 
     {SnoteTag::NickCollision,
-     R"(^Nick collision on ([^ ]+)\(([^ ]+) <- ([^ ]+)\)\(([^ ]+)\)$)"},
+     R"(^Nick collision on ([^ ]+)\(([^ ]+) <- ([^ ]+)\)\(([^ ]+) ([^ ]+)\)$)"},
 
     {SnoteTag::TemporaryDline,
      R"(^([^ ]+) added temporary ([^ ]+) min\. D-Line for \[([^ ]+)\] \[(.*)\]$)"},