From: Christian Heller <c.heller@plomlompom.de>
Date: Sun, 25 Oct 2020 02:19:17 +0000 (+0100)
Subject: Don't use LOG for meta messages, errors.
X-Git-Url: https://plomlompom.com/repos/%22https:/validator.w3.org/test?a=commitdiff_plain;h=a0afb82a75abf2907e57ba5e6d2244fb02613a7c;p=plomrogue2-experiments

Don't use LOG for meta messages, errors.
---

diff --git a/new2/plomrogue/commands.py b/new2/plomrogue/commands.py
index a68efc2..79a4678 100644
--- a/new2/plomrogue/commands.py
+++ b/new2/plomrogue/commands.py
@@ -1,29 +1,28 @@
 from plomrogue.misc import quote
+from plomrogue.errors import GameError
 
 
 
 def cmd_ALL(game, msg, connection_id):
     if not connection_id in game.sessions:
-        game.io.send('LOG' + quote('need to be logged in for this'), connection_id)
-        return
+        raise GameError('need to be logged in for this')
     t = game.get_thing(game.sessions[connection_id], False)
     game.io.send('LOG ' + quote(t.nickname + ': ' + msg))
 cmd_ALL.argtypes = 'string'
 
 def cmd_LOGIN(game, nick, connection_id):
     for t in [t for t in game.things if t.type_ == 'player' and t.nickname == nick]:
-        game.io.send('LOG ' + quote('name already in use'), connection_id)
-        return
+        raise GameError('name already in use')
     t = game.thing_types['player'](game)
     t.nickname = nick
     game.things += [t]  # TODO refactor into Thing.__init__?
     game.sessions[connection_id] = t.id_ 
-    game.io.send('LOG ' + quote('your are now: ' + nick), connection_id)
+    game.io.send('META ' + quote('you are now: ' + nick), connection_id)
 cmd_LOGIN.argtypes = 'string'
 
 def cmd_QUERY(game, target_nick, msg, connection_id):
     if not connection_id in game.sessions:
-        game.io.send('LOG ' + quote('can only query when logged in'), connection_id)
+        raise GameError('can only query when logged in')
     t = game.get_thing(game.sessions[connection_id], False)
     source_nick = t.nickname
     for t in [t for t in game.things if t.type_ == 'player' and t.nickname == target_nick]:
@@ -32,6 +31,6 @@ def cmd_QUERY(game, target_nick, msg, connection_id):
                 game.io.send('LOG ' + quote(source_nick+ '->' + target_nick + ': ' + msg), c_id)
                 game.io.send('LOG ' + quote(source_nick+ '->' + target_nick + ': ' + msg), connection_id)
                 return
-        game.io.send('LOG ' + quote('target user offline?'))
-    game.io.send('LOG ' + quote('can only query with registered nicknames'))
+        raise GameError('target user offline')
+    raise GameError('can only query with registered nicknames')
 cmd_QUERY.argtypes = 'string string'
diff --git a/new2/rogue_chat.html b/new2/rogue_chat.html
index 10e5ee2..bc90c07 100644
--- a/new2/rogue_chat.html
+++ b/new2/rogue_chat.html
@@ -217,6 +217,8 @@ websocket.onmessage = function (event) {
     tui.draw_map();
   } else if (tokens[0] === 'LOG') {
      tui.log_msg(tokens[1], 1);
+  } else if (tokens[0] === 'META') {
+     tui.log_msg(tokens[1]);
   } else if (tokens[0] === 'UNHANDLED_INPUT') {
      tui.log_msg('unknown command');
   } else if (tokens[0] === 'GAME_ERROR') {