From 7847df0e2b2c0f6b9a089e2db2f9b10dfe070a45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= <ondra@ondrovo.com>
Date: Fri, 27 Aug 2021 20:02:28 +0200
Subject: [PATCH] fix serializer failure on unknown MediaType string

---
 src/entities/attachment.rs | 46 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/entities/attachment.rs b/src/entities/attachment.rs
index ce2fbdd..e4f2f57 100644
--- a/src/entities/attachment.rs
+++ b/src/entities/attachment.rs
@@ -47,7 +47,9 @@ pub struct ImageDetails {
 }
 
 /// The type of media attachment.
-#[derive(Debug, Deserialize, Clone, Copy, PartialEq)]
+#[derive(Debug, Deserialize, Clone, PartialEq)]
+// Deserialize "Other" trick from https://github.com/serde-rs/serde/issues/912#issuecomment-803097289
+#[serde(remote = "MediaType")]
 pub enum MediaType {
     /// An image.
     #[serde(rename = "image")]
@@ -55,10 +57,52 @@ pub enum MediaType {
     /// A video file.
     #[serde(rename = "video")]
     Video,
+    /// An audio file.
+    #[serde(rename = "audio")]
+    Audio,
     /// A gifv format file.
     #[serde(rename = "gifv")]
     Gifv,
     /// Unknown format.
     #[serde(rename = "unknown")]
     Unknown,
+    /// Anything else
+    #[serde(skip_deserializing)]
+    Other(String),
+}
+
+use std::str::FromStr;
+use serde::de::{value, Deserializer, IntoDeserializer};
+
+impl FromStr for MediaType {
+    type Err = value::Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Self::deserialize(s.into_deserializer())
+    }
+}
+
+impl<'de> Deserialize<'de> for MediaType {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+        where D: Deserializer<'de>
+    {
+        let s = String::deserialize(deserializer)?;
+        let deserialized = Self::from_str(&s).unwrap_or_else(|_| {
+            Self::Other(s)
+        });
+        Ok(deserialized)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::entities::prelude::MediaType;
+    use serde_json::Value;
+
+    #[test]
+    fn test_deserialize_media_type() {
+        assert_eq!(MediaType::Image, serde_json::from_value(Value::String("image".to_owned())).unwrap());
+        assert_eq!(MediaType::Audio, serde_json::from_value(Value::String("audio".to_owned())).unwrap());
+        assert_eq!(MediaType::Other("pleroma_weird_thing".to_string()), serde_json::from_value(Value::String("pleroma_weird_thing".to_owned())).unwrap());
+    }
 }