Prevent raw text from being sent - irc.py

The true issue being that newlines didn't append the right command.
CloudBotIRC · Aug 29, 2015 · 3b8bf97 · 3b8bf97 · aikar · Aug 29, 2015
1 parent f258577
commit 3b8bf97
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/cloudbot/clients/irc.py b/cloudbot/clients/irc.py
@@ -140,21 +140,21 @@ def close(self):
         self._transport.close()
         self._connected = False
 
-    def message(self, target, *messages, newlines=False):
+    def message(self, target, *messages):
         for text in messages:
-            if newlines == False:
-                text = text.replace("\n", "").replace("\r", "")
-            self.cmd("PRIVMSG", target, text)
-
-    def action(self, target, text, newlines=False):
-        if newlines == False:
-            text = text.replace("\n", "").replace("\r", "")
-        self.ctcp(target, "ACTION", text)
-
-    def notice(self, target, text, newlines=False):
-        if newlines == False:
-            text = text.replace("\n", "").replace("\r", "")
-        self.cmd("NOTICE", target, text)
+            text = text.splitlines()
+            for line in text:
+                self.cmd("PRIVMSG", target, line)
+
+    def action(self, target, text):
+        text = text.splitlines()
+        for line in text:
+            self.ctcp(target, "ACTION", line)
+
+    def notice(self, target, text):
+        text = text.splitlines()
+        for line in text:
+            self.cmd("NOTICE", target, line)
 
     def set_nick(self, nick):
         self.cmd("NICK", nick)