From 90d3ac3cf6e08b5d6f823d0aa1da80a8f29421f9 Mon Sep 17 00:00:00 2001 From: James Lu Date: Thu, 23 Mar 2017 23:53:48 -0700 Subject: [PATCH] relay: skip message prefixing when forwarding a message for a service client (#403) --- plugins/relay.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/relay.py b/plugins/relay.py index 11a0eac..7af7467 100644 --- a/plugins/relay.py +++ b/plugins/relay.py @@ -1086,8 +1086,9 @@ def handle_messages(irc, numeric, command, args): # No relay clone exists for the sender; route the message through our # main client (or SID for notices). - # Skip "from:" formatting for servers; it's messy with longer hostnames - if numeric not in irc.servers: + # Skip "from:" formatting for servers; it's messy with longer hostnames. + # Also skip this formatting for servicebot relaying. + if numeric not in irc.servers and not irc.getServiceBot(numeric): displayedname = irc.getFriendlyName(numeric) real_text = '<%s/%s> %s' % (displayedname, irc.name, text) else: