X-Git-Url: https://plomlompom.com/repos/?p=plomlombot-irc.git;a=blobdiff_plain;f=plomlombot.py;h=179bc2a2221d90da84580f57898aa3b704fca0f5;hp=747ab077700fa772d1c54cc62b61290c1a7bcad1;hb=01c61f5d9bfe03ad40b4deda9f23ff97ef7ac2d8;hpb=24cf06720f7e0c13e6075f69426529a2119085ba

diff --git a/plomlombot.py b/plomlombot.py
index 747ab07..179bc2a 100644
--- a/plomlombot.py
+++ b/plomlombot.py
@@ -1,11 +1,13 @@
 import socket
-import datetime 
+import datetime
 import select
 import time
 import re
 import urllib.request
 import html
 
+servernet = "irc.freenode.net"
+port = 6667
 servername = ""
 timeout = 480
 username = "plomlombot"
@@ -13,6 +15,7 @@ nickname = username
 channel = "#zrolaps"
 
 class IO:
+
     def __init__(self, server, port):
         self.socket = socket.socket()
         self.socket.connect((server, port))
@@ -20,12 +23,20 @@ class IO:
         self.line_buffer = []
         self.rune_buffer = ""
         self.last_pong = time.time()
+
     def _pingtest(self):
         if self.last_pong + timeout < time.time():
             raise RuntimeError("server not answering")
         self.send_line("PING " + nickname + " " + servername)
-    def send_line(self, msg_orig):
-        msg = msg_orig + "\r\n"
+
+    def send_line(self, msg):
+        msg = msg.replace("\r", " ")
+        msg = msg.replace("\n", " ")
+        if len(msg.encode("utf-8")) > 510:
+            print("NOT SENT LINE TO SERVER (too long): " + msg)
+        print("LINE TO SERVER: "
+            + str(datetime.datetime.now()) + ": " + msg)
+        msg = msg + "\r\n"
         msg_len = len(msg)
         total_sent_len = 0
         while total_sent_len < msg_len:
@@ -33,8 +44,7 @@ class IO:
             if sent_len == 0:
                 raise RuntimeError("socket connection broken")
             total_sent_len += sent_len
-        print("LINE TO SERVER: "
-            + str(datetime.datetime.now()) + ": " + msg_orig)
+
     def recv_line_wrapped(self):
         if len(self.line_buffer) > 0:
             return self.line_buffer.pop(0)
@@ -53,6 +63,7 @@ class IO:
             self.rune_buffer = lines_split[-1]
             if len(self.line_buffer) > 0:
                 return self.line_buffer.pop(0)
+
     def recv_line(self):
         line = self.recv_line_wrapped()
         if line:
@@ -60,7 +71,7 @@ class IO:
             line)
         return line
 
-io = IO("irc.freenode.net", 6667)
+io = IO(servernet, port)
 io.send_line("NICK " + nickname)
 io.send_line("USER " + username + " 0 * : ")
 io.send_line("JOIN " + channel)