From: Christian Heller <c.heller@plomlompom.de>
Date: Tue, 10 Nov 2020 00:15:35 +0000 (+0100)
Subject: Split LOGIN into NICK and LOGIN.
X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/pick_tasks?a=commitdiff_plain;h=00167344ddc7cb47c344473e2bc3bbfef6b4fe41;p=plomrogue2

Split LOGIN into NICK and LOGIN.
---

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index a80731d..c2484bf 100644
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -11,28 +11,35 @@ def cmd_ALL(game, msg, connection_id):
     game.io.send('CHAT ' + quote(t.nickname + ': ' + msg))
 cmd_ALL.argtypes = 'string'
 
-# TOOD split into two commands
 def cmd_LOGIN(game, nick, connection_id):
     for t in [t for t in game.things if t.type_ == 'player' and t.nickname == nick]:
         raise GameError('name already in use')
     if connection_id in game.sessions:
-        t_id = game.sessions[connection_id]
-        t = game.get_thing(t_id, False)
-        old_nick = t.nickname
-        t.nickname = nick
-        game.io.send('CHAT ' + quote(old_nick + ' renamed themselves to ' + nick))
-    else:
-        t = game.thing_types['player'](game)
-        t.position = YX(game.map.size.y // 2, game.map.size.x // 2)
-        game.things += [t]  # TODO refactor into Thing.__init__?
-        game.sessions[connection_id] = t.id_
-        game.io.send('LOGIN_OK', connection_id)
-        t.nickname = nick
-        game.io.send('CHAT ' + quote(t.nickname + ' entered the map.'))
-        game.io.send('PLAYER_ID %s' % t.id_, connection_id)
+        raise GameError('cannot log in twice')
+    t = game.thing_types['player'](game)
+    t.position = YX(game.map.size.y // 2, game.map.size.x // 2)
+    game.things += [t]  # TODO refactor into Thing.__init__?
+    game.sessions[connection_id] = t.id_
+    game.io.send('LOGIN_OK', connection_id)
+    t.nickname = nick
+    game.io.send('CHAT ' + quote(t.nickname + ' entered the map.'))
+    game.io.send('PLAYER_ID %s' % t.id_, connection_id)
     game.changed = True
 cmd_LOGIN.argtypes = 'string'
 
+def cmd_NICK(game, nick, connection_id):
+    for t in [t for t in game.things if t.type_ == 'player' and t.nickname == nick]:
+        raise GameError('name already in use')
+    if not connection_id in game.sessions:
+        raise GameError('can only rename when already logged in')
+    t_id = game.sessions[connection_id]
+    t = game.get_thing(t_id, False)
+    old_nick = t.nickname
+    t.nickname = nick
+    game.io.send('CHAT ' + quote(old_nick + ' renamed themselves to ' + nick))
+    game.changed = True
+cmd_NICK.argtypes = 'string'
+
 def cmd_GET_GAMESTATE(game, connection_id):
     game.send_gamestate(connection_id)
 cmd_GET_GAMESTATE.argtypes = ''
diff --git a/rogue_chat.py b/rogue_chat.py
index 026fcdf..0b1ea23 100755
--- a/rogue_chat.py
+++ b/rogue_chat.py
@@ -2,8 +2,8 @@
 from plomrogue.game import Game
 from plomrogue.io_websocket import PlomWebSocketServer
 from plomrogue.io_tcp import PlomTCPServer
-from plomrogue.commands import (cmd_ALL, cmd_LOGIN, cmd_QUERY, cmd_PING, cmd_MAP,
-                                cmd_TURN, cmd_MAP_LINE, cmd_GET_ANNOTATION,
+from plomrogue.commands import (cmd_ALL, cmd_LOGIN, cmd_NICK, cmd_QUERY, cmd_PING,
+                                cmd_MAP, cmd_TURN, cmd_MAP_LINE, cmd_GET_ANNOTATION,
                                 cmd_ANNOTATE, cmd_PORTAL, cmd_GET_GAMESTATE)
 from plomrogue.tasks import (Task_WAIT, Task_MOVE, Task_WRITE,
                              Task_FLATTEN_SURROUNDINGS)
@@ -16,6 +16,7 @@ savefile = sys.argv[1]
 game = Game(savefile)
 game.register_command(cmd_PING)
 game.register_command(cmd_LOGIN)
+game.register_command(cmd_NICK)
 game.register_command(cmd_QUERY)
 game.register_command(cmd_TURN)
 game.register_command(cmd_MAP)
diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py
index a6d1ca7..01e6dc3 100755
--- a/rogue_chat_curses.py
+++ b/rogue_chat_curses.py
@@ -549,7 +549,7 @@ class TUI:
                     elif self.input_.startswith('/nick'):
                         tokens = self.input_.split(maxsplit=1)
                         if len(tokens) == 2:
-                            self.send('LOGIN ' + quote(tokens[1]))
+                            self.send('NICK ' + quote(tokens[1]))
                         else:
                             self.log_msg('? need login name')
                     elif self.input_.startswith('/msg'):
diff --git a/rogue_chat_nocanvas_monochrome.html b/rogue_chat_nocanvas_monochrome.html
index 307bf26..c01f7ab 100644
--- a/rogue_chat_nocanvas_monochrome.html
+++ b/rogue_chat_nocanvas_monochrome.html
@@ -716,9 +716,9 @@ tui.inputEl.addEventListener('keydown', (event) => {
                     tui.log_help();
                 } else if (tokens[0].slice(1) == 'nick') {
                     if (tokens.length > 1) {
-                        server.send(['LOGIN', tokens[1]]);
+                        server.send(['NICK', tokens[1]]);
                     } else {
-                        tui.log_msg('? need login name');
+                        tui.log_msg('? need new name');
                     }
                 } else if (tokens[0].slice(1) == 'msg') {
                     if (tokens.length > 2) {