From e31b2a1ee4bb0c1ca89432e0fec4d5910b739334 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 27 Jan 2018 21:54:46 +0100
Subject: [PATCH] Rename protocol_keys ssl->telnet/ssl,
 websocket->webclient/websocket, ajax/comet->webclient/ajax.

---
 evennia/server/portal/ssh.py            | 1 +
 evennia/server/portal/telnet.py         | 4 ++--
 evennia/server/portal/telnet_ssl.py     | 2 +-
 evennia/server/portal/webclient.py      | 3 +++
 evennia/server/portal/webclient_ajax.py | 2 +-
 evennia/server/session.py               | 4 ++--
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/evennia/server/portal/ssh.py b/evennia/server/portal/ssh.py
index 9534a67244..29bd3eac87 100644
--- a/evennia/server/portal/ssh.py
+++ b/evennia/server/portal/ssh.py
@@ -90,6 +90,7 @@ class SshProtocol(Manhole, session.Session):
             starttuple (tuple): A (account, factory) tuple.
 
         """
+        self.protocol_key = "ssh"
         self.authenticated_account = starttuple[0]
         # obs must not be called self.factory, that gets overwritten!
         self.cfactory = starttuple[1]
diff --git a/evennia/server/portal/telnet.py b/evennia/server/portal/telnet.py
index bdb937bde5..aef96b6f38 100644
--- a/evennia/server/portal/telnet.py
+++ b/evennia/server/portal/telnet.py
@@ -34,8 +34,8 @@ class TelnetProtocol(Telnet, StatefulTelnetProtocol, Session):
     """
 
     def __init__(self, *args, **kwargs):
-        self.protocol_name = "telnet"
         super(TelnetProtocol, self).__init__(*args, **kwargs)
+        self.protocol_key = "telnet"
 
     def connectionMade(self):
         """
@@ -49,7 +49,7 @@ class TelnetProtocol(Telnet, StatefulTelnetProtocol, Session):
         # this number is counted down for every handshake that completes.
         # when it reaches 0 the portal/server syncs their data
         self.handshakes = 8  # suppress-go-ahead, naws, ttype, mccp, mssp, msdp, gmcp, mxp
-        self.init_session(self.protocol_name, client_address, self.factory.sessionhandler)
+        self.init_session(self.protocol_key, client_address, self.factory.sessionhandler)
         # add this new connection to sessionhandler so
         # the Server becomes aware of it.
         self.sessionhandler.connect(self)
diff --git a/evennia/server/portal/telnet_ssl.py b/evennia/server/portal/telnet_ssl.py
index b3d2ae4fa6..cbeb108ac5 100644
--- a/evennia/server/portal/telnet_ssl.py
+++ b/evennia/server/portal/telnet_ssl.py
@@ -67,7 +67,7 @@ class SSLProtocol(TelnetProtocol):
 
     def __init__(self, *args, **kwargs):
         super(SSLProtocol, self).__init__(*args, **kwargs)
-        self.protocol_name = "ssl"
+        self.protocol_key = "telnet/ssl"
 
 
 def verify_or_create_SSL_key_and_cert(keyfile, certfile):
diff --git a/evennia/server/portal/webclient.py b/evennia/server/portal/webclient.py
index d025b85018..70ebcab1ec 100644
--- a/evennia/server/portal/webclient.py
+++ b/evennia/server/portal/webclient.py
@@ -31,6 +31,9 @@ class WebSocketClient(Protocol, Session):
     """
     Implements the server-side of the Websocket connection.
     """
+    def __init__(self, *args, **kwargs):
+        super(WebSocketClient, self).__init__(*args, **kwargs)
+        self.protocol_key = "webclient/websocket"
 
     def connectionMade(self):
         """
diff --git a/evennia/server/portal/webclient_ajax.py b/evennia/server/portal/webclient_ajax.py
index c31f5d8eab..aa774e265c 100644
--- a/evennia/server/portal/webclient_ajax.py
+++ b/evennia/server/portal/webclient_ajax.py
@@ -298,7 +298,7 @@ class AjaxWebClientSession(session.Session):
     """
 
     def __init__(self, *args, **kwargs):
-        self.protocol_name = "ajax/comet"
+        self.protocol_key = "webclient/ajax"
         super(AjaxWebClientSession, self).__init__(*args, **kwargs)
 
     def get_client_session(self):
diff --git a/evennia/server/session.py b/evennia/server/session.py
index ed7dabbe8f..093a2c0d7a 100644
--- a/evennia/server/session.py
+++ b/evennia/server/session.py
@@ -47,8 +47,8 @@ class Session(object):
         a new session is established.
 
         Args:
-            protocol_key (str): By default, one of 'telnet', 'ssh',
-                'ssl' or 'web'.
+            protocol_key (str): By default, one of 'telnet', 'telnet/ssl', 'ssh',
+                'webclient/websocket' or 'webclient/ajax'.
             address (str): Client address.
             sessionhandler (SessionHandler): Reference to the
                 main sessionhandler instance.