Add multiline support to client.message()/client.notice().

shizmob · Jan 30, 2014 · c941d2b · c941d2b
1 parent c2e27a4
commit c941d2b
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/pydle/client.py b/pydle/client.py
@@ -374,8 +374,9 @@ def message(self, target, message):
         # Leeway.
         chunklen = protocol.MESSAGE_LENGTH_LIMIT - len('{hostmask} PRIVMSG {target} :'.format(hostmask=hostmask, target=target)) - 25
 
-        for msg in _chunkify(message, chunklen):
-            self.rawmsg('PRIVMSG', target, msg)
+        for line in message.replace('\r', '').split('\n'):
+            for chunk in _chunkify(line, chunklen):
+                self.rawmsg('PRIVMSG', target, chunk)
 
     def notice(self, target, message):
         """ Notice channel or user. """
@@ -386,8 +387,9 @@ def notice(self, target, message):
         # Leeway.
         chunklen = protocol.MESSAGE_LENGTH_LIMIT - len('{hostmask} NOTICE {target} :'.format(hostmask=hostmask, target=target)) - 25
 
-        for msg in _chunkify(message, chunklen):
-            self.rawmsg('NOTICE', target, msg)
+        for line in message.replace('\r', '').split('\n'):
+            for chunk in _chunkify(line, chunklen):
+                self.rawmsg('NOTICE', target, chunk)
 
     def mode(self, target, *modes):
         """ Set mode on target. """