Add localizable metadata to ban notices

server/exceptions.py

@@ -39,6 +39,19 @@ def message(self):
             "moderation@faforever.com</i>"
         )
 
+    def notice(self):
+        return {
+            "command": "notice",
+            "style": "error",
+            "text": self.message(),
+            "i18n_key": "login.error.banned",
+            "i18n_args": [
+                self.ban_expiry.isoformat(),
+                self.ban_reason
+            ],
+            "expires_at": self.ban_expiry.isoformat()
+        }
+
     def _ban_duration_text(self):
         ban_duration = self.ban_expiry - datetime_now()
         if ban_duration.days > 365 * 100:

server/lobbyconnection.py

@@ -222,11 +222,7 @@ async def on_message_received(self, message):
                 "text": e.message
             })
         except BanError as e:
-            await self.send({
-                "command": "notice",
-                "style": "error",
-                "text": e.message()
-            })
+            await self.send(e.notice())
             await self.abort(e.message())
         except ClientError as e:
             self._logger.warning(

server/protocol/qdatastream.py

@@ -92,7 +92,7 @@ def pack_message(*args: str) -> bytes:
                 raise NotImplementedError("Only string serialization is supported")
 
             msg += QDataStreamProtocol.pack_qstring(arg)
-        return QDataStreamProtocol.pack_block(msg)
+        return QDataStreamProtocol.pack_block(bytes(msg))
 
     @staticmethod
     def encode_message(message: dict) -> bytes:

tests/integration_tests/test_login.py

@@ -38,15 +38,15 @@ async def test_server_ban(lobby_server, user):
     proto = await connect_client(lobby_server)
     await perform_login(proto, user)
     msg = await proto.read_message()
-    assert msg == {
-        "command": "notice",
-        "style": "error",
-        "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 "
-            "email to: moderation@faforever.com</i>"
-        )
-    }
+    assert msg["command"] == "notice"
+    assert msg["style"] == "error"
+    assert msg["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 "
+        "email to: moderation@faforever.com</i>"
+    )
+    assert msg["i18n_key"] == "login.error.banned"
+    assert msg["i18n_args"] == [msg["expires_at"], "Test permanent ban"]
 
 
 @pytest.mark.parametrize("user", [
@@ -73,15 +73,15 @@ async def test_server_ban_token(lobby_server, user, jwk_priv_key, jwk_kid):
         "unique_id": "some_id"
     })
     msg = await proto.read_message()
-    assert msg == {
-        "command": "notice",
-        "style": "error",
-        "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 "
-            "email to: moderation@faforever.com</i>"
-        )
-    }
+    assert msg["command"] == "notice"
+    assert msg["style"] == "error"
+    assert msg["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 "
+        "email to: moderation@faforever.com</i>"
+    )
+    assert msg["i18n_key"] == "login.error.banned"
+    assert msg["i18n_args"] == [msg["expires_at"], "Test permanent ban"]
 
 
 @pytest.mark.parametrize("user", ["ban_revoked", "ban_expired"])

tests/integration_tests/test_server.py

@@ -845,15 +845,15 @@ async def test_server_ban_prevents_hosting(lobby_server, database, command):
     await proto.send_message({"command": command})
 
     msg = await proto.read_message()
-    assert msg == {
-        "command": "notice",
-        "style": "error",
-        "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 "
-            "to: moderation@faforever.com</i>"
-        )
-    }
+    assert msg["command"] == "notice"
+    assert msg["style"] == "error"
+    assert msg["i18n_key"] == "login.error.banned"
+    assert msg["i18n_args"] == [msg["expires_at"], "Test live ban"]
+    assert msg["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 "
+        "to: moderation@faforever.com</i>"
+    )
 
 
 @fast_forward(5)

tests/unit_tests/test_lobbyconnection.py

@@ -1308,6 +1308,17 @@ async def test_abort_connection_if_banned(
         "<br><br><i>If you would like to appeal this ban, please send an email "
         "to: moderation@faforever.com</i>"
     )
+    assert banned_error.value.notice() == {
+        "command": "notice",
+        "style": "error",
+        "text": banned_error.value.message(),
+        "i18n_key": "login.error.banned",
+        "i18n_args": [
+            banned_error.value.ban_expiry.isoformat(),
+            "Test permanent ban"
+        ],
+        "expires_at": banned_error.value.ban_expiry.isoformat()
+    }
 
     # test user who is banned for another 46 hours
     lobbyconnection.player.id = 204