Skip to content

v15: Add linked_spaces, country_code, hint and areas #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 1, 2025
Merged

v15: Add linked_spaces, country_code, hint and areas #118

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4611401
Add linked_spaces field
rnestler May 5, 2024
d08cde0
Add country_code, hint and areas to Location
rnestler May 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions src/status.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@ use crate::sensors::Sensors;

type Extensions = BTreeMap<String, Value>;

#[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq)]
pub struct Area {
#[serde(skip_serializing_if = "Option::is_none")]
name: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
description: Option<String>,
square_meters: f64,
}

#[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq)]
pub struct Location {
#[serde(skip_serializing_if = "Option::is_none")]
Expand All @@ -15,6 +24,12 @@ pub struct Location {
pub lon: f64,
#[serde(skip_serializing_if = "Option::is_none")]
pub timezone: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub country_code: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub hint: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub areas: Option<Vec<Area>>,
}

#[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq, Eq)]
Expand Down Expand Up @@ -225,6 +240,12 @@ pub enum ApiVersion {
V14,
}

#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
pub struct LinkedSpace {
endpoint: String,
website: String,
}

/// The main SpaceAPI status object.
#[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq)]
pub struct Status {
Expand Down Expand Up @@ -260,6 +281,8 @@ pub struct Status {
pub links: Option<Vec<Link>>,
#[serde(skip_serializing_if = "Option::is_none")]
pub membership_plans: Option<Vec<MembershipPlan>>,
#[serde(skip_serializing_if = "Option::is_none")]
pub linked_spaces: Option<Vec<LinkedSpace>>,

// SpaceAPI internal usage
#[serde(skip_serializing_if = "Option::is_none")]
Expand Down Expand Up @@ -968,6 +991,15 @@ mod test {
},
r#"{"ustream":"http://www.ustream.tv/channel/hackspsps"}"#
);

test_serialize!(
area,
Area {
square_meters: 120.0,
..Area::default()
},
r#"{"square_meters":120.0}"#
);
}

mod deserialize {
Expand Down