From 447fcfccc585a7dab07ec1f1875daf042463d89b Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sat, 23 Dec 2023 10:11:50 +0000 Subject: [PATCH] Cope with some optional fields --- src/main.rs | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/src/main.rs b/src/main.rs index 84e0955..4d06536 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,6 @@ use serde::{Deserialize, Serialize}; use serde_json::Result; +use std::option::Option; #[derive(Serialize, Deserialize, Debug)] struct Account { @@ -18,11 +19,11 @@ struct Account { // emojis: Vec, bot: bool, group: bool, - // discoverable: optional bool, - // noindex: optional bool, - // moved: optional Account (!), - // suspended: optional bool, - // limited: optional bool, + discoverable: Option, + noindex: Option, + // moved: Option (!), + suspended: Option, + limited: Option, created_at: String, // FIXME: sort out dates! last_status_at: String, // FIXME: sort out dates! statuses_count: u64, @@ -49,20 +50,20 @@ struct Status { favourites_count: u64, replies_count: u64, url: String, - // in_reply_to_id: optional String, - // in_reply_to_account_id: optional String, - // reblog: optional Status (!), - // poll: optional Poll, - // card: optional PreviewCard, - // language: optional String, - // text: optional String, - // edited_at: optional String, // FIXME actually a date - // favourited: optional bool, - // reblogged: optional bool, - // muted: optional bool, - // bookmarked: optional bool, - // pinned: optional bool, - // filtered: optional bool, + in_reply_to_id: Option, + in_reply_to_account_id: Option, + // reblog: Option (!), + // poll: Option, + // card: Option, + language: Option, + text: Option, + edited_at: Option, // FIXME actually a date + favourited: Option, + reblogged: Option, + muted: Option, + bookmarked: Option, + pinned: Option, + filtered: Option, } fn main() { -- 2.30.2