diff options
Diffstat (limited to 'server/replaytool/src')
-rw-r--r-- | server/replaytool/src/main.rs | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/server/replaytool/src/main.rs b/server/replaytool/src/main.rs index a6ad70fd..530d1a76 100644 --- a/server/replaytool/src/main.rs +++ b/server/replaytool/src/main.rs @@ -19,7 +19,7 @@ use anyhow::{anyhow, Context}; use async_compression::tokio::{bufread::ZstdDecoder, write::ZstdEncoder}; use clap::Parser; use futures_util::{SinkExt, StreamExt}; -use hurrycurry_protocol::{PacketC, PacketS}; +use hurrycurry_protocol::{Message, PacketC, PacketS}; use log::{debug, info, warn, LevelFilter}; use serde::{Deserialize, Serialize}; use std::{ @@ -32,7 +32,7 @@ use tokio::{ net::TcpListener, time::sleep, }; -use tokio_tungstenite::tungstenite::Message; +use tokio_tungstenite::tungstenite; #[derive(Parser)] enum Args { @@ -121,7 +121,7 @@ async fn main() -> anyhow::Result<()> { .await?; 'outer: while let Some(Ok(message)) = sock.next().await { match message { - Message::Text(line) => { + tungstenite::Message::Text(line) => { let packet: PacketS = match serde_json::from_str(&line) { Ok(p) => p, Err(e) => { @@ -135,7 +135,11 @@ async fn main() -> anyhow::Result<()> { PacketS::Join { .. } => { sock.send(tokio_tungstenite::tungstenite::Message::Text( serde_json::to_string(&PacketC::ServerMessage { - text: "Replays cannot be joined".to_string(), + message: Message::Translation { + id: "s.replay.cannot_join".to_owned(), + params: vec![], + }, + error: true, }) .unwrap(), )) @@ -160,7 +164,7 @@ async fn main() -> anyhow::Result<()> { x => warn!("unhandled client packet: {x:?}"), } } - Message::Close(_) => break, + tungstenite::Message::Close(_) => break, _ => (), } } @@ -182,7 +186,7 @@ pub async fn do_record(output: &Path, url: &str) -> anyhow::Result<()> { while let Some(Ok(message)) = sock.next().await { match message { - Message::Text(line) => { + tungstenite::Message::Text(line) => { let packet: PacketC = serde_json::from_str(&line).context("invalid packet")?; debug!("<- {packet:?}"); @@ -206,7 +210,7 @@ pub async fn do_record(output: &Path, url: &str) -> anyhow::Result<()> { break; } } - Message::Close(_) => break, + tungstenite::Message::Close(_) => break, _ => (), } } |