From 2fb417f853c56b93ecaeb76016acd7f22a76426d Mon Sep 17 00:00:00 2001 From: Anna Date: Sun, 4 Sep 2022 17:04:44 -0400 Subject: [PATCH] yaws --- server/src/message.rs | 4 ++++ server/src/web/get_location.rs | 1 + server/src/web/get_message.rs | 1 + server/src/web/get_mine.rs | 1 + 4 files changed, 7 insertions(+) diff --git a/server/src/message.rs b/server/src/message.rs index c376ac3..888f5b0 100644 --- a/server/src/message.rs +++ b/server/src/message.rs @@ -7,6 +7,8 @@ pub struct Message { pub x: f32, pub y: f32, pub z: f32, + #[serde(default)] + pub yaw: f32, pub pack_id: Uuid, pub template_1: usize, @@ -24,6 +26,7 @@ pub struct RetrievedMessage { pub x: f64, pub y: f64, pub z: f64, + pub yaw: f64, pub message: String, pub positive_votes: i32, pub negative_votes: i32, @@ -37,6 +40,7 @@ pub struct RetrievedMessageTerritory { pub x: f64, pub y: f64, pub z: f64, + pub yaw: f64, pub message: String, pub positive_votes: i32, pub negative_votes: i32, diff --git a/server/src/web/get_location.rs b/server/src/web/get_location.rs index 566f2cb..035ed4f 100644 --- a/server/src/web/get_location.rs +++ b/server/src/web/get_location.rs @@ -29,6 +29,7 @@ async fn logic(state: Arc, id: i64, location: u32) -> Result, id: i64, message_id: Uuid) -> Result, id: i64) -> Result { m.x, m.y, m.z, + m.yaw, m.message, coalesce(sum(v.vote between 0 and 1), 0) as positive_votes, coalesce(sum(v.vote between -1 and 0), 0) as negative_votes,