From 5a0569a22f8f8d27e2a1ad5fdbfac5de979e5d6b Mon Sep 17 00:00:00 2001
From: jesopo <github@lolnerd.net>
Date: Sun, 15 Mar 2020 21:25:17 +0000
Subject: [PATCH] remove anything related to sending; we're just a state
 machine.

---
 README.md                      | 13 +++++++------
 ircstates/isupport/__init__.py |  8 +++++++-
 ircstates/server.py            |  9 ---------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 267ba8e..46454d5 100644
--- a/README.md
+++ b/README.md
@@ -22,22 +22,23 @@ CHAN = "#chan"
 HOST = "127.0.0.1"
 POST = 6667
 
-server = ircstates.Server("freenode")
-sock   = socket.socket()
+server  = ircstates.Server("freenode")
+sock    = socket.socket()
+encoder = irctokens.StatefulEncoder()
 
 sock.connect((HOST, POST))
 
 def _send(raw):
     tokens = irctokens.tokenise(raw)
-    server.send(tokens)
+    encoder.push(tokens)
 
 _send("USER test 0 * test")
 _send(f"NICK {NICK}")
 
 while True:
-    while server.pending():
-        send_lines = server.sent(sock.send(server.pending()))
-        for line in send_lines:
+    while encoder.pending():
+        sent_lines = encoder.pop(sock.send(encoder.pending()))
+        for line in sent_lines:
             print(f"> {line.format()}")
 
     recv_lines = server.recv(sock.recv(1024))
diff --git a/ircstates/isupport/__init__.py b/ircstates/isupport/__init__.py
index e6c8c38..a02fe8a 100644
--- a/ircstates/isupport/__init__.py
+++ b/ircstates/isupport/__init__.py
@@ -1,7 +1,9 @@
-from typing import List, Optional
+from typing import Dict, List, Optional
 from .tokens import ChanModes, Prefix
 
 class ISupport(object):
+    raw: Dict[str, Optional[str]]
+
     chanmodes = ChanModes(["b"], ["k"], ["l"], ["i", "m", "n", "p", "s", "t"])
     prefix    = Prefix(["o", "v"], ["@", "+"])
 
@@ -9,9 +11,13 @@ class ISupport(object):
     casemapping: str = "rfc1459"
     chantypes:   List[str] = ["#"]
 
+    def __init__(self):
+        self.raw = {}
+
     def tokens(self, tokens: List[str]):
         for token in tokens:
             key, sep, value = token.partition("=")
+            self.raw[key] = value if sep else None
 
             if key == "CHANMODES":
                 a, b, c, d = value.split(",")
diff --git a/ircstates/server.py b/ircstates/server.py
index fecb387..f731ece 100644
--- a/ircstates/server.py
+++ b/ircstates/server.py
@@ -31,7 +31,6 @@ class Server(Named):
         self.modes: List[str] = []
         self.motd:  List[str] = []
 
-        self._encoder = StatefulEncoder()
         self._decoder = StatefulDecoder()
 
         self.users:         Dict[str, User]                        = {}
@@ -56,13 +55,6 @@ class Server(Named):
             self.parse_tokens(line)
         return lines
 
-    def send(self, line: Line):
-        self._encoder.push(line)
-    def pending(self) -> bytes:
-        return self._encoder.pending()
-    def sent(self, byte_count: int) -> List[Line]:
-        return self._encoder.pop(byte_count)
-
     def parse_tokens(self, line: Line):
         if line.command in LINE_HANDLERS:
             for callback in LINE_HANDLERS[line.command]:
@@ -205,7 +197,6 @@ class Server(Named):
         self.channels.clear()
         self.user_channels.clear()
         self.channel_users.clear()
-        self._encoder.clear()
 
     @line_handler("QUIT")
     def handle_quit(self, line: Line):