From 217bdb094654ea52ba7c50319e00cbffd9b24294 Mon Sep 17 00:00:00 2001
From: CuriouslyCurious <thecuriouslycurious@protonmail.com>
Date: Mon, 1 Feb 2021 10:11:07 +0100
Subject: [PATCH 1/4] Add GetStickerSet implementation

---
 lib/src/util/messages.rs            |  2 ++
 raw/src/requests/get_sticker_set.rs | 43 +++++++++++++++++++++++++++++
 raw/src/requests/mod.rs             |  2 ++
 raw/src/types/message.rs            | 25 +++++++++++++++++
 4 files changed, 72 insertions(+)
 create mode 100644 raw/src/requests/get_sticker_set.rs

diff --git a/lib/src/util/messages.rs b/lib/src/util/messages.rs
index 14fa6d3c8e..05a958f70a 100644
--- a/lib/src/util/messages.rs
+++ b/lib/src/util/messages.rs
@@ -40,6 +40,7 @@ impl MessageText for MessageKind {
             }
             MessageKind::Photo { caption, .. } => caption.to_owned(),
             MessageKind::Sticker { .. } => None,
+            MessageKind::StickerSet { data } => Some(data.name.to_owned()),
             MessageKind::Video { caption, .. } => caption.to_owned(),
             MessageKind::Voice { .. } => None,
             MessageKind::VideoNote { .. } => None,
@@ -110,6 +111,7 @@ impl MessageGetFiles for MessageKind {
                 Some(data.into_iter().map(|f| f.get_file()).collect())
             }
             MessageKind::Sticker { data } => Some(vec![data.get_file()]),
+            MessageKind::StickerSet { .. } => None,
             MessageKind::Video { data, .. } => {
                 let mut files = vec![data.get_file()];
                 if let Some(thumb) = &data.thumb {
diff --git a/raw/src/requests/get_sticker_set.rs b/raw/src/requests/get_sticker_set.rs
new file mode 100644
index 0000000000..72b1b352a1
--- /dev/null
+++ b/raw/src/requests/get_sticker_set.rs
@@ -0,0 +1,43 @@
+use crate::requests::*;
+use crate::types::*;
+
+/// Use this method to get a sticker set.
+#[derive(Debug, Clone, PartialEq, PartialOrd, Serialize)]
+#[must_use = "requests do nothing unless sent"]
+pub struct GetStickerSet {
+    name: String,
+}
+
+impl Request for GetStickerSet {
+    type Type = JsonRequestType<Self>;
+    type Response = JsonIdResponse<File>;
+
+    fn serialize(&self) -> Result<HttpRequest, Error> {
+        Self::Type::serialize(RequestUrl::method("getStickerSet"), self)
+    }
+}
+
+impl GetStickerSet {
+    pub fn new<S>(set: S) -> Self
+    where
+        S: ToString,
+    {
+        Self {
+            name: set.to_string(),
+        }
+    }
+}
+
+/// Get basic info about a sticker set and prepare it for downloading.
+pub trait CanGetStickerSet {
+    fn get_set(&self) -> GetStickerSet;
+}
+
+impl<S> CanGetStickerSet for S
+where
+    S: ToString + std::fmt::Display,
+{
+    fn get_set(&self) -> GetStickerSet {
+        GetStickerSet::new(self)
+    }
+}
diff --git a/raw/src/requests/mod.rs b/raw/src/requests/mod.rs
index 4d744a2d1a..590be240cd 100644
--- a/raw/src/requests/mod.rs
+++ b/raw/src/requests/mod.rs
@@ -15,6 +15,7 @@ pub mod get_chat_member;
 pub mod get_chat_members_count;
 pub mod get_file;
 pub mod get_me;
+pub mod get_sticker_set;
 pub mod get_updates;
 pub mod get_user_profile_photos;
 pub mod kick_chat_member;
@@ -51,6 +52,7 @@ pub use self::get_chat_member::*;
 pub use self::get_chat_members_count::*;
 pub use self::get_file::*;
 pub use self::get_me::*;
+pub use self::get_sticker_set::*;
 pub use self::get_updates::*;
 pub use self::get_user_profile_photos::*;
 pub use self::kick_chat_member::*;
diff --git a/raw/src/types/message.rs b/raw/src/types/message.rs
index b43824e64f..d3c7b8f148 100644
--- a/raw/src/types/message.rs
+++ b/raw/src/types/message.rs
@@ -117,6 +117,10 @@ pub enum MessageKind {
         /// Information about the sticker.
         data: Sticker,
     },
+    /// Message is a sticker set.
+    StickerSet {
+        data: StickerSet,
+    },
     /// Message is a video.
     Video {
         /// Information about the video.
@@ -324,6 +328,7 @@ impl Message {
         maybe_field_with_caption!(document, Document);
         maybe_field_with_caption_and_group!(photo, Photo);
         maybe_field!(sticker, Sticker);
+        maybe_field!(sticker_set, StickerSet);
         maybe_field_with_caption_and_group!(video, Video);
         maybe_field!(voice, Voice);
         maybe_field!(video_note, VideoNote);
@@ -463,6 +468,7 @@ impl ChannelPost {
         maybe_field_with_caption!(document, Document);
         maybe_field_with_caption_and_group!(photo, Photo);
         maybe_field!(sticker, Sticker);
+        maybe_field!(sticker_set, StickerSet);
         maybe_field_with_caption_and_group!(video, Video);
         maybe_field!(voice, Voice);
         maybe_field!(video_note, VideoNote);
@@ -561,6 +567,8 @@ pub struct RawMessage {
     pub photo: Option<Vec<PhotoSize>>,
     /// Message is a sticker, information about the sticker.
     pub sticker: Option<Sticker>,
+    /// Message is a sticker set, information about the sticker set.
+    pub sticker_set: Option<StickerSet>,
     /// Message is a video, information about the video.
     pub video: Option<Video>,
     /// Message is a voice message, information about the file.
@@ -772,6 +780,23 @@ pub struct Sticker {
     pub file_size: Option<Integer>,
 }
 
+/// This object represents a sticker set.
+#[derive(Debug, Clone, PartialEq, PartialOrd, Deserialize)]
+pub struct StickerSet {
+    /// Sticker set name.
+    pub name: String,
+    /// Sticket set title.
+    pub title: String,
+    /// True, if the sticker set contains animated stickers.
+    pub is_animated: bool,
+    /// True, if the sticker set contains masks.
+    pub contains_masks: bool,
+    /// List of all set stickers.
+    pub stickers: Vec<Sticker>,
+    /// Sticker set thumbnail in the .WEBP or .TGS format.
+    pub thumb: Option<PhotoSize>,
+}
+
 /// This object represents a video file.
 #[derive(Debug, Clone, PartialEq, PartialOrd, Deserialize)]
 pub struct Video {

From 7a4797ac8df4422969175a962563bad5eb781280 Mon Sep 17 00:00:00 2001
From: CuriouslyCurious <thecuriouslycurious@protonmail.com>
Date: Mon, 1 Feb 2021 17:16:57 +0100
Subject: [PATCH 2/4] Replace ToString with ToFileRef

---
 lib/src/util/messages.rs            | 2 --
 raw/src/requests/get_sticker_set.rs | 8 ++++----
 raw/src/types/message.rs            | 8 --------
 raw/src/types/refs.rs               | 3 +++
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/lib/src/util/messages.rs b/lib/src/util/messages.rs
index 05a958f70a..14fa6d3c8e 100644
--- a/lib/src/util/messages.rs
+++ b/lib/src/util/messages.rs
@@ -40,7 +40,6 @@ impl MessageText for MessageKind {
             }
             MessageKind::Photo { caption, .. } => caption.to_owned(),
             MessageKind::Sticker { .. } => None,
-            MessageKind::StickerSet { data } => Some(data.name.to_owned()),
             MessageKind::Video { caption, .. } => caption.to_owned(),
             MessageKind::Voice { .. } => None,
             MessageKind::VideoNote { .. } => None,
@@ -111,7 +110,6 @@ impl MessageGetFiles for MessageKind {
                 Some(data.into_iter().map(|f| f.get_file()).collect())
             }
             MessageKind::Sticker { data } => Some(vec![data.get_file()]),
-            MessageKind::StickerSet { .. } => None,
             MessageKind::Video { data, .. } => {
                 let mut files = vec![data.get_file()];
                 if let Some(thumb) = &data.thumb {
diff --git a/raw/src/requests/get_sticker_set.rs b/raw/src/requests/get_sticker_set.rs
index 72b1b352a1..23a6629eca 100644
--- a/raw/src/requests/get_sticker_set.rs
+++ b/raw/src/requests/get_sticker_set.rs
@@ -5,7 +5,7 @@ use crate::types::*;
 #[derive(Debug, Clone, PartialEq, PartialOrd, Serialize)]
 #[must_use = "requests do nothing unless sent"]
 pub struct GetStickerSet {
-    name: String,
+    name: FileRef,
 }
 
 impl Request for GetStickerSet {
@@ -20,10 +20,10 @@ impl Request for GetStickerSet {
 impl GetStickerSet {
     pub fn new<S>(set: S) -> Self
     where
-        S: ToString,
+        S: ToFileRef,
     {
         Self {
-            name: set.to_string(),
+            name: set.to_file_ref(),
         }
     }
 }
@@ -35,7 +35,7 @@ pub trait CanGetStickerSet {
 
 impl<S> CanGetStickerSet for S
 where
-    S: ToString + std::fmt::Display,
+    S: ToFileRef,
 {
     fn get_set(&self) -> GetStickerSet {
         GetStickerSet::new(self)
diff --git a/raw/src/types/message.rs b/raw/src/types/message.rs
index d3c7b8f148..c2dfa245d1 100644
--- a/raw/src/types/message.rs
+++ b/raw/src/types/message.rs
@@ -117,10 +117,6 @@ pub enum MessageKind {
         /// Information about the sticker.
         data: Sticker,
     },
-    /// Message is a sticker set.
-    StickerSet {
-        data: StickerSet,
-    },
     /// Message is a video.
     Video {
         /// Information about the video.
@@ -328,7 +324,6 @@ impl Message {
         maybe_field_with_caption!(document, Document);
         maybe_field_with_caption_and_group!(photo, Photo);
         maybe_field!(sticker, Sticker);
-        maybe_field!(sticker_set, StickerSet);
         maybe_field_with_caption_and_group!(video, Video);
         maybe_field!(voice, Voice);
         maybe_field!(video_note, VideoNote);
@@ -468,7 +463,6 @@ impl ChannelPost {
         maybe_field_with_caption!(document, Document);
         maybe_field_with_caption_and_group!(photo, Photo);
         maybe_field!(sticker, Sticker);
-        maybe_field!(sticker_set, StickerSet);
         maybe_field_with_caption_and_group!(video, Video);
         maybe_field!(voice, Voice);
         maybe_field!(video_note, VideoNote);
@@ -567,8 +561,6 @@ pub struct RawMessage {
     pub photo: Option<Vec<PhotoSize>>,
     /// Message is a sticker, information about the sticker.
     pub sticker: Option<Sticker>,
-    /// Message is a sticker set, information about the sticker set.
-    pub sticker_set: Option<StickerSet>,
     /// Message is a video, information about the video.
     pub video: Option<Video>,
     /// Message is a voice message, information about the file.
diff --git a/raw/src/types/refs.rs b/raw/src/types/refs.rs
index aa51f16093..e0a3dfd5c8 100644
--- a/raw/src/types/refs.rs
+++ b/raw/src/types/refs.rs
@@ -269,6 +269,9 @@ specific_chat_id_impls!(ChannelId, Channel);
 pub struct ChatId(Integer);
 chat_id_impls!(ChatId);
 
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct Name(String);
+
 /// Get `MessageId` from the type reference.
 pub trait ToMessageId {
     fn to_message_id(&self) -> MessageId;

From 495a55fb3640b8e70da99dc0e1e7a85bb12e9748 Mon Sep 17 00:00:00 2001
From: CuriouslyCurious <thecuriouslycurious@protonmail.com>
Date: Mon, 1 Feb 2021 17:28:35 +0100
Subject: [PATCH 3/4] Change Response type to StickerSet

---
 raw/src/requests/get_sticker_set.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/raw/src/requests/get_sticker_set.rs b/raw/src/requests/get_sticker_set.rs
index 23a6629eca..20459eb4c9 100644
--- a/raw/src/requests/get_sticker_set.rs
+++ b/raw/src/requests/get_sticker_set.rs
@@ -10,7 +10,7 @@ pub struct GetStickerSet {
 
 impl Request for GetStickerSet {
     type Type = JsonRequestType<Self>;
-    type Response = JsonIdResponse<File>;
+    type Response = JsonIdResponse<StickerSet>;
 
     fn serialize(&self) -> Result<HttpRequest, Error> {
         Self::Type::serialize(RequestUrl::method("getStickerSet"), self)

From 8a9f64ad705c8523ce12d670a1a8d7712a3d4116 Mon Sep 17 00:00:00 2001
From: CuriouslyCurious <thecuriouslycurious@protonmail.com>
Date: Mon, 1 Feb 2021 20:12:45 +0100
Subject: [PATCH 4/4] Add StickerSetRef implementation

---
 lib/src/prelude.rs                  |  1 +
 lib/src/util/messages.rs            | 52 +++++++++++++++++++++++++++-
 raw/src/requests/get_sticker_set.rs | 12 +++----
 raw/src/types/refs.rs               | 53 +++++++++++++++++++++++++++++
 4 files changed, 111 insertions(+), 7 deletions(-)

diff --git a/lib/src/prelude.rs b/lib/src/prelude.rs
index c8f7b549c1..2467d7ac63 100644
--- a/lib/src/prelude.rs
+++ b/lib/src/prelude.rs
@@ -5,6 +5,7 @@
 pub use telegram_bot_raw::CanAnswerCallbackQuery;
 pub use telegram_bot_raw::CanAnswerInlineQuery;
 pub use telegram_bot_raw::CanExportChatInviteLink;
+pub use telegram_bot_raw::CanGetStickerSet;
 pub use telegram_bot_raw::CanLeaveChat;
 pub use telegram_bot_raw::CanSendChatAction;
 pub use telegram_bot_raw::{CanDeleteMessage, CanForwardMessage};
diff --git a/lib/src/util/messages.rs b/lib/src/util/messages.rs
index 14fa6d3c8e..9577e22d75 100644
--- a/lib/src/util/messages.rs
+++ b/lib/src/util/messages.rs
@@ -3,8 +3,10 @@
 //! [`telegram_bot_raw::types::message`]: ../../telegram_bot_raw/types/message/index.html
 
 use crate::prelude::CanGetFile;
+use crate::prelude::CanGetStickerSet;
 use crate::types::{
-    requests::get_file::GetFile, ChannelPost, Message, MessageKind, MessageOrChannelPost,
+    requests::get_file::GetFile, requests::get_sticker_set::GetStickerSet, ChannelPost, Message,
+    MessageKind, MessageOrChannelPost,
 };
 
 /// A trait to obtain text from a message.
@@ -152,3 +154,51 @@ impl MessageGetFiles for ChannelPost {
         self.kind.get_files()
     }
 }
+
+/// A trait to obtain `GetStickerSet` requests from a message.
+///
+/// Only available on a sticker message.
+pub trait MessageGetStickerSet {
+    /// Obtain a sticker set from a message if available.
+    fn get_sticker_set(&self) -> Option<GetStickerSet>;
+}
+
+impl MessageGetStickerSet for Message {
+    fn get_sticker_set<'a>(&'a self) -> Option<GetStickerSet> {
+        self.kind.get_sticker_set()
+    }
+}
+
+impl MessageGetStickerSet for MessageKind {
+    fn get_sticker_set<'a>(&'a self) -> Option<GetStickerSet> {
+        match self {
+            MessageKind::Text { .. } => None,
+            MessageKind::Audio { .. } => None,
+            MessageKind::Document { .. } => None,
+            MessageKind::Photo { .. } => None,
+            MessageKind::Sticker { data } => match data.set_name {
+                Some(_) => Some(data.get_sticker_set()),
+                None => None,
+            },
+            MessageKind::Video { .. } => None,
+            MessageKind::Voice { .. } => None,
+            MessageKind::VideoNote { .. } => None,
+            MessageKind::Contact { .. } => None,
+            MessageKind::Location { .. } => None,
+            MessageKind::Poll { .. } => None,
+            MessageKind::Venue { .. } => None,
+            MessageKind::NewChatMembers { .. } => None,
+            MessageKind::LeftChatMember { .. } => None,
+            MessageKind::NewChatTitle { .. } => None,
+            MessageKind::NewChatPhoto { .. } => None,
+            MessageKind::DeleteChatPhoto => None,
+            MessageKind::GroupChatCreated => None,
+            MessageKind::SupergroupChatCreated => None,
+            MessageKind::ChannelChatCreated => None,
+            MessageKind::MigrateToChatId { .. } => None,
+            MessageKind::MigrateFromChatId { .. } => None,
+            MessageKind::PinnedMessage { .. } => None,
+            MessageKind::Unknown { .. } => None,
+        }
+    }
+}
diff --git a/raw/src/requests/get_sticker_set.rs b/raw/src/requests/get_sticker_set.rs
index 20459eb4c9..9ec9932082 100644
--- a/raw/src/requests/get_sticker_set.rs
+++ b/raw/src/requests/get_sticker_set.rs
@@ -5,7 +5,7 @@ use crate::types::*;
 #[derive(Debug, Clone, PartialEq, PartialOrd, Serialize)]
 #[must_use = "requests do nothing unless sent"]
 pub struct GetStickerSet {
-    name: FileRef,
+    name: StickerSetRef,
 }
 
 impl Request for GetStickerSet {
@@ -20,24 +20,24 @@ impl Request for GetStickerSet {
 impl GetStickerSet {
     pub fn new<S>(set: S) -> Self
     where
-        S: ToFileRef,
+        S: ToStickerSetRef,
     {
         Self {
-            name: set.to_file_ref(),
+            name: set.to_sticker_set_ref(),
         }
     }
 }
 
 /// Get basic info about a sticker set and prepare it for downloading.
 pub trait CanGetStickerSet {
-    fn get_set(&self) -> GetStickerSet;
+    fn get_sticker_set(&self) -> GetStickerSet;
 }
 
 impl<S> CanGetStickerSet for S
 where
-    S: ToFileRef,
+    S: ToStickerSetRef,
 {
-    fn get_set(&self) -> GetStickerSet {
+    fn get_sticker_set(&self) -> GetStickerSet {
         GetStickerSet::new(self)
     }
 }
diff --git a/raw/src/types/refs.rs b/raw/src/types/refs.rs
index e0a3dfd5c8..90640ac2da 100644
--- a/raw/src/types/refs.rs
+++ b/raw/src/types/refs.rs
@@ -381,6 +381,59 @@ impl Serialize for FileRef {
     }
 }
 
+/// Get `StickerSetRef` from the type reference.
+pub trait ToStickerSetRef {
+    fn to_sticker_set_ref(&self) -> StickerSetRef;
+}
+
+impl<S> ToStickerSetRef for S
+where
+    S: Deref,
+    S::Target: ToStickerSetRef,
+{
+    fn to_sticker_set_ref(&self) -> StickerSetRef {
+        self.deref().to_sticker_set_ref()
+    }
+}
+
+impl ToStickerSetRef for Sticker {
+    fn to_sticker_set_ref(&self) -> StickerSetRef {
+        match &self.set_name {
+            Some(s) => s.to_owned().into(),
+            None => panic!("Failed to convert sticker set_name to StickerSetRef"),
+        }
+    }
+}
+
+/// Unique sticker set name identifier reference.
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct StickerSetRef {
+    pub(crate) inner: String,
+}
+
+impl<'a> From<&'a str> for StickerSetRef {
+    fn from(s: &'a str) -> Self {
+        StickerSetRef {
+            inner: s.to_string(),
+        }
+    }
+}
+
+impl<'a> From<String> for StickerSetRef {
+    fn from(s: String) -> Self {
+        StickerSetRef { inner: s.clone() }
+    }
+}
+
+impl Serialize for StickerSetRef {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        serializer.serialize_str(&self.inner)
+    }
+}
+
 /// Get `CallbackQueryId` from the type reference.
 pub trait ToCallbackQueryId {
     fn to_callback_query_id(&self) -> CallbackQueryId;