YGGverse/xash3d-master
1
0
Fork 0
mirror of https://git.mentality.rip/numas13/xash3d-master.git synced 2025-01-22 12:54:24 +00:00
Code Issues Projects Releases Wiki Activity

query: trim colors from server names

Browse Source
This commit is contained in:
Denis Drakhnia 2023-10-19 18:29:41 +03:00
parent e6bee38a18
commit 214948cba9
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
query/src/main.rs
View File

@ -13,7 +13,7 @@ use std::sync::{mpsc, Arc};
use std::thread;
use std::time::{Duration, Instant};
use serde::Serialize;
use serde::{Serialize, Serializer};
use thiserror::Error;
use xash3d_protocol::types::Str;
use xash3d_protocol::{color, game, master, server, Error as ProtocolError};
@ -106,6 +106,7 @@ impl ServerResult {
struct ServerInfo {
pub gamedir: String,
pub map: String,
#[serde(serialize_with = "serialize_colored")]
pub host: String,
pub protocol: u8,
pub numcl: u8,
@ -151,6 +152,13 @@ struct ListResult<'a> {
servers: &'a [&'a str],
}
fn serialize_colored<S>(s: &str, ser: S) -> Result<S::Ok, S::Error>
where
S: Serializer,
{
ser.serialize_str(color::trim_color(s).as_ref())
}
struct Colored<'a> {
inner: &'a str,
forced: bool,