From fb6ca2a4b9d78dd80dbdf37b2926d9ede4108e8b Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Wed, 18 Sep 2024 15:42:19 +0200
Subject: translate server messages

---
 server/src/main.rs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'server/src/main.rs')

diff --git a/server/src/main.rs b/server/src/main.rs
index de680200..20d9908d 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -22,7 +22,7 @@ use hurrycurry_protocol::{PacketC, PacketS, BINCODE_CONFIG, VERSION};
 use hurrycurry_server::{
     data::DATA_DIR,
     server::{GameServerExt, Server},
-    ConnectionID,
+    trm, ConnectionID,
 };
 use log::{debug, info, trace, warn, LevelFilter};
 use std::{
@@ -168,8 +168,8 @@ async fn run(addr: SocketAddr) -> anyhow::Result<()> {
                             rx = rx.resubscribe();
                             warn!("Client was lagging; resubscribed: {e}");
                             PacketC::ServerMessage {
-                                text: "Lagging behind. Some clientbound packets were dropped."
-                                    .to_string(),
+                                message: trm!("s.state.overflow_resubscribe"),
+                                error: true,
                             }
                         }
                    }),
@@ -226,9 +226,10 @@ async fn run(addr: SocketAddr) -> anyhow::Result<()> {
                 let packet_out = match state.write().await.packet_in_outer(id, packet).await {
                     Ok(packets) => packets,
                     Err(e) => {
-                        warn!("Client error: {e}");
-                        vec![PacketC::Error {
-                            message: format!("{e}"),
+                        warn!("Client error: {e:?}");
+                        vec![PacketC::ServerMessage {
+                            message: e.into(),
+                            error: true,
                         }]
                     }
                 };
-- 
cgit v1.2.3-70-g09d2