diff options
| author |  jesopo | 2019-02-11 21:23:52 +0000 |
|---|---|---|
| committer | jesopo | 2019-02-11 21:23:52 +0000 |
| commit | b37a50ed7a964c07c6ea6e2f626ee3c1732876c1 (patch) | |
| tree | ccf786b9b5fa5aa69e0833953056a1d1bd3a858a /src | |
| parent | last_read/last_send is now handled by IRCSocket.py (diff) | |
| signature | ||
IRCServer should handle ping_sent, not IRCSocket
Diffstat (limited to 'src')
| -rw-r--r-- | src/IRCServer.py | 6 | ||||
| -rw-r--r-- | src/IRCSocket.py | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/IRCServer.py b/src/IRCServer.py index 52e1ab1c..f9f85c32 100644 --- a/src/IRCServer.py +++ b/src/IRCServer.py @@ -230,7 +230,11 @@ class Server(IRCObject.Object): return self.until_read_timeout == 0 def read(self) -> typing.Optional[typing.List[str]]: - return self.socket.read() + lines = self.socket.read() + if lines: + self.ping_sent = False + return lines + def send(self, line: str): results = self.events.on("preprocess.send").call_unsafe( server=self, line=line) diff --git a/src/IRCSocket.py b/src/IRCSocket.py index dabfc8b3..21ef2153 100644 --- a/src/IRCSocket.py +++ b/src/IRCSocket.py @@ -115,7 +115,6 @@ class Socket(IRCObject.Object): decoded_lines.append(decoded_line) self.last_read = time.monotonic() - self.ping_sent = False return decoded_lines def send(self, line: IRCLine.Line): |