From: Alexander van Gessel <ai0867@gmail.com>
Date: Mon, 21 Jan 2013 03:04:06 +0000 (+0100)
Subject: Truncate messages that are longer than 512 bytes and catch any exceptions irclib... 
X-Git-Tag: 1.17~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3cc87513a7380dcde150192307a39ab3b8d50258;p=irker.git

Truncate messages that are longer than 512 bytes and catch any exceptions irclib throws about rejected messages.

Signed-off-by: Eric S. Raymond <esr@thyrsus.com>
---

diff --git a/irkerd b/irkerd
index 8ec8412..36b34ab 100755
--- a/irkerd
+++ b/irkerd
@@ -245,7 +245,17 @@ class Connection:
                         self.connection.join(channel)
                         self.irker.debug(1, "joining %s on %s." % (channel, self.servername))
                     for segment in message.split("\n"):
-                        self.connection.privmsg(channel, segment)
+                        # Truncate the message if it's too long,
+                        # but we're working with characters here,
+                        # not bytes, so we could be off.
+                        # 500 = 512 - CRLF - 'PRIVMSG ' - ' :'
+                        maxlength = 500 - len(channel)
+                        if len(segment) > maxlength:
+                            segment = segment[:maxlength]
+                        try:
+                            self.connection.privmsg(channel, segment)
+                        except ValueError as err:
+                            self.irker.debug(1, "irclib rejected a message to %s on %s because: %s" % (channel, self.servername, str(err)))
                         time.sleep(ANTI_FLOOD_DELAY)
                     self.last_xmit = self.channels_joined[channel] = time.time()
                     self.irker.debug(1, "XMIT_TTL bump (%s transmission) at %s" % (self.servername, time.asctime()))