diff options
| author |  jesopo | 2019-02-10 18:43:04 +0000 |
|---|---|---|
| committer | jesopo | 2019-02-10 18:43:04 +0000 |
| commit | a3b9be3d3ddc666225c0aa0afb377a1ba3628ba8 (patch) | |
| tree | 198bc31701a205d4b108dc3e86d0c12754bce78c /src/IRCServer.py | |
| parent | Return truncted data from encode_truncate and hold it in IRCLine.Line (diff) | |
| signature | ||
Shift encoding/truncating IRC lines to src/IRCLine.py
Diffstat (limited to 'src/IRCServer.py')
| -rw-r--r-- | src/IRCServer.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/IRCServer.py b/src/IRCServer.py index 0b9f694c..f3f9d47b 100644 --- a/src/IRCServer.py +++ b/src/IRCServer.py @@ -9,8 +9,6 @@ UNTHROTTLED_MAX_LINES = 10 READ_TIMEOUT_SECONDS = 120 PING_INTERVAL_SECONDS = 30 -LINE_CUTOFF = 450 - class Server(IRCObject.Object): def __init__(self, bot: "IRCBot.Bot", @@ -315,11 +313,7 @@ class Server(IRCObject.Object): break line_stripped = line.split("\n", 1)[0].strip("\r") - encoded, truncated = utils.encode_truncate( - line_stripped, "utf8", LINE_CUTOFF) - encoded = b"%s\r\n" % encoded - - line_obj = IRCLine.Line(datetime.datetime.utcnow(), encoded, truncated) + line_obj = IRCLine.Line(datetime.datetime.utcnow(), line_stripped) self.queued_lines.append(line_obj) self.bot.log.debug("%s (raw send) | %s", [str(self), line]) @@ -332,7 +326,7 @@ class Server(IRCObject.Object): to_buffer = self.queued_lines[:throttle_space] self.queued_lines = self.queued_lines[throttle_space:] for line in to_buffer: - self.write_buffer += line.data + self.write_buffer += line.data() self.buffered_lines.append(line) bytes_written_i = self.socket.send(self.write_buffer) |