Garmelon/cove
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Omit error and throttled* fields when serializing

Browse source
This commit is contained in:
Joscha 2022-06-22 22:12:51 +02:00
parent 9dbadb0a3f
commit 00b1f91f71
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cove-tui/src/euph/api/packet.rs
View file

@ -8,8 +8,11 @@ pub struct Packet {
pub id: Option<String>, pub id: Option<String>,
pub r#type: PacketType, pub r#type: PacketType,
pub data: Option<Value>, pub data: Option<Value>,
#[serde(skip_serializing)]
pub error: Option<String>, pub error: Option<String>,
pub throttled: Option<bool>, #[serde(default, skip_serializing)]
pub throttled: bool,
#[serde(skip_serializing)]
pub throttled_reason: Option<String>, pub throttled_reason: Option<String>,
} }
@ -174,7 +177,7 @@ impl ParsedPacket {
Ok(Data::from_value(r#type, data)?) Ok(Data::from_value(r#type, data)?)
}; };
let throttled = if packet.throttled == Some(true) { let throttled = if packet.throttled {
let reason = packet let reason = packet
.throttled_reason .throttled_reason
.unwrap_or_else(|| "no reason given".to_string()); .unwrap_or_else(|| "no reason given".to_string());
@ -194,7 +197,7 @@ impl ParsedPacket {
pub fn to_packet(self) -> serde_json::Result<Packet> { pub fn to_packet(self) -> serde_json::Result<Packet> {
let id = self.id; let id = self.id;
let r#type = self.r#type; let r#type = self.r#type;
let throttled = self.throttled.as_ref().map(|_| true); let throttled = self.throttled.is_some();
let throttled_reason = self.throttled; let throttled_reason = self.throttled;
Ok(match self.content { Ok(match self.content {