Adjust card entity

h3poteto · Aug 13, 2023 · 1671de4 · 1671de4
1 parent 0f5953d
commit 1671de4
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 39 deletions.
diff --git a/examples/mastodon_streaming.rs b/examples/mastodon_streaming.rs
@@ -24,7 +24,7 @@ async fn streaming(url: &str, access_token: String) {
         Some(access_token),
         None,
     );
-    let streaming = client.user_streaming(url.to_string());
+    let streaming = client.local_streaming(url.to_string());
 
     streaming
         .listen(Box::new(|message| match message {

diff --git a/src/entities/card.rs b/src/entities/card.rs
@@ -9,11 +9,13 @@ pub struct Card {
     pub image: Option<String>,
     pub author_name: Option<String>,
     pub author_url: Option<String>,
-    pub provider_name: Option<String>,
-    pub provider_url: Option<String>,
+    pub provider_name: String,
+    pub provider_url: String,
     pub html: Option<String>,
     pub width: Option<u32>,
     pub height: Option<u32>,
+    pub embed_url: Option<String>,
+    pub blurhash: Option<String>,
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize)]

diff --git a/src/friendica/entities/card.rs b/src/friendica/entities/card.rs
@@ -8,13 +8,14 @@ pub struct Card {
     description: String,
     r#type: CardType,
     image: Option<String>,
-    author_name: Option<String>,
-    author_url: Option<String>,
-    provider_name: Option<String>,
-    provider_url: Option<String>,
-    html: Option<String>,
-    width: Option<u32>,
-    height: Option<u32>,
+    author_name: String,
+    author_url: String,
+    provider_name: String,
+    provider_url: String,
+    html: String,
+    width: u32,
+    height: u32,
+    blurhash: Option<String>,
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
@@ -45,13 +46,15 @@ impl Into<MegalodonEntities::Card> for Card {
             description: self.description,
             r#type: self.r#type.into(),
             image: self.image,
-            author_name: self.author_name,
-            author_url: self.author_url,
+            author_name: Some(self.author_name),
+            author_url: Some(self.author_url),
             provider_name: self.provider_name,
             provider_url: self.provider_url,
-            html: self.html,
-            width: self.width,
-            height: self.height,
+            html: Some(self.html),
+            width: Some(self.width),
+            height: Some(self.height),
+            embed_url: None,
+            blurhash: self.blurhash,
         }
     }
 }
diff --git a/src/mastodon/entities/card.rs b/src/mastodon/entities/card.rs
@@ -8,13 +8,15 @@ pub struct Card {
     description: String,
     r#type: CardType,
     image: Option<String>,
-    author_name: Option<String>,
-    author_url: Option<String>,
-    provider_name: Option<String>,
-    provider_url: Option<String>,
-    html: Option<String>,
-    width: Option<u32>,
-    height: Option<u32>,
+    author_name: String,
+    author_url: String,
+    provider_name: String,
+    provider_url: String,
+    html: String,
+    width: u32,
+    height: u32,
+    embed_url: String,
+    blurhash: Option<String>,
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
@@ -45,13 +47,15 @@ impl Into<MegalodonEntities::Card> for Card {
             description: self.description,
             r#type: self.r#type.into(),
             image: self.image,
-            author_name: self.author_name,
-            author_url: self.author_url,
+            author_name: Some(self.author_name),
+            author_url: Some(self.author_url),
             provider_name: self.provider_name,
             provider_url: self.provider_url,
-            html: self.html,
-            width: self.width,
-            height: self.height,
+            html: Some(self.html),
+            width: Some(self.width),
+            height: Some(self.height),
+            embed_url: Some(self.embed_url),
+            blurhash: self.blurhash,
         }
     }
 }
diff --git a/src/pleroma/entities/card.rs b/src/pleroma/entities/card.rs
@@ -8,13 +8,8 @@ pub struct Card {
     description: String,
     r#type: CardType,
     image: Option<String>,
-    author_name: Option<String>,
-    author_url: Option<String>,
-    provider_name: Option<String>,
-    provider_url: Option<String>,
-    html: Option<String>,
-    width: Option<u32>,
-    height: Option<u32>,
+    provider_name: String,
+    provider_url: String,
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
@@ -45,13 +40,15 @@ impl Into<MegalodonEntities::Card> for Card {
             description: self.description,
             r#type: self.r#type.into(),
             image: self.image,
-            author_name: self.author_name,
-            author_url: self.author_url,
+            author_name: None,
+            author_url: None,
             provider_name: self.provider_name,
             provider_url: self.provider_url,
-            html: self.html,
-            width: self.width,
-            height: self.height,
+            html: None,
+            width: None,
+            height: None,
+            embed_url: None,
+            blurhash: None,
         }
     }
 }