refs #90 Add announcement entity

src/entities/announcement.rs

@@ -0,0 +1,44 @@
+use super::{status, Emoji};
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct Announcement {
+ pub id: String,
+ pub conent: String,
+ pub starts_at: Option<DateTime<Utc>>,
+ pub ends_at: Option<DateTime<Utc>>,
+ pub published: bool,
+ pub all_day: bool,
+ pub published_at: DateTime<Utc>,
+ pub updated_at: DateTime<Utc>,
+ pub read: Option<bool>,
+ pub mentions: Vec<Account>,
+ pub statuses: Vec<Status>,
+ pub tags: Vec<status::Tag>,
+ pub emojis: Vec<Emoji>,
+ pub reactions: Vec<Reaction>,
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct Account {
+ pub id: String,
+ pub username: String,
+ pub url: String,
+ pub acct: String,
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct Status {
+ pub id: String,
+ pub url: String,
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct Reaction {
+ pub name: String,
+ pub count: i64,
+ pub me: Option<bool>,
+ pub url: Option<String>,
+ pub static_url: Option<String>,
+}

src/entities/emoji.rs

@@ -6,4 +6,5 @@ pub struct Emoji {
  pub static_url: String,
  pub url: String,
  pub visible_in_picker: bool,
+ pub category: String,
 }

src/entities/mod.rs

@@ -2,6 +2,7 @@
 
 pub mod account;
 pub mod activity;
+pub mod announcement;
 pub mod application;
 pub mod async_attachment;
 pub mod attachment;
@@ -39,6 +40,7 @@ pub mod urls;
 
 pub use account::Account;
 pub use activity::Activity;
+pub use announcement::Announcement;
 pub use application::Application;
 pub use async_attachment::AsyncAttachment;
 pub use async_attachment::UploadMedia;

src/entities/status.rs

@@ -1,9 +1,8 @@
-use serde::{Deserialize, Serialize};
-
-use super::{Account, Application, Attachment, Card, Emoji, Mention, Poll, Reaction, Tag};
+use super::{Account, Application, Attachment, Card, Emoji, Mention, Poll, Reaction};
 use crate::error::{Error, Kind};
 use chrono::{DateTime, Utc};
 use core::fmt;
+use serde::{Deserialize, Serialize};
 use std::str::FromStr;
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
@@ -74,3 +73,9 @@ impl FromStr for StatusVisibility {
  }
  }
 }
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct Tag {
+ pub name: String,
+ pub url: String,
+}

src/entities/tag.rs

@@ -6,6 +6,6 @@ use super::History;
 pub struct Tag {
  pub name: String,
  pub url: String,
- pub history: Option<Vec<History>>,
+ pub history: Vec<History>,
  pub following: Option<bool>,
 }

src/friendica/entities/emoji.rs

@@ -27,6 +27,7 @@ impl Into<MegalodonEntities::Emoji> for Emoji {
  static_url: self.static_url,
  url: self.url,
  visible_in_picker: self.visible_in_picker,
+ category: "".to_string(),
  }
  }
 }

src/friendica/entities/status.rs

@@ -1,7 +1,7 @@
 use core::fmt;
 use std::str::FromStr;
 
-use super::{Account, Application, Attachment, Card, Emoji, Mention, Poll, Tag};
+use super::{Account, Application, Attachment, Card, Emoji, Mention, Poll};
 use crate::error::{Error, Kind};
 use crate::{entities as MegalodonEntities, megalodon};
 use chrono::{DateTime, Utc};
@@ -72,6 +72,20 @@ impl FromStr for StatusVisibility {
  }
 }
 
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct Tag {
+ pub name: String,
+ pub url: String,
+}
+
+impl Into<MegalodonEntities::status::Tag> for Tag {
+ fn into(self) -> MegalodonEntities::status::Tag {
+ MegalodonEntities::status::Tag {
+ name: self.name,
+ url: self.url,
+ }
+ }
+}
 impl Into<MegalodonEntities::status::StatusVisibility> for StatusVisibility {
  fn into(self) -> MegalodonEntities::status::StatusVisibility {
  match self {

src/friendica/entities/tag.rs

@@ -6,7 +6,7 @@ use serde::Deserialize;
 pub struct Tag {
  name: String,
  url: String,
- history: Option<Vec<History>>,
+ history: Vec<History>,
  following: Option<bool>,
 }
 
@@ -15,9 +15,7 @@ impl Into<MegalodonEntities::Tag> for Tag {
  MegalodonEntities::Tag {
  name: self.name,
  url: self.url,
- history: self
- .history
- .map(|i| i.into_iter().map(|j| j.into()).collect()),
+ history: self.history.into_iter().map(|j| j.into()).collect(),
  following: self.following,
  }
  }

src/mastodon/entities/announcement.rs

@@ -0,0 +1,98 @@
+use super::{status, Emoji};
+use crate::entities as MegalodonEntities;
+use chrono::{DateTime, Utc};
+use serde::Deserialize;
+
+#[derive(Debug, Clone, Deserialize)]
+pub struct Announcement {
+ id: String,
+ conent: String,
+ starts_at: Option<DateTime<Utc>>,
+ ends_at: Option<DateTime<Utc>>,
+ published: bool,
+ all_day: bool,
+ published_at: DateTime<Utc>,
+ updated_at: DateTime<Utc>,
+ read: Option<bool>,
+ mentions: Vec<Account>,
+ statuses: Vec<Status>,
+ tags: Vec<status::Tag>,
+ emojis: Vec<Emoji>,
+ reactions: Vec<Reaction>,
+}
+
+#[derive(Debug, Clone, Deserialize)]
+pub struct Account {
+ id: String,
+ username: String,
+ url: String,
+ acct: String,
+}
+
+#[derive(Debug, Clone, Deserialize)]
+pub struct Status {
+ id: String,
+ url: String,
+}
+
+#[derive(Debug, Clone, Deserialize)]
+pub struct Reaction {
+ name: String,
+ count: i64,
+ me: Option<bool>,
+ url: Option<String>,
+ static_url: Option<String>,
+}
+
+impl Into<MegalodonEntities::Announcement> for Announcement {
+ fn into(self) -> MegalodonEntities::Announcement {
+ MegalodonEntities::Announcement {
+ id: self.id,
+ conent: self.conent,
+ starts_at: self.starts_at,
+ ends_at: self.ends_at,
+ published: self.published,
+ all_day: self.all_day,
+ published_at: self.published_at,
+ updated_at: self.updated_at,
+ read: self.read,
+ mentions: self.mentions.into_iter().map(|i| i.into()).collect(),
+ statuses: self.statuses.into_iter().map(|i| i.into()).collect(),
+ tags: self.tags.into_iter().map(|i| i.into()).collect(),
+ emojis: self.emojis.into_iter().map(|i| i.into()).collect(),
+ reactions: self.reactions.into_iter().map(|i| i.into()).collect(),
+ }
+ }
+}
+
+impl Into<MegalodonEntities::announcement::Account> for Account {
+ fn into(self) -> MegalodonEntities::announcement::Account {
+ MegalodonEntities::announcement::Account {
+ id: self.id,
+ username: self.username,
+ url: self.url,
+ acct: self.acct,
+ }
+ }
+}
+
+impl Into<MegalodonEntities::announcement::Status> for Status {
+ fn into(self) -> MegalodonEntities::announcement::Status {
+ MegalodonEntities::announcement::Status {
+ id: self.id,
+ url: self.url,
+ }
+ }
+}
+
+impl Into<MegalodonEntities::announcement::Reaction> for Reaction {
+ fn into(self) -> MegalodonEntities::announcement::Reaction {
+ MegalodonEntities::announcement::Reaction {
+ name: self.name,
+ count: self.count,
+ me: self.me,
+ url: self.url,
+ static_url: self.static_url,
+ }
+ }
+}

src/mastodon/entities/emoji.rs

@@ -7,6 +7,7 @@ pub struct Emoji {
  static_url: String,
  url: String,
  visible_in_picker: bool,
+ category: String,
 }
 
 impl From<MegalodonEntities::Emoji> for Emoji {
@@ -16,6 +17,7 @@ impl From<MegalodonEntities::Emoji> for Emoji {
  static_url: item.static_url,
  url: item.url,
  visible_in_picker: item.visible_in_picker,
+ category: item.category,
  }
  }
 }
@@ -27,6 +29,7 @@ impl Into<MegalodonEntities::Emoji> for Emoji {
  static_url: self.static_url,
  url: self.url,
  visible_in_picker: self.visible_in_picker,
+ category: self.category,
  }
  }
 }

src/mastodon/entities/mod.rs

@@ -1,5 +1,6 @@
 pub mod account;
 pub mod activity;
+pub mod announcement;
 pub mod application;
 pub mod attachment;
 pub mod card;
@@ -34,6 +35,7 @@ pub mod urls;
 
 pub use account::Account;
 pub use activity::Activity;
+pub use announcement::Announcement;
 pub use application::Application;
 pub use attachment::Attachment;
 pub use card::Card;

src/mastodon/entities/status.rs

@@ -1,7 +1,7 @@
 use core::fmt;
 use std::str::FromStr;
 
-use super::{Account, Application, Attachment, Card, Emoji, Mention, Poll, Tag};
+use super::{Account, Application, Attachment, Card, Emoji, Mention, Poll};
 use crate::error::{Error, Kind};
 use crate::{entities as MegalodonEntities, megalodon};
 use chrono::{DateTime, Utc};
@@ -74,6 +74,20 @@ impl FromStr for StatusVisibility {
  }
 }
 
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct Tag {
+ pub name: String,
+ pub url: String,
+}
+impl Into<MegalodonEntities::status::Tag> for Tag {
+ fn into(self) -> MegalodonEntities::status::Tag {
+ MegalodonEntities::status::Tag {
+ name: self.name,
+ url: self.url,
+ }
+ }
+}
+
 impl Into<MegalodonEntities::status::StatusVisibility> for StatusVisibility {
  fn into(self) -> MegalodonEntities::status::StatusVisibility {
  match self {

src/mastodon/entities/tag.rs

@@ -6,7 +6,7 @@ use serde::Deserialize;
 pub struct Tag {
  name: String,
  url: String,
- history: Option<Vec<History>>,
+ history: Vec<History>,
  following: Option<bool>,
 }
 
@@ -15,9 +15,7 @@ impl Into<MegalodonEntities::Tag> for Tag {
  MegalodonEntities::Tag {
  name: self.name,
  url: self.url,
- history: self
- .history
- .map(|i| i.into_iter().map(|j| j.into()).collect()),
+ history: self.history.into_iter().map(|j| j.into()).collect(),
  following: self.following,
  }
  }

src/pleroma/entities/emoji.rs

@@ -7,6 +7,7 @@ pub struct Emoji {
  static_url: String,
  url: String,
  visible_in_picker: bool,
+ category: String,
 }
 
 impl From<MegalodonEntities::Emoji> for Emoji {
@@ -16,6 +17,7 @@ impl From<MegalodonEntities::Emoji> for Emoji {
  static_url: item.static_url,
  url: item.url,
  visible_in_picker: item.visible_in_picker,
+ category: item.category,
  }
  }
 }
@@ -27,6 +29,7 @@ impl Into<MegalodonEntities::Emoji> for Emoji {
  static_url: self.static_url,
  url: self.url,
  visible_in_picker: self.visible_in_picker,
+ category: self.category,
  }
  }
 }

src/pleroma/entities/status.rs

@@ -1,4 +1,4 @@
-use super::{Account, Application, Attachment, Card, Emoji, Mention, Poll, Reaction, Tag};
+use super::{Account, Application, Attachment, Card, Emoji, Mention, Poll, Reaction};
 use crate::{entities as MegalodonEntities, megalodon};
 use chrono::{DateTime, Utc};
 use serde::{de, Deserialize, Serialize};
@@ -76,6 +76,21 @@ impl Into<MegalodonEntities::status::StatusVisibility> for StatusVisibility {
  }
 }
 
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct Tag {
+ pub name: String,
+ pub url: String,
+}
+
+impl Into<MegalodonEntities::status::Tag> for Tag {
+ fn into(self) -> MegalodonEntities::status::Tag {
+ MegalodonEntities::status::Tag {
+ name: self.name,
+ url: self.url,
+ }
+ }
+}
+
 impl Into<MegalodonEntities::Status> for Status {
  fn into(self) -> MegalodonEntities::Status {
  let mut reblog_status: Option<Box<MegalodonEntities::Status>> = None;