Change ban errors to use 'kick' style

This signals to the client that it should close itself.
FAForever · Dec 27, 2023 · da15cda · da15cda
1 parent 89c9e60
commit da15cda
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/server/lobbyconnection.py b/server/lobbyconnection.py
@@ -184,7 +184,9 @@ async def on_message_received(self, message):
         except BanError as e:
             await self.send({
                 "command": "notice",
-                "style": "error",
+                # Tell the client to close itself. This prevents it from getting
+                # stuck in an auto-reconnect loop.
+                "style": "kick",
                 "text": e.message()
             })
             await self.abort(e.message())

diff --git a/tests/integration_tests/test_login.py b/tests/integration_tests/test_login.py
@@ -38,7 +38,7 @@ async def test_server_ban(lobby_server, user):
     msg = await proto.read_message()
     assert msg == {
         "command": "notice",
-        "style": "error",
+        "style": "kick",
         "text": (
             "You are banned from FAF forever. <br>Reason: <br>Test permanent ban"
             "<br><br><i>If you would like to appeal this ban, please send an "
@@ -73,7 +73,7 @@ async def test_server_ban_token(lobby_server, user, jwk_priv_key, jwk_kid):
     msg = await proto.read_message()
     assert msg == {
         "command": "notice",
-        "style": "error",
+        "style": "kick",
         "text": (
             "You are banned from FAF forever. <br>Reason: <br>Test permanent ban"
             "<br><br><i>If you would like to appeal this ban, please send an "

diff --git a/tests/integration_tests/test_server.py b/tests/integration_tests/test_server.py
@@ -727,7 +727,7 @@ async def test_server_ban_prevents_hosting(lobby_server, database, command):
     msg = await proto.read_message()
     assert msg == {
         "command": "notice",
-        "style": "error",
+        "style": "kick",
         "text": (
             "You are banned from FAF forever. <br>Reason: <br>Test live ban<br>"
             "<br><i>If you would like to appeal this ban, please send an email "