Clean InlineQueryResult* structs

src/core/types/inline_query.rs

@@ -1,6 +1,6 @@
 use crate::core::types::{User, Location};
 
-#[derive(Debug, Serialize, Hash, PartialEq, Eq, Clone)]
+#[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQuery {
     /// Unique identifier for this query
     pub id: String,

src/core/types/inline_query_result.rs

@@ -1,15 +1,47 @@
-use super::inline_query_result_cached_audio::InlineQueryResultCachedAudio;
+use crate::core::types::{
+    InlineQueryResultCachedAudio,
+    InlineQueryResultCachedDocument,
+    InlineQueryResultCachedGif,
+    InlineQueryResultCachedMpeg4Gif,
+    InlineQueryResultCachedPhoto,
+    InlineQueryResultCachedSticker,
+    InlineQueryResultCachedVideo,
+    InlineQueryResultCachedVoice,
+    InlineQueryResultArticle,
+    InlineQueryResultAudio,
+    InlineQueryResultContact,
+    InlineQueryResultGame,
+    InlineQueryResultDocument,
+    InlineQueryResultGif,
+    InlineQueryResultLocation,
+    InlineQueryResultMpeg4Gif,
+    InlineQueryResultPhoto,
+    InlineQueryResultVenue,
+    InlineQueryResultVideo,
+    InlineQueryResultVoice
+};
 
-#[derive(Debug, Deserialize, Serialize, Eq, Clone, PartialEq, Hash)]
+#[derive(Debug, Serialize, PartialEq, Clone)]
+#[serde(tag = "type")]
+#[serde(rename_all = "snake_case")]
 pub enum InlineQueryResult {
+    #[serde(rename = "audio")]
     CachedAudio(InlineQueryResultCachedAudio),
+    #[serde(rename = "document")]
     CachedDocument(InlineQueryResultCachedDocument),
+    #[serde(rename = "gif")]
     CachedGif(InlineQueryResultCachedGif),
+    #[serde(rename = "mpeg4_gif")]
     CachedMpeg4Gif(InlineQueryResultCachedMpeg4Gif),
+    #[serde(rename = "photo")]
     CachedPhoto(InlineQueryResultCachedPhoto),
+    #[serde(rename = "sticker")]
     CachedSticker(InlineQueryResultCachedSticker),
+    #[serde(rename = "video")]
     CachedVideo(InlineQueryResultCachedVideo),
+    #[serde(rename = "voice")]
     CachedVoice(InlineQueryResultCachedVoice),
+
     Article(InlineQueryResultArticle),
     Audio(InlineQueryResultAudio),
     Contact(InlineQueryResultContact),
@@ -17,6 +49,7 @@ pub enum InlineQueryResult {
     Document(InlineQueryResultDocument),
     Gif(InlineQueryResultGif),
     Location(InlineQueryResultLocation),
+    #[serde(rename = "mpeg4_gif")]
     Mpeg4Gif(InlineQueryResultMpeg4Gif),
     Photo(InlineQueryResultPhoto),
     Venue(InlineQueryResultVenue),

src/core/types/inline_query_result_article.rs

@@ -1,11 +1,7 @@
 use crate::core::types::{InputMessageContent, InlineKeyboardMarkup};
 
-#[derive(Debug, Serialize, Hash, PartialEq, Eq, Clone)]
+#[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultArticle {
-    // Type of the result, must be article
-    #[serde(rename = "type")]
-    pub query_type: String,
-
     /// Unique identifier for this result, 1-64 Bytes
     pub id: String,
     /// Title of the result

src/core/types/inline_query_result_audio.rs

@@ -1,8 +1,6 @@
-use super::inline_keyboard_markup::InlineKeyboardMarkup;
+use crate::core::types::{ParseMode, InlineKeyboardMarkup, InputMessageContent};
-use super::input_message_content::InputMessageContent;
-use crate::core::types::parse_mode::ParseMode;
 
-#[derive(Debug, Serialize, Clone, PartialEq)]
+#[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultAudio {
     pub id: String,
     pub audio_url: String,

src/core/types/inline_query_result_cached_audio.rs

@@ -1,10 +1,7 @@
-use super::inline_keyboard_markup::InlineKeyboardMarkup;
+use crate::core::types::{InputMessageContent, InlineKeyboardMarkup};
-use super::input_message_content::InputMessageContent;
 
-#[derive(Debug, Deserialize, Clone, PartialEq)]
+#[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultCachedAudio {
-    #[serde(rename = "type")]
-    pub query_type: String,
     pub id: String,
     pub audio_file_id: String,
     pub caption: Option<String>,

src/core/types/inline_query_result_cached_document.rs

@@ -1,10 +1,7 @@
-use super::inline_keyboard_markup::InlineKeyboardMarkup;
+use crate::core::types::{InputMessageContent, InlineKeyboardMarkup};
-use super::input_message_content::InputMessageContent;
 
-#[derive(Debug, Deserialize, Clone, PartialEq)]
+#[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultCachedDocument {
-    #[serde(rename = "type")]
-    pub query_type: String,
     pub id: String,
     pub title: String,
     pub document_file_id: String,

src/core/types/inline_query_result_cached_gif.rs

@@ -1,7 +1,6 @@
-use super::inline_keyboard_markup::InlineKeyboardMarkup;
+use crate::core::types::{InputMessageContent, InlineKeyboardMarkup};
-use super::input_message_content::InputMessageContent;
 
-#[derive(Debug, Deserialize, Clone, PartialEq)]
+#[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultCachedGif {
     pub id: String,
     pub gif_file_id: String,

src/core/types/inline_query_result_cached_mpeg4_gif.rs

@@ -1,10 +1,7 @@
-use super::inline_keyboard_markup::InlineKeyboardMarkup;
+use crate::core::types::{InputMessageContent, InlineKeyboardMarkup};
-use super::input_message_content::InputMessageContent;
 
-#[derive(Debug, Deserialize, Clone, PartialEq)]
+#[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultCachedMpeg4Gif {
-    #[serde(rename = "type")]
-    pub query_type: String,
     pub id: String,
     pub mpeg4_file_id: String,
     pub title: Option<String>,

src/core/types/inline_query_result_cached_photo.rs

@@ -1,8 +1,6 @@
-use super::inline_keyboard_markup::InlineKeyboardMarkup;
+use crate::core::types::{InputMessageContent, InlineKeyboardMarkup, ParseMode};
-use super::input_message_content::InputMessageContent;
-use crate::core::types::parse_mode::ParseMode;
 
-#[derive(Debug, Serialize, Clone, PartialEq)]
+#[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultCachedPhoto {
     pub id: String,
     pub photo_file_id: String,

src/core/types/inline_query_result_cached_sticker.rs

@@ -1,10 +1,7 @@
-use super::inline_keyboard_markup::InlineKeyboardMarkup;
+use crate::core::types::{InputMessageContent, InlineKeyboardMarkup};
-use super::input_message_content::InputMessageContent;
 
-#[derive(Debug, Deserialize, Clone, PartialEq)]
+#[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultCachedSticker {
-    #[serde(rename = "type")]
-    pub query_type: String,
     pub id: String,
     pub sticker_file_id: String,
     pub reply_markup: Option<InlineKeyboardMarkup>,

src/core/types/inline_query_result_cached_video.rs

@@ -1,10 +1,7 @@
-use super::inline_keyboard_markup::InlineKeyboardMarkup;
+use crate::core::types::{InputMessageContent, InlineKeyboardMarkup};
-use super::input_message_content::InputMessageContent;
 
-#[derive(Debug, Deserialize, Clone, PartialEq)]
+#[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultCachedVideo {
-    #[serde(rename = "type")]
-    pub query_type: String,
     pub id: String,
     pub video_file_id: String,
     pub title: String,

src/core/types/inline_query_result_cached_voice.rs

@@ -1,10 +1,7 @@
-use super::inline_keyboard_markup::InlineKeyboardMarkup;
+use crate::core::types::{InputMessageContent, InlineKeyboardMarkup};
-use super::input_message_content::InputMessageContent;
 
-#[derive(Debug, Deserialize, Clone, PartialEq)]
+#[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultCachedVoice {
-    #[serde(rename = "type")]
-    pub query_type: String,
     pub id: String,
     pub voice_file_id: String,
     pub title: String,

src/core/types/inline_query_result_contact.rs

@@ -1,8 +1,6 @@
-use super::inline_keyboard_markup::InlineKeyboardMarkup;
+use crate::core::types::{InputMessageContent, InlineKeyboardMarkup, ParseMode};
-use super::input_message_content::InputMessageContent;
-use crate::core::types::parse_mode::ParseMode;
 
-#[derive(Debug, Serialize, Clone, PartialEq)]
+#[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultContact {
     pub id: String,
     pub phone_number: String,

src/core/types/inline_query_result_document.rs

@@ -1,7 +1,6 @@
-use super::inline_keyboard_markup::InlineKeyboardMarkup;
+use crate::core::types::{InputMessageContent, InlineKeyboardMarkup};
-use super::input_message_content::InputMessageContent;
 
-#[derive(Debug, Serialize, Clone, PartialEq)]
+#[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultDocument {
     pub id: String,
     pub title: String,

src/core/types/inline_query_result_game.rs

@@ -1,8 +1,6 @@
-use super::inline_keyboard_markup::InlineKeyboardMarkup;
+use crate::core::types::{InputMessageContent, InlineKeyboardMarkup, ParseMode};
-use super::input_message_content::InputMessageContent;
-use crate::core::types::parse_mode::ParseMode;
 
-#[derive(Debug, Serialize, Clone, PartialEq)]
+#[derive(Debug, Serialize, Hash, PartialEq, Eq, Clone)]
 pub struct InlineQueryResultGame {
     pub id: String,
     pub game_short_name: String,

src/core/types/inline_query_result_gif.rs

@@ -1,10 +1,7 @@
-use super::inline_keyboard_markup::InlineKeyboardMarkup;
+use crate::core::types::{InputMessageContent, InlineKeyboardMarkup};
-use super::input_message_content::InputMessageContent;
 
-#[derive(Debug, Deserialize, Clone, PartialEq)]
+#[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultGif {
-    #[serde(rename = "type")]
-    pub query_type: String,
     pub id: String,
     pub gif_url: String,
     pub gif_width: Option<i32>,

src/core/types/inline_query_result_location.rs

@@ -1,8 +1,6 @@
-use super::inline_keyboard_markup::InlineKeyboardMarkup;
+use crate::core::types::{InputMessageContent, InlineKeyboardMarkup, ParseMode};
-use super::input_message_content::InputMessageContent;
-use crate::core::types::parse_mode::ParseMode;
 
-#[derive(Debug, Serialize, Clone, PartialEq)]
+#[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultLocation {
     pub id: String,
     pub latitude: f64,

src/core/types/inline_query_result_mpeg4_gif.rs

@@ -1,10 +1,7 @@
-use super::inline_keyboard_markup::InlineKeyboardMarkup;
+use crate::core::types::{InputMessageContent, InlineKeyboardMarkup};
-use super::input_message_content::InputMessageContent;
 
-#[derive(Debug, Deserialize, Clone, PartialEq)]
+#[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultMpeg4Gif {
-    #[serde(rename = "type")]
-    pub query_type: String,
     pub id: String,
     pub mpeg4_url: String,
     pub mpeg4_width: Option<i32>,

src/core/types/inline_query_result_photo.rs

@@ -1,10 +1,7 @@
-use super::inline_keyboard_markup::InlineKeyboardMarkup;
+use crate::core::types::{InputMessageContent, InlineKeyboardMarkup};
-use super::input_message_content::InputMessageContent;
 
-#[derive(Debug, Deserialize, Clone, PartialEq)]
+#[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultPhoto {
-    #[serde(rename = "type")]
-    pub query_type: String,
     pub id: String,
     pub photo_url: String,
     pub thumb_url: String,

src/core/types/inline_query_result_venue.rs

@@ -1,8 +1,6 @@
-use super::inline_keyboard_markup::InlineKeyboardMarkup;
+use crate::core::types::{InputMessageContent, InlineKeyboardMarkup, ParseMode};
-use super::input_message_content::InputMessageContent;
-use crate::core::types::parse_mode::ParseMode;
 
-#[derive(Debug, Serialize, Clone, PartialEq)]
+#[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultVenue {
     pub id: String,
     pub latitude: f64,

src/core/types/inline_query_result_video.rs

@@ -1,10 +1,7 @@
-use super::inline_keyboard_markup::InlineKeyboardMarkup;
+use crate::core::types::{InputMessageContent, InlineKeyboardMarkup};
-use super::input_message_content::InputMessageContent;
 
-#[derive(Debug, Deserialize, Clone, PartialEq)]
+#[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultVideo {
-    #[serde(rename = "type")]
-    pub query_type: String,
     pub id: String,
     pub video_url: String,
     pub mime_type: String,

src/core/types/inline_query_result_voice.rs

@@ -1,7 +1,6 @@
-use super::inline_keyboard_markup::InlineKeyboardMarkup;
+use crate::core::types::{InputMessageContent, InlineKeyboardMarkup};
-use super::input_message_content::InputMessageContent;
 
-#[derive(Debug, Deserialize, Clone, PartialEq)]
+#[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultVoice {
     pub id: String,
     pub voice_url: String,

src/core/types/input_message_content.rs

@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::core::types::ParseMode;
 
-#[derive(Debug, Serialize, Clone)]
+#[derive(Debug, Serialize, Clone, PartialEq)]
 #[serde(untagged)]
 /// This object represents the content of a message to be sent as
 /// a result of an inline query.

src/core/types/mod.rs

@@ -47,6 +47,8 @@ pub use self::{
     video_note::VideoNote,
     voice::Voice,
     file::File,
+    input_message_content::InputMessageContent,
+
     inline_query::InlineQuery,
     inline_query_result::InlineQueryResult,
     inline_query_result_cached_audio::InlineQueryResultCachedAudio,
@@ -117,6 +119,7 @@ mod video;
 mod video_note;
 mod voice;
 mod file;
+mod input_message_content;
 
 mod inline_query;
 mod inline_query_result;