From c9272c25ce3eb65e4cfd7b5456a44bba7b613de2 Mon Sep 17 00:00:00 2001
From: James Lu <james@overdrivenetworks.com>
Date: Sun, 2 Jul 2017 22:44:57 -0700
Subject: [PATCH] IRCS2SProtocol: skip implicit message sender fetching if the
 first arg starts with a :

---
 protocols/ircs2s_common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/protocols/ircs2s_common.py b/protocols/ircs2s_common.py
index 3985259..f300e9e 100644
--- a/protocols/ircs2s_common.py
+++ b/protocols/ircs2s_common.py
@@ -201,7 +201,7 @@ class IRCS2SProtocol(IRCCommonProtocol):
         elif sender_uid in self.users:
             # Sender is a user (converting from name to UID gave a valid result).
             sender = sender_uid
-        else:
+        elif not (args[0].startswith(':')):
             # No sender prefix; treat as coming from uplink IRCd.
             sender = self.uplink
             args.insert(0, sender)